First working version of SLC Runtime v2

[gpl/argeo-slc.git] / org.argeo.slc.core / src / org / argeo / slc / osgi / OsgiExecutionModulesManager.java

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
index 5718f2df025524dcd868713f7886e05548a54f40..046cfb6464301e2245c00669efe90535c48a5146 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
@@ -46,6 +46,7 @@ import org.argeo.slc.execution.ExecutionFlowDescriptorConverter;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.execution.ExecutionModulesListener;
 import org.argeo.slc.execution.RealizedFlow;
+import org.eclipse.gemini.blueprint.service.importer.OsgiServiceLifecycleListener;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleException;
@@ -53,7 +54,6 @@ import org.osgi.framework.BundleListener;
 import org.osgi.framework.Constants;
 import org.osgi.framework.launch.Framework;
 import org.springframework.context.ApplicationContext;
-import org.eclipse.gemini.blueprint.service.importer.OsgiServiceLifecycleListener;
 
 /** Execution modules manager implementation based on an OSGi runtime. */
 public class OsgiExecutionModulesManager extends
@@ -346,7 +346,7 @@ public class OsgiExecutionModulesManager extends
                                                + bundle.getSymbolicName() + ")";
                                try {
                                        bundlesManager.getServiceRefSynchronous(
-                                                       ApplicationContext.class.getName(), filter);
+                                                       ApplicationContext.class, filter);
                                } catch (Exception e) {
                                        // stop if application context not found
                                        bundle.stop();
@@ -497,7 +497,7 @@ public class OsgiExecutionModulesManager extends
        public synchronized void unregister(ExecutionFlow executionFlow,
                        Map<String, String> properties) {
                // FIXME why are properties null?
-               if(properties==null)
+               if (properties == null)
                        return;
                OsgiBundle osgiBundle = asOsgiBundle(properties);
                if (executionFlows.containsKey(osgiBundle)) {
@@ -631,33 +631,32 @@ public class OsgiExecutionModulesManager extends
                }
        }
 
-       @SuppressWarnings("deprecation")
        protected ObjectName flowMBeanName(Module module,
                        ExecutionFlow executionFlow) {
                String executionModulesPrefix = "SLCExecutionModules";
-               String path = executionFlow.getPath();
+               // String path = executionFlow.getPath();
                String name = executionFlow.getName();
-               if (path == null && name.indexOf('/') >= 0) {
-                       path = name.substring(0, name.lastIndexOf('/'));
-                       name = name.substring(name.lastIndexOf('/'));
-               }
+               // if (path == null && name.indexOf('/') >= 0) {
+               // path = name.substring(0, name.lastIndexOf('/'));
+               // name = name.substring(name.lastIndexOf('/'));
+               // }
 
                StringBuffer buf = new StringBuffer(executionModulesPrefix + ":"
                                + "module=" + module.getName() + " [" + module.getVersion()
                                + "],");
 
-               if (path != null && !path.equals("")) {
-                       int depth = 0;
-                       for (String token : path.split("/")) {
-                               if (!token.equals("")) {
-                                       buf.append("path").append(depth).append('=');
-                                       // in order to have directories first
-                                       buf.append('/');
-                                       buf.append(token).append(',');
-                                       depth++;
-                               }
-                       }
-               }
+               // if (path != null && !path.equals("")) {
+               // int depth = 0;
+               // for (String token : path.split("/")) {
+               // if (!token.equals("")) {
+               // buf.append("path").append(depth).append('=');
+               // // in order to have directories first
+               // buf.append('/');
+               // buf.append(token).append(',');
+               // depth++;
+               // }
+               // }
+               // }
                buf.append("name=").append(name);
                try {
                        return new ObjectName(buf.toString());