diff options
author | slewis | 2009-02-23 04:39:42 +0000 |
---|---|---|
committer | slewis | 2009-02-23 04:39:42 +0000 |
commit | 037a6b3a7dd3e79cf1cc4fc1ac8fe18ce98c35c5 (patch) | |
tree | 90bbc45dc6956cfa657965bfed985b1b6a5bd78c | |
parent | e884bb5772f93c299a93b6e1c6c996fd7cce7c70 (diff) | |
download | org.eclipse.ecf-037a6b3a7dd3e79cf1cc4fc1ac8fe18ce98c35c5.tar.gz org.eclipse.ecf-037a6b3a7dd3e79cf1cc4fc1ac8fe18ce98c35c5.tar.xz org.eclipse.ecf-037a6b3a7dd3e79cf1cc4fc1ac8fe18ce98c35c5.zip |
Removed FindHookImpl
3 files changed, 8 insertions, 39 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java index baef71d0d..a754ab9a4 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java @@ -15,7 +15,6 @@ import org.eclipse.ecf.core.IContainerManager; import org.eclipse.ecf.osgi.services.distribution.ServiceConstants; import org.osgi.framework.*; import org.osgi.framework.hooks.service.EventHook; -import org.osgi.framework.hooks.service.FindHook; import org.osgi.service.distribution.DistributionProvider; import org.osgi.util.tracker.ServiceTracker; @@ -63,9 +62,6 @@ public class Activator implements BundleActivator { this.eventHookRegistration = this.context.registerService( EventHook.class.getName(), hook, null); - final FindHook findHook = new FindHookImpl(distributionProvider); - this.listenerHookRegistration = this.context.registerService( - FindHook.class.getName(), findHook, null); // register all existing services which have the marker property try { final ServiceReference[] refs = this.context diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java index 813178c90..8bd2296cb 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/DiscoveredServiceTrackerImpl.java @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.IContainerManager; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Trace; import org.eclipse.ecf.remoteservice.*; @@ -286,7 +287,13 @@ public class DiscoveredServiceTrackerImpl implements DiscoveredServiceTracker { private boolean includeRCSAForDescription(IContainer container, IRemoteServiceContainerAdapter adapter, ServiceEndpointDescription description) { - // TODO Auto-generated method stub + String namespaceName = (String) description + .getProperty(Constants.REMOTESERVICE_NAMESPACE_NAME); + if (namespaceName != null) { + Namespace namespace = adapter.getRemoteServiceNamespace(); + if (namespace.getName().equals(namespaceName)) + return true; + } return true; } diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/FindHookImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/FindHookImpl.java deleted file mode 100644 index ec264a7ae..000000000 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/FindHookImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * 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 java.util.Collection; -import org.eclipse.ecf.core.util.Trace; -import org.osgi.framework.BundleContext; -import org.osgi.framework.hooks.service.FindHook; - -public class FindHookImpl implements FindHook { - - // private final DistributionProviderImpl distributionProvider; - - public FindHookImpl(DistributionProviderImpl distributionProvider) { - // this.distributionProvider = distributionProvider; - } - - public void find(BundleContext context, String name, String filter, - boolean allServices, Collection references) { - // XXX TODO - Trace.entering(Activator.PLUGIN_ID, DebugOptions.FINDHOOKDEBUG, this - .getClass(), "find", new Object[] { - context.getBundle().getSymbolicName(), name, filter, - new Boolean(allServices), references }); - } - -} |