Versopm 1.5.6. Fixed problem with member import logic

build/karaf-features.xml

@@ -1,36 +1,36 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	name="ecf-remoteservices-hazelcast-1.5.5">
+	name="ecf-remoteservices-hazelcast-1.5.6">
 
     <repository>http://download.eclipse.org/rt/ecf/RELEASE/site.p2/karaf-features.xml</repository>
 
-	<feature name="ecf-rs-hazelcast-deps" version="1.5.5"
+	<feature name="ecf-rs-hazelcast-deps" version="1.5.6"
 		description="ECF Hazelcast Dependencies Support. See https://github.com/ECF/HazelcastProvider">
 		<feature>ecf-rs-rsa</feature>
 		<feature>ecf-rs-console</feature>
 		<feature>transaction-api</feature>
 		<bundle start-level="20">mvn:com.hazelcast/hazelcast/3.12.2</bundle>
 	</feature>
 
-	<feature name="ecf-rs-distribution-hazelcast" version="1.5.5"
+	<feature name="ecf-rs-distribution-hazelcast" version="1.5.6"
 		description="ECF Hazelcast Distribution Provider Support. See https://github.com/ECF/HazelcastProvider">
 		<feature>ecf-rs-hazelcast-deps</feature>
 		<feature>ecf-rs-distribution-generic</feature>
 		<bundle>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/plugins/javax.jms_1.1.0.v201205091237.jar
 		</bundle>
 		<bundle>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/plugins/org.eclipse.ecf.provider.jms_1.10.100.201806152009.jar
 		</bundle>
-		<bundle>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/plugins/org.eclipse.ecf.provider.jms.hazelcast_1.3.3.201910021908.jar
+		<bundle>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/plugins/org.eclipse.ecf.provider.jms.hazelcast_1.3.4.201910022114.jar
 		</bundle>
 	</feature>
 
-	<feature name="ecf-rs-discovery-hazelcast" version="1.5.5"
+	<feature name="ecf-rs-discovery-hazelcast" version="1.5.6"
 		description="ECF Hazelcast Discovery Provider Support. See https://github.com/ECF/HazelcastProvider">
 		<feature>ecf-rs-hazelcast-deps</feature>
-		<bundle>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/plugins/org.eclipse.ecf.discovery.provider.hazelcast_1.0.4.201910021908.jar
+		<bundle>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/plugins/org.eclipse.ecf.discovery.provider.hazelcast_1.0.4.201910022114.jar
 		</bundle>
 	</feature>
 
-	<feature name="ecf-rs-hazelcast" version="1.5.5"
+	<feature name="ecf-rs-hazelcast" version="1.5.6"
 		description="ECF Hazelcast Distribution and Discovery Provider Support. See https://github.com/ECF/HazelcastProvider">
 		<feature>ecf-rs-discovery-hazelcast</feature>
 		<feature>ecf-rs-distribution-hazelcast</feature>

bundles/org.eclipse.ecf.provider.jms.hazelcast/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECF Hazelcast Distribution Provider
 Bundle-SymbolicName: org.eclipse.ecf.provider.jms.hazelcast
-Bundle-Version: 1.3.3.qualifier
+Bundle-Version: 1.3.4.qualifier
 Bundle-Vendor: %bundle.provider
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Activator: org.eclipse.ecf.provider.internal.jms.hazelcast.Activator

bundles/org.eclipse.ecf.provider.jms.hazelcast/pom.xml

@@ -10,5 +10,5 @@
   </parent>
   <artifactId>org.eclipse.ecf.provider.jms.hazelcast</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.4-SNAPSHOT</version>
 </project>

bundles/org.eclipse.ecf.provider.jms.hazelcast/src/org/eclipse/ecf/provider/jms/hazelcast/HazelcastManagerContainer.java

@@ -14,11 +14,12 @@
 
 import org.eclipse.ecf.core.ContainerConnectException;
 import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.ECFException;
+import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription;
 import org.eclipse.ecf.provider.comm.ConnectionCreateException;
 import org.eclipse.ecf.provider.comm.ISynchAsynchConnection;
 import org.eclipse.ecf.provider.internal.jms.hazelcast.Activator;
-import org.eclipse.ecf.provider.internal.jms.hazelcast.HazelcastImportHelper;
 import org.eclipse.ecf.provider.jms.container.AbstractJMSServer;
 import org.eclipse.ecf.provider.jms.container.JMSContainerConfig;
 import org.eclipse.ecf.provider.jms.identity.JMSID;
@@ -47,12 +48,10 @@ protected IContainer createHazelcastContainer(JMSID serverID, @SuppressWarnings(
 
 	private final Config hazelcastConfig;
 	private HazelcastInstance hazelcastInstance;
-	private final HazelcastImportHelper importHelper;
 
 	protected HazelcastManagerContainer(JMSContainerConfig config, Config hazelcastConfig) {
 		super(config);
 		this.hazelcastConfig = hazelcastConfig;
-		this.importHelper = new HazelcastImportHelper();
 	}
 
 	@Override
@@ -101,9 +100,15 @@ public void disconnect() {
 	@Override
 	public IRemoteServiceReference[] importEndpoint(Map<String, Object> endpointDescriptionProperties)
 			throws ContainerConnectException, InvalidSyntaxException {
-		return importHelper.getRemoteServiceReferences(
-				(IRemoteServiceContainerAdapter) getAdapter(IRemoteServiceContainerAdapter.class), getID(),
-				endpointDescriptionProperties);
+		EndpointDescription ed = new EndpointDescription(endpointDescriptionProperties);
+		Long rsId = ed.getRemoteServiceId();
+		String filter = new StringBuffer("(&(") //$NON-NLS-1$
+				.append(org.eclipse.ecf.remoteservice.Constants.SERVICE_ID).append("=").append(rsId).append(")") //$NON-NLS-1$ //$NON-NLS-2$
+				.append(")").toString();
+		IRemoteServiceContainerAdapter adapter = (IRemoteServiceContainerAdapter) getAdapter(
+				IRemoteServiceContainerAdapter.class);
+		return adapter.getRemoteServiceReferences(getID(), new ID[] { ed.getContainerID() },
+				ed.getInterfaces().iterator().next(), filter);
 	}
 
 }

bundles/org.eclipse.ecf.provider.jms.hazelcast/src/org/eclipse/ecf/provider/jms/hazelcast/HazelcastMemberContainer.java

@@ -15,11 +15,11 @@
 import org.eclipse.ecf.core.ContainerConnectException;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription;
 import org.eclipse.ecf.provider.comm.ConnectionCreateException;
 import org.eclipse.ecf.provider.comm.IConnection;
 import org.eclipse.ecf.provider.comm.ISynchAsynchConnection;
 import org.eclipse.ecf.provider.internal.jms.hazelcast.Activator;
-import org.eclipse.ecf.provider.internal.jms.hazelcast.HazelcastImportHelper;
 import org.eclipse.ecf.provider.jms.container.AbstractJMSClient;
 import org.eclipse.ecf.provider.jms.container.JMSContainerConfig;
 import org.eclipse.ecf.provider.jms.identity.JMSID;
@@ -45,12 +45,10 @@ protected IContainer createHazelcastContainer(JMSID id, @SuppressWarnings("rawty
 
 	private final Config hazelcastConfig;
 	private HazelcastInstance hazelcastInstance;
-	private HazelcastImportHelper importHelper;
 
 	protected HazelcastMemberContainer(JMSContainerConfig config, Config hazelcastConfig) {
 		super(config);
 		this.hazelcastConfig = hazelcastConfig;
-		this.importHelper = new HazelcastImportHelper();
 	}
 
 	@Override
@@ -98,9 +96,19 @@ public void disconnect() {
 	@Override
 	public IRemoteServiceReference[] importEndpoint(Map<String, Object> endpointDescriptionProperties)
 			throws ContainerConnectException, InvalidSyntaxException {
-		return importHelper.getRemoteServiceReferences(
-				(IRemoteServiceContainerAdapter) getAdapter(IRemoteServiceContainerAdapter.class), null,
-				endpointDescriptionProperties);
+		EndpointDescription ed = new EndpointDescription(endpointDescriptionProperties);
+		Long rsId = ed.getRemoteServiceId();
+		String filter = new StringBuffer("(&(") //$NON-NLS-1$
+				.append(org.eclipse.ecf.remoteservice.Constants.SERVICE_ID).append("=").append(rsId).append(")") //$NON-NLS-1$ //$NON-NLS-2$
+				.append(")").toString();
+		IRemoteServiceContainerAdapter adapter = (IRemoteServiceContainerAdapter) getAdapter(
+				IRemoteServiceContainerAdapter.class);
+		ID targetID = ed.getConnectTargetID();
+		if (targetID == null) {
+			targetID = ed.getContainerID();
+		}
+		return adapter.getRemoteServiceReferences(targetID, new ID[] { ed.getContainerID() },
+				ed.getInterfaces().iterator().next(), filter);
 	}
 
 }

features/org.eclipse.ecf.discovery.provider.hazelcast.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.discovery.provider.hazelcast.feature"
       label="ECF Hazelcast Discovery Feature"
-      version="1.5.5.qualifier"
+      version="1.5.6.qualifier"
       provider-name="Eclipse.org - ECF">
 
    <description url="http://www.example.com/description">

features/org.eclipse.ecf.discovery.provider.hazelcast.feature/pom.xml

@@ -10,5 +10,5 @@
   </parent>
   <artifactId>org.eclipse.ecf.discovery.provider.hazelcast.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>1.5.5-SNAPSHOT</version>
+  <version>1.5.6-SNAPSHOT</version>
 </project>

features/org.eclipse.ecf.provider.jms.hazelcast.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.provider.jms.hazelcast.feature"
       label="ECF Hazelcast Remote Service Distribution Provider Feature"
-      version="1.5.5.qualifier"
+      version="1.5.6.qualifier"
       provider-name="Eclipse.org - ECF">
 
    <description url="http://www.example.com/description">

features/org.eclipse.ecf.provider.jms.hazelcast.feature/pom.xml

@@ -10,5 +10,5 @@
   </parent>
   <artifactId>org.eclipse.ecf.provider.jms.hazelcast.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>1.5.5-SNAPSHOT</version>
+  <version>1.5.6-SNAPSHOT</version>
 </project>