Expose system definitions from the deployer

Add the removal of entries when the member leaves the group
Add listeners to the hazelcastInstance

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900661 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 66 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
index 949d2d8af7..8ecc5f7ea8 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
@@ -69,6 +69,30 @@ public class EndpointHelper {
         if (serviceID != null) {
             props.put(RemoteConstants.ENDPOINT_SERVICE_ID, Long.parseLong(serviceID));
         }
+
+        // FIXME: [rfeng] We need to calculate the intents supported by this endpoint
+        /*
+        QName bindingTypeName = endpoint.getBinding().getType();
+        Definitions definitions = null;
+        if(definitions!=null) {
+        for(BindingType bindingType: definitions.getBindingTypes()) {
+            if(bindingType.getType().equals(bindingTypeName)) {
+                bindingType.getAlwaysProvidedIntents();
+            }
+        }
+        */
+        
+        String intents = (String)props.get(RemoteConstants.SERVICE_EXPORTED_INTENTS);
+        String extraIntents = (String)props.get(RemoteConstants.SERVICE_EXPORTED_INTENTS_EXTRA);
+        if (intents == null) {
+            intents = "";
+        }
+        if (extraIntents != null) {
+            intents = intents + " " + extraIntents;
+        }
+
+        props.put(RemoteConstants.SERVICE_INTENTS, intents.trim());
+        
         props.put(RemoteConstants.ENDPOINT_ID, endpoint.getURI());
         // FIXME: [rfeng] How to pass in the remote service id from the endpoint XML
         props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, new String[] {"org.osgi.sca"});
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
index 608c74bcfc..f4521cfbfc 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
@@ -27,6 +27,12 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.deployment.Deployer;
+import org.apache.tuscany.sca.policy.BindingType;
+import org.apache.tuscany.sca.policy.Intent;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -73,10 +79,28 @@ public class RemoteServiceAdminImpl implements RemoteServiceAdmin, ManagedServic
         importer.start();
         Hashtable<String, Object> props = new Hashtable<String, Object>();
         props.put(RemoteConstants.REMOTE_CONFIGS_SUPPORTED, new String[] {"org.osgi.sca"});
+        
+        ExtensionPointRegistry registry = exporter.getExtensionPointRegistry();
+        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
+        Deployer deployer = utilities.getUtility(Deployer.class);
+        Definitions definitions = deployer.getSystemDefinitions();
+
+        String[] intents = new String[definitions.getIntents().size()];
+        int i = 0;
+        for (Intent intent : definitions.getIntents()) {
+            intents[i++] = intent.toString();
+        }
+
+        String[] bindingTypes = new String[definitions.getBindingTypes().size()];
+        i = 0;
+        for (BindingType bindingType : definitions.getBindingTypes()) {
+            bindingTypes[i++] = bindingType.getType().toString();
+        }
+        
         // FIXME: We should ask SCA domain for the supported intents
-        props.put(RemoteConstants.REMOTE_INTENTS_SUPPORTED, new String[] {});
+        props.put(RemoteConstants.REMOTE_INTENTS_SUPPORTED, intents);
         // FIXME: We should ask SCA domain for the supported binding types
-        props.put("org.osgi.sca.binding.types", new String[] {});
+        props.put("org.osgi.sca.binding.types", bindingTypes);
         registration = context.registerService(RemoteServiceAdmin.class.getName(), this, props);
         
         props = new Hashtable<String, Object>();
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
index f6e9855556..a7c6d04ee9 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
@@ -53,6 +53,19 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements
         this.domainRegistryFactory =
             registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(DomainRegistryFactory.class);
         domainRegistryFactory.addListener(this);
+
+        // [rfeng] Starting of the endpoint registry takes a long time and it leaves the bundle
+        // state to be starting. When the registry is started, remote endpoints come in and that
+        // triggers the classloading from this bundle.
+        Thread thread = new Thread() {
+            public void run() {
+                startEndpointRegistry();
+            }
+        };
+        thread.start();
+    }
+
+    private void startEndpointRegistry() {
         // The following code forced the start() of the domain registry in absense of services
         String domainRegistry = context.getProperty("org.osgi.sca.domain.registry");
         if (domainRegistry == null) {
@@ -103,6 +116,8 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements
         {
             // Notify the endpoint listeners
             EndpointDescription description = createEndpointDescription(bundleContext, endpoint);
+            // Set the owning bundle to runtime bundle to avoid NPE
+            servicesInfo.put(description, context.getBundle());
             endpointChanged(description, ADDED);
         }
     }
@@ -115,6 +130,7 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements
         */ 
         {
             EndpointDescription description = createEndpointDescription(context, endpoint);
+            servicesInfo.remove(description);
             endpointChanged(description, REMOVED);
         }
     }