Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2008-05-30 13:51:02 +0000
committermkuppe2008-05-30 13:51:02 +0000
commit4ec22f6dbf93fc753fc2a235c7cd28777a1ba9b6 (patch)
tree59a1a091569131d0071cff55e4ff1b82852b10c3 /providers/bundles
parentd67f057754fb22d79cd7e2de7e39727e12e5e406 (diff)
downloadorg.eclipse.ecf-4ec22f6dbf93fc753fc2a235c7cd28777a1ba9b6.tar.gz
org.eclipse.ecf-4ec22f6dbf93fc753fc2a235c7cd28777a1ba9b6.tar.xz
org.eclipse.ecf-4ec22f6dbf93fc753fc2a235c7cd28777a1ba9b6.zip
NEW - bug 232813: [Discovery][jSLP] No OSGi service is registered
https://bugs.eclipse.org/bugs/show_bug.cgi?id=232813
Diffstat (limited to 'providers/bundles')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jslp/src/org/eclipse/ecf/internal/provider/jslp/Activator.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.jslp/src/org/eclipse/ecf/internal/provider/jslp/Activator.java b/providers/bundles/org.eclipse.ecf.provider.jslp/src/org/eclipse/ecf/internal/provider/jslp/Activator.java
index 5a4cf1ffd..04643c3bd 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jslp/src/org/eclipse/ecf/internal/provider/jslp/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jslp/src/org/eclipse/ecf/internal/provider/jslp/Activator.java
@@ -12,7 +12,10 @@ package org.eclipse.ecf.internal.provider.jslp;
import ch.ethz.iks.slp.Advertiser;
import ch.ethz.iks.slp.Locator;
+import java.util.Properties;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.ecf.discovery.service.IDiscoveryService;
+import org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer;
import org.osgi.framework.*;
public class Activator implements BundleActivator {
@@ -102,14 +105,13 @@ public class Activator implements BundleActivator {
}
}, "(" + Constants.OBJECTCLASS + "=" + Advertiser.class.getName() + ")"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- //TODO-mkuppe https://bugs.eclipse.org/232813
// register the jSLP discovery service (will be automatically unregistered when this bundle gets uninstalled)
- // JSLPDiscoveryContainer ids = new JSLPDiscoveryContainer();
- // ids.connect(null, null);
- // Properties props = new Properties();
- // props.put(IDiscoveryService.CONTAINER_ID, ids.getID());
- // props.put(IDiscoveryContainerAdapter.CONTAINER_CONNECT_TARGET, JSLPDiscoveryContainer.NAME);
- // context.registerService(IDiscoveryService.class.getName(), ids, props);
+ JSLPDiscoveryContainer ids = new JSLPDiscoveryContainer();
+ ids.connect(null, null);
+ Properties props = new Properties();
+ props.put(IDiscoveryService.CONTAINER_ID, ids.getID());
+ props.put(IDiscoveryService.CONTAINER_NAME, JSLPDiscoveryContainer.NAME);
+ context.registerService(IDiscoveryService.class.getName(), ids, props);
}
/*

Back to the top