Attachment #131191 for bug #249240




/*******************************************************************************
* Copyright (c) 2009 EclipseSource and others. 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:
*   EclipseSource - initial API and implementation
******************************************************************************/
/**
 * 
 */
package org.eclipse.ecf.internal.osgi.services.distribution;

import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;

class ContainerAdapterHelper {
	private IContainer container;
	private IRemoteServiceContainerAdapter containerAdapter;

	public ContainerAdapterHelper(IContainer c, IRemoteServiceContainerAdapter rsca) {
		this.container = c;
		this.containerAdapter = rsca;
	}

	public IContainer getContainer() {
		return container;
	}

	public IRemoteServiceContainerAdapter getRSCA() {
		return containerAdapter;
	}

	public String toString() {
		StringBuffer buf = new StringBuffer("ContainerAdapterHelper[");
		buf.append("containerID=").append(getContainer().getID());
		buf.append(";rsca=").append(getRSCA()).append("]");
		return buf.toString();
	}
}

Lines 16-21 Link Here

(-)src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java (-2 / +27 lines)
16	import org.eclipse.ecf.core.IContainerManager;	16	import org.eclipse.ecf.core.IContainerManager;
17	import org.eclipse.ecf.core.util.*;	17	import org.eclipse.ecf.core.util.*;
18	import org.eclipse.ecf.osgi.services.distribution.ECFServiceConstants;	18	import org.eclipse.ecf.osgi.services.distribution.ECFServiceConstants;
		19	import org.eclipse.ecf.osgi.services.distribution.IRemoteServiceContainerFinder;
19	import org.osgi.framework.*;	20	import org.osgi.framework.*;
20	import org.osgi.framework.hooks.service.EventHook;	21	import org.osgi.framework.hooks.service.EventHook;
21	import org.osgi.service.discovery.DiscoveredServiceTracker;	22	import org.osgi.service.discovery.DiscoveredServiceTracker;
Lines 37-48 Link Here
37	private ServiceRegistration eventHookRegistration;	38	private ServiceRegistration eventHookRegistration;
38	private ServiceRegistration distributionProviderRegistration;	39	private ServiceRegistration distributionProviderRegistration;
39	private ServiceRegistration discoveredServiceTrackerRegistration;	40	private ServiceRegistration discoveredServiceTrackerRegistration;
		41	private ServiceRegistration rsContainerFinderRegistration;
40		42
41	private ServiceTracker logServiceTracker = null;	43	private ServiceTracker logServiceTracker = null;
42	private LogService logService = null;	44	private LogService logService = null;
43		45
44	private ServiceTracker adapterManagerTracker;	46	private ServiceTracker adapterManagerTracker;
45		47
		48	private ServiceTracker rsContainerFinderTracker;
		49
46	public static Activator getDefault() {	50	public static Activator getDefault() {
47	return plugin;	51	return plugin;
48	}	52	}
Lines 100-109 Link Here
100	}	104	}
101		105
102	private void addDiscoveredServiceTracker() {	106	private void addDiscoveredServiceTracker() {
		107	DiscoveredServiceTrackerImpl dstImpl = new DiscoveredServiceTrackerImpl(
		108	this.distributionProvider);
103	this.discoveredServiceTrackerRegistration = this.context	109	this.discoveredServiceTrackerRegistration = this.context
104	.registerService(DiscoveredServiceTracker.class.getName(),	110	.registerService(DiscoveredServiceTracker.class.getName(),
105	new DiscoveredServiceTrackerImpl(	111	dstImpl, null);
106	this.distributionProvider), null);	112	this.rsContainerFinderRegistration = this.context.registerService(
		113	IRemoteServiceContainerFinder.class.getName(), dstImpl, null);
107	}	114	}
108		115
109	private void addServiceRegistryHooks() {	116	private void addServiceRegistryHooks() {
Lines 161-166 Link Here
161	this.discoveredServiceTrackerRegistration.unregister();	168	this.discoveredServiceTrackerRegistration.unregister();
162	this.discoveredServiceTrackerRegistration = null;	169	this.discoveredServiceTrackerRegistration = null;
163	}	170	}
		171	if (this.rsContainerFinderRegistration != null) {
		172	this.rsContainerFinderRegistration.unregister();
		173	this.rsContainerFinderRegistration = null;
		174	}
164	}	175	}
165		176
166	/*	177	/*
Lines 190-195 Link Here
190	distributionProvider.dispose();	201	distributionProvider.dispose();
191	distributionProvider = null;	202	distributionProvider = null;
192	}	203	}
		204	if (rsContainerFinderTracker != null) {
		205	rsContainerFinderTracker.close();
		206	rsContainerFinderTracker = null;
		207	}
193	this.context = null;	208	this.context = null;
194	plugin = null;	209	plugin = null;
195	}	210	}
Lines 203-208 Link Here
203	return (IContainerManager) containerManagerTracker.getService();	218	return (IContainerManager) containerManagerTracker.getService();
204	}	219	}
205		220
		221	public IRemoteServiceContainerFinder[] getRemoteServiceContainerFinders() {
		222	if (rsContainerFinderTracker == null) {
		223	rsContainerFinderTracker = new ServiceTracker(this.context,
		224	IRemoteServiceContainerFinder.class.getName(), null);
		225	rsContainerFinderTracker.open();
		226	}
		227	return (IRemoteServiceContainerFinder[]) rsContainerFinderTracker
		228	.getServices();
		229	}
		230
206	public IAdapterManager getAdapterManager() {	231	public IAdapterManager getAdapterManager() {
207	// First, try to get the adapter manager via	232	// First, try to get the adapter manager via
208	if (adapterManagerTracker == null) {	233	if (adapterManagerTracker == null) {




import org.eclipse.ecf.osgi.services.discovery.ECFServiceEndpointDescription;
import org.eclipse.ecf.osgi.services.discovery.ECFServicePublication;
import org.eclipse.ecf.osgi.services.distribution.ECFServiceConstants;
import org.eclipse.ecf.osgi.services.distribution.IRemoteServiceContainerFinder;
import org.eclipse.ecf.remoteservice.*;
import org.eclipse.ecf.remoteservice.events.IRemoteServiceEvent;
import org.eclipse.ecf.remoteservice.events.IRemoteServiceUnregisteredEvent;

import org.osgi.framework.ServiceRegistration;
import org.osgi.service.discovery.*;

public class DiscoveredServiceTrackerImpl implements DiscoveredServiceTracker,
		IRemoteServiceContainerFinder {

	DistributionProviderImpl distributionProvider;


			ECFServicePublication.PROP_KEY_SERVICE_INTERFACE_VERSION,
			ECFServicePublication.PROP_KEY_SERVICE_PROPERTIES });

	// Impl of IRemoteServiceContainerFinder
	public IRemoteServiceContainer[] findRemoteServiceContainers(
			ECFServiceEndpointDescription endpointDescription) {
		return findRSCAs(endpointDescription.getECFEndpointID(),
				endpointDescription);
	}

	/*
	 * (non-Javadoc)
	 * 

		}
	}

	private IRemoteServiceContainer[] findRemoteServiceContainersViaService(
			ECFServiceEndpointDescription description) {
		IRemoteServiceContainerFinder[] finders = Activator.getDefault()
				.getRemoteServiceContainerFinders();
		if (finders == null || finders.length == 0)
			return new IRemoteServiceContainer[0];
		List result = new ArrayList();
		for (int i = 0; i < finders.length; i++) {
			IRemoteServiceContainer[] foundRSContainers = finders[i]
					.findRemoteServiceContainers(description);
			if (foundRSContainers != null && foundRSContainers.length > 0) {
				for (int j = 0; j < foundRSContainers.length; j++)
					result.add(foundRSContainers[j]);
			}
		}
		return (IRemoteServiceContainer[]) result
				.toArray(new IRemoteServiceContainer[] {});
	}

	private void handleDiscoveredServiceAvailable(ServiceEndpointDescription sed) {
		// If the service endpoint description is not ECF's then we
		// don't process it


		ID endpointID = ecfSED.getECFEndpointID();
		// Find RSCAs for the given description
		// IRemoteServiceContainer[] rsContainers = findRSCAs(endpointID,
		// ecfSED);
		IRemoteServiceContainer[] rsContainers = findRemoteServiceContainersViaService(ecfSED);
		if (rsContainers == null || rsContainers.length == 0) {
			logError("handleDiscoveredServiceAvailable",
					"No RemoteServiceContainerAdapters found for description="
							+ ecfSED, null);
			return;
		}
		// Give warning if more than one ContainerAdapterHelper found
		if (rsContainers.length > 1) {
			logWarning("handleDiscoveredServiceAvailable",
					"Multiple remote service containers="
							+ Arrays.asList(rsContainers)
							+ " found for service endpoint description="
							+ ecfSED);
		}

		// Get futureRemoteReferences...then create a thread
		// to process the future
		Collection providedInterfaces = ecfSED.getProvidedInterfaces();
		for (int i = 0; i < rsContainers.length; i++) {
			for (Iterator j = providedInterfaces.iterator(); j.hasNext();) {
				String providedInterface = (String) j.next();
				// Use async call to prevent blocking here
				trace("handleDiscoveredServiceAvailable", "rsca="
						+ rsContainers[i] + ",intf=" + providedInterface);
				IFuture futureRemoteReferences = rsContainers[i]
						.getContainerAdapter().asyncGetRemoteServiceReferences(
								new ID[] { endpointID }, providedInterface,
								null);
				// And process the future returned in separate thread
				processFutureForRemoteServiceReferences(ecfSED,
						futureRemoteReferences, rsContainers[i]);
			}
		}
	}

	private void processFutureForRemoteServiceReferences(
			final ECFServiceEndpointDescription sed,
			final IFuture futureRemoteReferences,
			final IRemoteServiceContainer ch) {
		Thread t = new Thread(new Runnable() {
			public void run() {
				try {

	}

	private void addProxyServiceRegistration(ServiceEndpointDescription sed,
			IRemoteServiceContainer ch, IRemoteServiceReference ref,
			ServiceRegistration registration) {
		ID containerID = ch.getContainer().getID();
		RemoteServiceRegistrations reg = (RemoteServiceRegistrations) discoveredRemoteServiceRegistrations
				.get(containerID);
		if (reg == null) {
			reg = new RemoteServiceRegistrations(sed, ch.getContainer(), ch
					.getContainerAdapter(),
					new RemoteServiceReferenceUnregisteredListener());
			discoveredRemoteServiceRegistrations.put(containerID, reg);
		}

	}

	private void registerRemoteServiceReferences(
			ECFServiceEndpointDescription sed, IRemoteServiceContainer ch,
			IRemoteServiceReference[] remoteReferences) {

		synchronized (discoveredRemoteServiceRegistrations) {


			for (int i = 0; i < remoteReferences.length; i++) {
				// Get IRemoteService, used to create the proxy below
				IRemoteService remoteService = ch.getContainerAdapter()
						.getRemoteService(remoteReferences[i]);
				// If no remote service then give up
				if (remoteService == null) {
					logError("registerRemoteServiceReferences",


				// Get service properties for the proxy
				Dictionary properties = getPropertiesForRemoteService(sed, ch
						.getContainerAdapter(), remoteReferences[i],
						remoteService);

				// Create proxy right here
				Object proxy = null;

		return results;
	}

	private IRemoteServiceContainer[] findRSCAs(ID endpointID,
			ServiceEndpointDescription sedh) {
		IContainerManager containerManager = Activator.getDefault()
				.getContainerManager();

		if (containers == null) {
			// log this?
			logWarning("findRSCAs", "No containers found for container manager");
			return new IRemoteServiceContainer[0];
		}
		List results = new ArrayList();
		for (int i = 0; i < containers.length; i++) {

			if (adapter != null
					&& includeRCSAForDescription(containers[i], adapter,
							endpointID, sedh)) {
				results.add(new RemoteServiceContainer(containers[i], adapter));
			}
		}
		return (IRemoteServiceContainer[]) results
				.toArray(new IRemoteServiceContainer[] {});
	}

	private boolean includeRCSAForDescription(IContainer container,




/*******************************************************************************
 * Copyright (c) 2009 EclipseSource and others. 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:
 *   EclipseSource - initial API and implementation
 ******************************************************************************/
package org.eclipse.ecf.osgi.services.distribution;

import org.eclipse.ecf.osgi.services.discovery.ECFServiceEndpointDescription;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainer;

public interface IRemoteServiceContainerFinder {

	public IRemoteServiceContainer[] findRemoteServiceContainers(
			ECFServiceEndpointDescription endpointDescription);

}

Return to bug 249240

Removed Link Here

(-)src/org/eclipse/ecf/internal/osgi/services/distribution/ContainerAdapterHelper.java (-41 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* EclipseSource - initial API and implementation
9	******************************************************************************/
10	/**
11	*
12	*/
13	package org.eclipse.ecf.internal.osgi.services.distribution;
14
15	import org.eclipse.ecf.core.IContainer;
16	import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
17
18	class ContainerAdapterHelper {
19	private IContainer container;
20	private IRemoteServiceContainerAdapter containerAdapter;
21
22	public ContainerAdapterHelper(IContainer c, IRemoteServiceContainerAdapter rsca) {
23	this.container = c;
24	this.containerAdapter = rsca;
25	}
26
27	public IContainer getContainer() {
28	return container;
29	}
30
31	public IRemoteServiceContainerAdapter getRSCA() {
32	return containerAdapter;
33	}
34
35	public String toString() {
36	StringBuffer buf = new StringBuffer("ContainerAdapterHelper[");
37	buf.append("containerID=").append(getContainer().getID());
38	buf.append(";rsca=").append(getRSCA()).append("]");
39	return buf.toString();
40	}
41	}

Added Link Here

(-)src/org/eclipse/ecf/osgi/services/distribution/IRemoteServiceContainerFinder.java (+20 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* EclipseSource - initial API and implementation
9	******************************************************************************/
10	package org.eclipse.ecf.osgi.services.distribution;
11
12	import org.eclipse.ecf.osgi.services.discovery.ECFServiceEndpointDescription;
13	import org.eclipse.ecf.remoteservice.IRemoteServiceContainer;
14
15	public interface IRemoteServiceContainerFinder {
16
17	public IRemoteServiceContainer[] findRemoteServiceContainers(
18	ECFServiceEndpointDescription endpointDescription);
19
20	}