Attachment #121114 for bug #259525

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 ******************************************************************************/
package org.eclipse.ecf.internal.provider.discovery;

import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.eclipse.ecf.core.identity.IDCreateException;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;

public class Activator implements BundleActivator {
	// The shared instance
	private static Activator plugin;
	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.discovery"; //$NON-NLS-1$

	private static BundleContext context;

	/**
	 * Returns the shared instance
	 * 

	 * (non-Javadoc)
	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
	 */
	public void start(final BundleContext ctxt) throws Exception {
		context = ctxt;
		props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer")); //$NON-NLS-1$
		props.put(IDiscoveryService.CONTAINER_NAME, CompositeDiscoveryContainer.NAME);
		props.put(Constants.SERVICE_RANKING, new Integer(1000));
		context.registerService(IDiscoveryService.class.getName(), new ServiceFactory() {

			/* (non-Javadoc)
			 * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
			 */
			public Object getService(Bundle bundle, ServiceRegistration registration) {

				// get all previously registered IDS from OSGi (but not this one)
				Filter filter = null;
				try {
					String filter2 = "(&(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")(!(" + IDiscoveryService.CONTAINER_NAME + "=" + CompositeDiscoveryContainer.NAME + ")))"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
					filter = context.createFilter(filter2);
				} catch (InvalidSyntaxException e2) {
					Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e2); //$NON-NLS-1$ //$NON-NLS-2$
					return null;
				}
				ServiceTracker tracker = new ServiceTracker(context, filter, null);
				tracker.open();
				Object[] services = tracker.getServices();
				tracker.close();
				List discoveries = services == null ? new ArrayList() : new ArrayList(Arrays.asList(services));

				// register the composite discovery service)
				final CompositeDiscoveryContainer cdc;
				try {
					cdc = new CompositeDiscoveryContainer(discoveries);
				} catch (IDCreateException e1) {
					Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e1); //$NON-NLS-1$ //$NON-NLS-2$
					return null;
				}
				try {
					cdc.connect(null, null);
				} catch (ContainerConnectException e) {
					Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
					return null;
				}

				// add a service listener to add/remove IDS dynamically 
				try {
					context.addServiceListener(new ServiceListener() {
						/* (non-Javadoc)
						 * @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
						 */
						public void serviceChanged(ServiceEvent arg0) {
							IDiscoveryService anIDS = (IDiscoveryService) context.getService(arg0.getServiceReference());
							switch (arg0.getType()) {
								case ServiceEvent.REGISTERED :
									cdc.addContainer(anIDS);
									break;
								case ServiceEvent.UNREGISTERING :
									cdc.removeContainer(anIDS);
									break;
								default :
									break;
							}
						}

					}, "(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
				} catch (InvalidSyntaxException e) {
					// nop
				}
				return cdc;
			}

			/* (non-Javadoc)
			 * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
			 */
			public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
				// nop
			}
		}, props);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
	 */
	public void stop(BundleContext ctxt) throws Exception {
		plugin = null;
		context = null;
	}

	public static BundleContext getContext() {
		return context;
	}
}

Lines 24-28 Link Here

(-)plugin.xml (+7 lines)
24	name="ecf.namespace.composite">	24	name="ecf.namespace.composite">
25	</namespace>	25	</namespace>
26	</extension>	26	</extension>
		27	<extension
		28	point="org.eclipse.ecf.start">
		29	<run
		30	asynchronous="false"
		31	class="org.eclipse.ecf.internal.provider.discovery.ECFStart">
		32	</run>
		33	</extension>
27		34
28	</plugin>	35	</plugin>




/*******************************************************************************
 * Copyright (c) 2007 Versant Corp.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.discovery;

import java.util.*;
import org.eclipse.core.runtime.*;
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.start.IECFStart;
import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;

public class ECFStart implements IECFStart {

	public IStatus run(IProgressMonitor monitor) {
		try {
			Properties props = new Properties();
			props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer")); //$NON-NLS-1$
			props.put(IDiscoveryService.CONTAINER_NAME, CompositeDiscoveryContainer.NAME);
			props.put(Constants.SERVICE_RANKING, new Integer(1000));
			Activator.getContext().registerService(IDiscoveryService.class.getName(), new ServiceFactory() {

				/* (non-Javadoc)
				 * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
				 */
				public Object getService(Bundle bundle, ServiceRegistration registration) {

					// get all previously registered IDS from OSGi (but not this one)
					Filter filter = null;
					try {
						String filter2 = "(&(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")(!(" + IDiscoveryService.CONTAINER_NAME + "=" + CompositeDiscoveryContainer.NAME + ")))"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
						filter = Activator.getContext().createFilter(filter2);
					} catch (InvalidSyntaxException e2) {
						Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e2); //$NON-NLS-1$ //$NON-NLS-2$
						return null;
					}
					ServiceTracker tracker = new ServiceTracker(Activator.getContext(), filter, null);
					tracker.open();
					Object[] services = tracker.getServices();
					tracker.close();
					List discoveries = services == null ? new ArrayList() : new ArrayList(Arrays.asList(services));

					// register the composite discovery service)
					final CompositeDiscoveryContainer cdc;
					try {
						cdc = new CompositeDiscoveryContainer(discoveries);
					} catch (IDCreateException e1) {
						Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e1); //$NON-NLS-1$ //$NON-NLS-2$
						return null;
					}
					try {
						cdc.connect(null, null);
					} catch (ContainerConnectException e) {
						Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
						return null;
					}

					// add a service listener to add/remove IDS dynamically 
					try {
						Activator.getContext().addServiceListener(new ServiceListener() {
							/* (non-Javadoc)
							 * @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
							 */
							public void serviceChanged(ServiceEvent arg0) {
								IDiscoveryService anIDS = (IDiscoveryService) Activator.getContext().getService(arg0.getServiceReference());
								switch (arg0.getType()) {
									case ServiceEvent.REGISTERED :
										cdc.addContainer(anIDS);
										break;
									case ServiceEvent.UNREGISTERING :
										cdc.removeContainer(anIDS);
										break;
									default :
										break;
								}
							}

						}, "(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
					} catch (InvalidSyntaxException e) {
						// nop
					}
					return cdc;
				}

				/* (non-Javadoc)
				 * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
				 */
				public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
					// nop
				}
			}, props);

			return Status.OK_STATUS;
		} catch (Exception e) {
			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, "Exception starting composite container", e); //$NON-NLS-1$
		}
	}
}




 *****************************************************************************/
package org.eclipse.ecf.internal.provider.jmdns;

import java.net.InetAddress;
import java.util.Properties;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.core.util.PlatformHelper;
import org.eclipse.ecf.core.util.SystemLogService;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.util.*;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
import org.eclipse.ecf.provider.jmdns.container.JMDNSDiscoveryContainer;
import org.osgi.framework.*;
import org.osgi.service.log.LogService;
import org.osgi.util.tracker.ServiceTracker;

 * The main plugin class to be used in the desktop.
 */
public class JMDNSPlugin implements BundleActivator {
	private static final String NAME = "ecf.discovery.jmdns"; //$NON-NLS-1$

	// The shared instance.
	private static JMDNSPlugin plugin;



	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.jmdns"; //$NON-NLS-1$

	protected static InetAddress LOCALHOST = null;

	/**
	 * The constructor.
	 */

	 */
	public void start(BundleContext ctxt) throws Exception {
		this.context = ctxt;
		LOCALHOST = InetAddress.getLocalHost();

		Properties props = new Properties();
		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, new Integer(750));
		context.registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
			private volatile JMDNSDiscoveryContainer jdc;

			/* (non-Javadoc)
			 * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
			 */
			public Object getService(Bundle bundle, ServiceRegistration registration) {
				if (jdc == null) {
					try {
						jdc = new JMDNSDiscoveryContainer(LOCALHOST);
						jdc.connect(null, null);
					} catch (IDCreateException e) {
						Trace.catching(JMDNSPlugin.PLUGIN_ID, JMDNSPlugin.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
					} catch (ContainerConnectException e) {
						Trace.catching(JMDNSPlugin.PLUGIN_ID, JMDNSPlugin.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
						jdc = null;
					}
				}
				return jdc;
			}

			/* (non-Javadoc)
			 * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
			 */
			public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
				//TODO-mkuppe we later might want to dispose jSLP when the last!!! consumer ungets the service 
				//Though don't forget about the (ECF) Container which might still be in use
			}
		}, props);

	}

	protected Bundle getBundle() {

		return plugin;
	}

	public BundleContext getContext() {
		return context;
	}

	/**
	 * @param string
	 * @param t

Lines 17-21 Link Here

(-)plugin.xml (+6 lines)
17	description="JMDNS Namespace"	17	description="JMDNS Namespace"
18	name="ecf.namespace.jmdns"/>	18	name="ecf.namespace.jmdns"/>
19	</extension>	19	</extension>
		20	<extension
		21	point="org.eclipse.ecf.start">
		22	<run
		23	class="org.eclipse.ecf.internal.provider.jmdns.ECFStart">
		24	</run>
		25	</extension>
20		26
21	</plugin>	27	</plugin>




/*******************************************************************************
 * Copyright (c) 2007 Versant Corp.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.jmdns;

import java.net.InetAddress;
import java.util.Properties;
import org.eclipse.core.runtime.*;
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.start.IECFStart;
import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
import org.eclipse.ecf.provider.jmdns.container.JMDNSDiscoveryContainer;
import org.osgi.framework.*;

public class ECFStart implements IECFStart {

	protected static InetAddress LOCALHOST = null;
	private static final String NAME = "ecf.discovery.jmdns"; //$NON-NLS-1$

	public ECFStart() {
		// 
	}

	public IStatus run(IProgressMonitor arg0) {
		try {
			LOCALHOST = InetAddress.getLocalHost();

			Properties props = new Properties();
			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, new Integer(750));
			JMDNSPlugin.getDefault().getContext().registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
				private volatile JMDNSDiscoveryContainer jdc;

				/* (non-Javadoc)
				 * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
				 */
				public Object getService(Bundle bundle, ServiceRegistration registration) {
					if (jdc == null) {
						try {
							jdc = new JMDNSDiscoveryContainer(LOCALHOST);
							jdc.connect(null, null);
						} catch (IDCreateException e) {
							Trace.catching(JMDNSPlugin.PLUGIN_ID, JMDNSPlugin.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
						} catch (ContainerConnectException e) {
							Trace.catching(JMDNSPlugin.PLUGIN_ID, JMDNSPlugin.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
							jdc = null;
						}
					}
					return jdc;
				}

				/* (non-Javadoc)
				 * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
				 */
				public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
					//TODO-mkuppe we later might want to dispose jSLP when the last!!! consumer ungets the service 
					//Though don't forget about the (ECF) Container which might still be in use
				}
			}, props);

			return Status.OK_STATUS;
		} catch (Exception e) {
			return new Status(IStatus.ERROR, JMDNSPlugin.PLUGIN_ID, IStatus.ERROR, "Exception starting jmdns container", e); //$NON-NLS-1$
		}
	}

}





import ch.ethz.iks.slp.Advertiser;
import ch.ethz.iks.slp.Locator;
import java.util.Properties;
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.Trace;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
import org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer;
import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;


		// initially get the advertiser and add a life cycle listener
		advertiserSt = new ServiceTracker(context, Advertiser.class.getName(), null);

	}

	public BundleContext getContext() {
		return bundleContext;
		props.put(Constants.SERVICE_RANKING, new Integer(500));

		context.registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
			private volatile JSLPDiscoveryContainer jdc;

			/* (non-Javadoc)
			 * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
			 */
			public Object getService(Bundle bundle, ServiceRegistration registration) {
				if (jdc == null) {
					try {
						jdc = new JSLPDiscoveryContainer();
						jdc.connect(null, null);
					} catch (IDCreateException e) {
						Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/tracing", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
					} catch (ContainerConnectException e) {
						Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/tracing", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
						jdc = null;
					}
				}
				return jdc;
			}

			/* (non-Javadoc)
			 * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
			 */
			public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
				//TODO-mkuppe we later might want to dispose jSLP when the last!!! consumer ungets the service 
				//Though don't forget about the (ECF) Container which might still be in use
			}
		}, props);
	}

	/*

Lines 16-20 Link Here

(-)plugin.xml (+6 lines)
16	description="JSLP Namespace"	16	description="JSLP Namespace"
17	name="ecf.namespace.slp"/>	17	name="ecf.namespace.slp"/>
18	</extension>	18	</extension>
		19	<extension
		20	point="org.eclipse.ecf.start">
		21	<run
		22	class="org.eclipse.ecf.internal.provider.jslp.ECFStart">
		23	</run>
		24	</extension>
19		25
20	</plugin>	26	</plugin>




/*******************************************************************************
 * Copyright (c) 2007 Versant Corp.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.jslp;

import java.util.Properties;
import org.eclipse.core.runtime.*;
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.start.IECFStart;
import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
import org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer;
import org.osgi.framework.*;

public class ECFStart implements IECFStart {

	public ECFStart() {
		// 
	}

	public IStatus run(IProgressMonitor arg0) {
		try {
			// register ourself as an OSGi service
			Properties props = new Properties();
			props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer")); //$NON-NLS-1$
			props.put(IDiscoveryService.CONTAINER_NAME, JSLPDiscoveryContainer.NAME);
			props.put(Constants.SERVICE_RANKING, new Integer(500));

			Activator.getDefault().getContext().registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
				private volatile JSLPDiscoveryContainer jdc;

				/* (non-Javadoc)
				 * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
				 */
				public Object getService(Bundle bundle, ServiceRegistration registration) {
					if (jdc == null) {
						try {
							jdc = new JSLPDiscoveryContainer();
							jdc.connect(null, null);
						} catch (IDCreateException e) {
							Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/tracing", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
						} catch (ContainerConnectException e) {
							Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/tracing", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
							jdc = null;
						}
					}
					return jdc;
				}

				/* (non-Javadoc)
				 * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
				 */
				public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
					//TODO-mkuppe we later might want to dispose jSLP when the last!!! consumer ungets the service 
					//Though don't forget about the (ECF) Container which might still be in use
				}
			}, props);

			return Status.OK_STATUS;
		} catch (Exception e) {
			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, "Exception starting jslp container", e); //$NON-NLS-1$
		}
	}
}

Return to bug 259525

Lines 10-30 Link Here

(-)src/org/eclipse/ecf/internal/provider/discovery/Activator.java (-86 / +12 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.ecf.internal.provider.discovery;	11	package org.eclipse.ecf.internal.provider.discovery;
12		12
13	import java.util.*;	13	import org.osgi.framework.BundleActivator;
14	import org.eclipse.ecf.core.ContainerConnectException;	14	import org.osgi.framework.BundleContext;
15	import org.eclipse.ecf.core.identity.IDCreateException;
16	import org.eclipse.ecf.core.identity.IDFactory;
17	import org.eclipse.ecf.core.util.Trace;
18	import org.eclipse.ecf.discovery.service.IDiscoveryService;
19	import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
20	import org.osgi.framework.*;
21	import org.osgi.util.tracker.ServiceTracker;
22		15
23	public class Activator implements BundleActivator {	16	public class Activator implements BundleActivator {
24	// The shared instance	17	// The shared instance
25	private static Activator plugin;	18	private static Activator plugin;
26	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.discovery"; //$NON-NLS-1$	19	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.discovery"; //$NON-NLS-1$
27		20
		21	private static BundleContext context;
		22
28	/**	23	/**
29	* Returns the shared instance	24	* Returns the shared instance
30	*	25	*
Lines 45-133 Link Here
45	* (non-Javadoc)	40	* (non-Javadoc)
46	* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)	41	* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
47	*/	42	*/
48	public void start(final BundleContext context) throws Exception {	43	public void start(final BundleContext ctxt) throws Exception {
49	Properties props = new Properties();	44	context = ctxt;
50	props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer")); //$NON-NLS-1$
51	props.put(IDiscoveryService.CONTAINER_NAME, CompositeDiscoveryContainer.NAME);
52	props.put(Constants.SERVICE_RANKING, new Integer(1000));
53	context.registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
54
55	/* (non-Javadoc)
56	* @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
57	*/
58	public Object getService(Bundle bundle, ServiceRegistration registration) {
59
60	// get all previously registered IDS from OSGi (but not this one)
61	Filter filter = null;
62	try {
63	String filter2 = "(&(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")(!(" + IDiscoveryService.CONTAINER_NAME + "=" + CompositeDiscoveryContainer.NAME + ")))"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
64	filter = context.createFilter(filter2);
65	} catch (InvalidSyntaxException e2) {
66	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e2); //$NON-NLS-1$ //$NON-NLS-2$
67	return null;
68	}
69	ServiceTracker tracker = new ServiceTracker(context, filter, null);
70	tracker.open();
71	Object[] services = tracker.getServices();
72	tracker.close();
73	List discoveries = services == null ? new ArrayList() : new ArrayList(Arrays.asList(services));
74
75	// register the composite discovery service)
76	final CompositeDiscoveryContainer cdc;
77	try {
78	cdc = new CompositeDiscoveryContainer(discoveries);
79	} catch (IDCreateException e1) {
80	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e1); //$NON-NLS-1$ //$NON-NLS-2$
81	return null;
82	}
83	try {
84	cdc.connect(null, null);
85	} catch (ContainerConnectException e) {
86	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
87	return null;
88	}
89
90	// add a service listener to add/remove IDS dynamically
91	try {
92	context.addServiceListener(new ServiceListener() {
93	/* (non-Javadoc)
94	* @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
95	*/
96	public void serviceChanged(ServiceEvent arg0) {
97	IDiscoveryService anIDS = (IDiscoveryService) context.getService(arg0.getServiceReference());
98	switch (arg0.getType()) {
99	case ServiceEvent.REGISTERED :
100	cdc.addContainer(anIDS);
101	break;
102	case ServiceEvent.UNREGISTERING :
103	cdc.removeContainer(anIDS);
104	break;
105	default :
106	break;
107	}
108	}
109
110	}, "(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
111	} catch (InvalidSyntaxException e) {
112	// nop
113	}
114	return cdc;
115	}
116
117	/* (non-Javadoc)
118	* @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
119	*/
120	public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
121	// nop
122	}
123	}, props);
124	}	45	}
125		46
126	/*	47	/*
127	* (non-Javadoc)	48	* (non-Javadoc)
128	* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)	49	* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
129	*/	50	*/
130	public void stop(BundleContext context) throws Exception {	51	public void stop(BundleContext ctxt) throws Exception {
131	plugin = null;	52	plugin = null;
		53	context = null;
		54	}
		55
		56	public static BundleContext getContext() {
		57	return context;
132	}	58	}
133	}	59	}

Added Link Here

(-)src/org/eclipse/ecf/internal/provider/discovery/ECFStart.java (+110 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 Versant Corp.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
10	******************************************************************************/
11	package org.eclipse.ecf.internal.provider.discovery;
12
13	import java.util.*;
14	import org.eclipse.core.runtime.*;
15	import org.eclipse.ecf.core.ContainerConnectException;
16	import org.eclipse.ecf.core.identity.IDCreateException;
17	import org.eclipse.ecf.core.identity.IDFactory;
18	import org.eclipse.ecf.core.start.IECFStart;
19	import org.eclipse.ecf.core.util.Trace;
20	import org.eclipse.ecf.discovery.service.IDiscoveryService;
21	import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
22	import org.osgi.framework.*;
23	import org.osgi.util.tracker.ServiceTracker;
24
25	public class ECFStart implements IECFStart {
26
27	public IStatus run(IProgressMonitor monitor) {
28	try {
29	Properties props = new Properties();
30	props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer")); //$NON-NLS-1$
31	props.put(IDiscoveryService.CONTAINER_NAME, CompositeDiscoveryContainer.NAME);
32	props.put(Constants.SERVICE_RANKING, new Integer(1000));
33	Activator.getContext().registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
34
35	/* (non-Javadoc)
36	* @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
37	*/
38	public Object getService(Bundle bundle, ServiceRegistration registration) {
39
40	// get all previously registered IDS from OSGi (but not this one)
41	Filter filter = null;
42	try {
43	String filter2 = "(&(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")(!(" + IDiscoveryService.CONTAINER_NAME + "=" + CompositeDiscoveryContainer.NAME + ")))"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
44	filter = Activator.getContext().createFilter(filter2);
45	} catch (InvalidSyntaxException e2) {
46	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e2); //$NON-NLS-1$ //$NON-NLS-2$
47	return null;
48	}
49	ServiceTracker tracker = new ServiceTracker(Activator.getContext(), filter, null);
50	tracker.open();
51	Object[] services = tracker.getServices();
52	tracker.close();
53	List discoveries = services == null ? new ArrayList() : new ArrayList(Arrays.asList(services));
54
55	// register the composite discovery service)
56	final CompositeDiscoveryContainer cdc;
57	try {
58	cdc = new CompositeDiscoveryContainer(discoveries);
59	} catch (IDCreateException e1) {
60	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e1); //$NON-NLS-1$ //$NON-NLS-2$
61	return null;
62	}
63	try {
64	cdc.connect(null, null);
65	} catch (ContainerConnectException e) {
66	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/catching", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
67	return null;
68	}
69
70	// add a service listener to add/remove IDS dynamically
71	try {
72	Activator.getContext().addServiceListener(new ServiceListener() {
73	/* (non-Javadoc)
74	* @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
75	*/
76	public void serviceChanged(ServiceEvent arg0) {
77	IDiscoveryService anIDS = (IDiscoveryService) Activator.getContext().getService(arg0.getServiceReference());
78	switch (arg0.getType()) {
79	case ServiceEvent.REGISTERED :
80	cdc.addContainer(anIDS);
81	break;
82	case ServiceEvent.UNREGISTERING :
83	cdc.removeContainer(anIDS);
84	break;
85	default :
86	break;
87	}
88	}
89
90	}, "(" + Constants.OBJECTCLASS + "=" + IDiscoveryService.class.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
91	} catch (InvalidSyntaxException e) {
92	// nop
93	}
94	return cdc;
95	}
96
97	/* (non-Javadoc)
98	* @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
99	*/
100	public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
101	// nop
102	}
103	}, props);
104
105	return Status.OK_STATUS;
106	} catch (Exception e) {
107	return new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, "Exception starting composite container", e); //$NON-NLS-1$
108	}
109	}
110	}

Lines 12-24 Link Here

(-)src/org/eclipse/ecf/internal/provider/jslp/Activator.java (-42 / +4 lines)
12		12
13	import ch.ethz.iks.slp.Advertiser;	13	import ch.ethz.iks.slp.Advertiser;
14	import ch.ethz.iks.slp.Locator;	14	import ch.ethz.iks.slp.Locator;
15	import java.util.Properties;
16	import org.eclipse.ecf.core.ContainerConnectException;
17	import org.eclipse.ecf.core.identity.IDCreateException;
18	import org.eclipse.ecf.core.identity.IDFactory;
19	import org.eclipse.ecf.core.util.Trace;
20	import org.eclipse.ecf.discovery.service.IDiscoveryService;
21	import org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer;
22	import org.osgi.framework.*;	15	import org.osgi.framework.*;
23	import org.osgi.util.tracker.ServiceTracker;	16	import org.osgi.util.tracker.ServiceTracker;
24		17
Lines 86-126 Link Here
86	// initially get the advertiser and add a life cycle listener	79	// initially get the advertiser and add a life cycle listener
87	advertiserSt = new ServiceTracker(context, Advertiser.class.getName(), null);	80	advertiserSt = new ServiceTracker(context, Advertiser.class.getName(), null);
88		81
89	// register ourself as an OSGi service	82	}
90	Properties props = new Properties();	83
91	props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer")); //$NON-NLS-1$	84	public BundleContext getContext() {
92	props.put(IDiscoveryService.CONTAINER_NAME, JSLPDiscoveryContainer.NAME);	85	return bundleContext;
93	props.put(Constants.SERVICE_RANKING, new Integer(500));
94
95	context.registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
96	private volatile JSLPDiscoveryContainer jdc;
97
98	/* (non-Javadoc)
99	* @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration)
100	*/
101	public Object getService(Bundle bundle, ServiceRegistration registration) {
102	if (jdc == null) {
103	try {
104	jdc = new JSLPDiscoveryContainer();
105	jdc.connect(null, null);
106	} catch (IDCreateException e) {
107	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/tracing", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
108	} catch (ContainerConnectException e) {
109	Trace.catching(Activator.PLUGIN_ID, Activator.PLUGIN_ID + "/debug/methods/tracing", this.getClass(), "getService(Bundle, ServiceRegistration)", e); //$NON-NLS-1$ //$NON-NLS-2$
110	jdc = null;
111	}
112	}
113	return jdc;
114	}
115
116	/* (non-Javadoc)
117	* @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object)
118	*/
119	public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
120	//TODO-mkuppe we later might want to dispose jSLP when the last!!! consumer ungets the service
121	//Though don't forget about the (ECF) Container which might still be in use
122	}
123	}, props);
124	}	86	}
125		87
126	/*	88	/*