Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-02-12 06:24:36 +0000
committerslewis2014-02-12 06:24:36 +0000
commit5b2dc1813e83473b0f645be329cd1e450c12ebf9 (patch)
treee1b0b4e6e82f62cb29b381b85e4a385843e74770 /compendium
parentfb4c29bdffe1617e3e4708bf98a7f8b43fb469e0 (diff)
parent332a53ac5b24b4b936c0f3f84fca56ec3ba4476b (diff)
downloadorg.eclipse.ecf-5b2dc1813e83473b0f645be329cd1e450c12ebf9.tar.gz
org.eclipse.ecf-5b2dc1813e83473b0f645be329cd1e450c12ebf9.tar.xz
org.eclipse.ecf-5b2dc1813e83473b0f645be329cd1e450c12ebf9.zip
Merge remote-tracking branch 'origin/master' into rfc1.1
Conflicts: osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java Change-Id: I9fb9ba4cebfdf7515fc05d7d7716585cdac797e7
Diffstat (limited to 'compendium')
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF2
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManagerImpl.java8
2 files changed, 9 insertions, 1 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
index 49c75a958..fc9a3ef99 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.ecf.internal.osgi.services.distribution.Activator
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.ecf.core.util,
- org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.0.0",
+ org.eclipse.ecf.osgi.services.remoteserviceadmin;version="2.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.framework.hooks.service;version="1.1.0",
org.osgi.service.event;version="1.3.0",
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManagerImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManagerImpl.java
index 5012feab3..6109a4dd7 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManagerImpl.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManagerImpl.java
@@ -106,6 +106,14 @@ public class BasicTopologyManagerImpl extends AbstractTopologyManager implements
* @see
* org.osgi.service.remoteserviceadmin.EndpointListener#endpointAdded(org
* .osgi.service.remoteserviceadmin.EndpointDescription, java.lang.String)
+ *
+ *
+ * From the R5 spec page 329 section 122.6.2:
+ *
+ * Notify the Endpoint Listener of a new Endpoint Description. The second
+ * parameter is the filter that matched the Endpoint Description.
+ * Registering the same Endpoint multiple times counts as a single
+ * registration.
*/
public void endpointAdded(
org.osgi.service.remoteserviceadmin.EndpointDescription endpoint,

Back to the top