Turn JavaClassVisitor to declarative services and remove the module activator

Add a ServiceHelper utility to simplify the instantiation of declared services
Refactor the module activator to receive ExtensionPointRegistry from constructor

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

1 files changed, 6 insertions, 6 deletions

diff --git a/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java b/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
index 3e7eb96798..bfa98ad725 100644
--- a/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
+++ b/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.core.LifeCycleListener;
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -104,20 +104,20 @@ public class OSGiExtensionPointRegistry extends DefaultExtensionPointRegistry {
     @Override
     public void stop() {
         // Get a unique map as an extension point may exist in the map by different keys
-        Map<ModuleActivator, ModuleActivator> map = new IdentityHashMap<ModuleActivator, ModuleActivator>();
+        Map<LifeCycleListener, LifeCycleListener> map = new IdentityHashMap<LifeCycleListener, LifeCycleListener>();
         for (ServiceRegistration reg : services.values()) {
             ServiceReference ref = reg.getReference();
             if (ref != null) {
                 Object service = bundleContext.getService(ref);
-                if (service instanceof ModuleActivator) {
-                    ModuleActivator activator = (ModuleActivator)service;
+                if (service instanceof LifeCycleListener) {
+                    LifeCycleListener activator = (LifeCycleListener)service;
                     map.put(activator, activator);
                 }
                 reg.unregister();
             }
         }
-        for (ModuleActivator activator : map.values()) {
-            activator.stop(this);
+        for (LifeCycleListener activator : map.values()) {
+            activator.stop();
         }
         services.clear();
     }