Merge pull request #230 from scottslewis/master

scottslewis · web-flow · commit 716fde8efa68 · 2025-09-13T20:39:16.000-07:00
Fix for #229
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
@@ -30,8 +30,8 @@
                   <additionalArgument>-Xdoclint:none</additionalArgument>
                   <additionalArgument>-splitindex</additionalArgument>
                   <additionalArgument>-use</additionalArgument>
-                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.16.3 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.16.3 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.16.5 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.16.5 API"</additionalArgument>
                   <additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
                   <additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
                   <additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin
 Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin
-Bundle-Version: 4.9.3.qualifier
+Bundle-Version: 4.9.400.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.osgi.services.remoteserviceadmin.Activator
 Bundle-Vendor: %bundle.provider
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml
@@ -8,8 +8,8 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
-  <groupId>org.eclipse.ecf</groupId>
+  
   <artifactId>org.eclipse.ecf.osgi.services.remoteserviceadmin</artifactId>
-  <version>4.9.3-SNAPSHOT</version>
+  <version>4.9.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java
@@ -69,10 +69,6 @@ class EndpointRegistrationHolder {
 			this.reg = reg;
 		}
 		
-		void unadvertise() {
-			unadvertiseEndpointDescription(this.ed);
-		}
-
 		public void unregister() {
 			try {
 				this.reg.unregister();
@@ -115,10 +111,14 @@ protected String getFrameworkUUID() {
 	public void close() {
 		registrationLock.lock();
 		try {
-			registrations.entrySet().stream().forEach(entry -> {
-				entry.getValue().forEach(h -> h.unadvertise());
-			});
-			registrations.clear();
+			for(Iterator<List<EndpointRegistrationHolder>> i = registrations.values().iterator(); i.hasNext(); ) {
+				for(Iterator<EndpointRegistrationHolder> j = i.next().iterator(); i.hasNext(); ) {
+					// call unregister
+					j.next().unregister();
+					j.remove();
+				}
+				i.remove();
+			}
 		} finally {
 			registrationLock.unlock();
 		}
diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.core"
       label="ECF SDK for Eclipse"
-      version="3.16.4.qualifier"
+      version="3.16.5.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.ecf"
       license-feature="org.eclipse.license"
diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/releng/features/org.eclipse.ecf.core/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.core</artifactId>
-  <version>3.16.4-SNAPSHOT</version>
+  <version>3.16.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.osgi.services.feature"
       label="ECF Remote Services Admin"
-      version="2.7.0.qualifier"
+      version="2.7.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   
   <artifactId>org.eclipse.ecf.osgi.services.feature</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.7.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature"
       label="ECF Remote Services SDK for Bndtools"
-      version="3.16.4.qualifier"
+      version="3.16.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</artifactId>
-  <version>3.16.4-SNAPSHOT</version>
+  <version>3.16.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature"
       label="ECF Remote Services SDK for Eclipse"
-      version="3.16.4.qualifier"
+      version="3.16.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</artifactId>
-  <version>3.16.4-SNAPSHOT</version>
+  <version>3.16.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.feature"
       label="ECF Remote Services SDK for OSGi clients and servers"
-      version="3.16.4.qualifier"
+      version="3.16.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
-  <version>3.16.4-SNAPSHOT</version>
+  <version>3.16.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.sdk"
       label="%featureName"
-      version="3.16.4.qualifier"
+      version="3.16.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	name="ecf-remoteservices-sdk-3.16.4">
-	<feature name="ecf-rs-dependencies-supplement" version="3.16.4" description="ECF 3.16.4 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+	name="ecf-remoteservices-sdk-3.16.5">
+	<feature name="ecf-rs-dependencies-supplement" version="3.16.5" description="ECF 3.16.5 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
 		<bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0</bundle>
 	</feature>		
 
-	<feature name="ecf-rs-dependencies" version="3.16.4"
-		description="ECF 3.16.4 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
-		<feature version="3.16.4">ecf-rs-dependencies-supplement</feature>
+	<feature name="ecf-rs-dependencies" version="3.16.5"
+		description="ECF 3.16.5 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+		<feature version="3.16.5">ecf-rs-dependencies-supplement</feature>
 		<bundle>
 			mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
 		</bundle>
@@ -21,9 +21,9 @@
 		<feature>eventadmin</feature>
 	</feature>
 	
-	<feature name="ecf-rs-core" version="3.16.4"
+	<feature name="ecf-rs-core" version="3.16.5"
 		description="ECF Core">
-		<feature version="3.16.4">ecf-rs-dependencies</feature>
+		<feature version="3.16.5">ecf-rs-dependencies</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
 		<bundle>
@@ -39,16 +39,16 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-console" version="3.16.4"
+	<feature name="ecf-rs-console" version="3.16.5"
 		description="ECF Console">
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-impl" version="3.16.4"
+	<feature name="ecf-rs-rsa-impl" version="3.16.5"
 		description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
-		<feature version="3.16.4">ecf-rs-core</feature>
+		<feature version="3.16.5">ecf-rs-core</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
 		</bundle>
@@ -59,28 +59,28 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-topology-manager" version="3.16.4"
+	<feature name="ecf-rs-rsa-topology-manager" version="3.16.5"
 		description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa" version="3.16.4"
-		description="ECF 3.16.4 Remote Service Admin">
-		<feature version="3.16.4">ecf-rs-rsa-impl</feature>
-		<feature version="3.16.4">ecf-rs-rsa-topology-manager</feature>
+	<feature name="ecf-rs-rsa" version="3.16.5"
+		description="ECF 3.16.5 Remote Service Admin">
+		<feature version="3.16.5">ecf-rs-rsa-impl</feature>
+		<feature version="3.16.5">ecf-rs-rsa-topology-manager</feature>
 	</feature>
-	<feature name="ecf-rs-distribution-generic" version="3.16.4"
+	<feature name="ecf-rs-distribution-generic" version="3.16.5"
 		description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.16.4">ecf-rs-rsa</feature>
+		<feature version="3.16.5">ecf-rs-rsa</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-distribution-rosgi" version="3.16.4"
+	<feature name="ecf-rs-distribution-rosgi" version="3.16.5"
 		description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.16.4">ecf-rs-rsa</feature>
+		<feature version="3.16.5">ecf-rs-rsa</feature>
 		<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -90,62 +90,62 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-discovery-jmdns" version="3.16.4"
+	<feature name="ecf-rs-discovery-jmdns" version="3.16.5"
 		description="ECF RemoteServices JMDNS Discovery Provider">
-		<feature version="3.16.4">ecf-rs-rsa</feature>
+		<feature version="3.16.5">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
 		</bundle>
 	</feature>
-	<feature name="ecf-ai-mcp" version="3.16.4"
-		description="ECF 3.16.4 AI Model Context Protocol Remote Tool Support">
+	<feature name="ecf-ai-mcp" version="3.16.5"
+		description="ECF 3.16.5 AI Model Context Protocol Remote Tool Support">
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.ai.mcp.tools
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-eventadmin" version="3.16.4"
-		description="ECF 3.16.4 RemoteServices SDK Distributed EventAdmin">
-		<feature version="3.16.4">ecf-rs-rsa</feature>
+	<feature name="ecf-rs-eventadmin" version="3.16.5"
+		description="ECF 3.16.5 RemoteServices SDK Distributed EventAdmin">
+		<feature version="3.16.5">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-api"
-		version="3.16.4"
+		version="3.16.5"
 		description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.async_2.1.100.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-host"
-		version="3.16.4"
+		version="3.16.5"
 		description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.16.4">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.16.5">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.host_1.1.300.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-consumer-async"
-		version="3.16.4"
+		version="3.16.5"
 		description="ECF RemoteService TimeService Async Example Consumer.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.16.4">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.16.5">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.consumer.ds.async_1.0.200.v20200611-1508.jar
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-sdk" version="3.16.4"
-		description="ECF 3.16.4 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.16.4">ecf-rs-distribution-generic</feature>
-		<feature version="3.16.4">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.16.4">ecf-rs-console</feature>
+	<feature name="ecf-rs-sdk" version="3.16.5"
+		description="ECF 3.16.5 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.16.5">ecf-rs-distribution-generic</feature>
+		<feature version="3.16.5">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.16.5">ecf-rs-console</feature>
 	</feature>
 	<feature name="ecf-rs-sdk-examples-timeservicehost"
-		version="3.16.4"
-		description="ECF 3.16.4 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.16.4">ecf-rs-distribution-generic</feature>
-		<feature version="3.16.4">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.16.4">ecf-rs-console</feature>
-		<feature version="3.16.4">ecf-rs-examples-timeservice-host</feature>
+		version="3.16.5"
+		description="ECF 3.16.5 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.16.5">ecf-rs-distribution-generic</feature>
+		<feature version="3.16.5">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.16.5">ecf-rs-console</feature>
+		<feature version="3.16.5">ecf-rs-examples-timeservice-host</feature>
 	</feature>
 	<repository>https://raw.githubusercontent.com/ECF/XmlRpcProvider/master/build/karaf-features.xml</repository>
 	<!-- Include Py4j RemoteServicesProvider -->
diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/releng/org.eclipse.ecf.releng.repository/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.releng.repository</artifactId>
-  <version>3.16.4-SNAPSHOT</version>
+  <version>3.16.5-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <name>ECF p2 Repository</name>
