]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
Make services lookup more robust
[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.osgi / src / main / java / org / argeo / slc / osgi / OsgiExecutionModulesManager.java
index 9fd9c09f419bb7b2bfe43c40a66868b91ed98dd4..5a8d3da5437ac728876c78a536c9910dad0c6ab4 100644 (file)
@@ -1,21 +1,43 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.osgi;
 
+import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.StandardMBean;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.BasicNameVersion;
+import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.build.BasicNameVersion;
 import org.argeo.slc.core.execution.AbstractExecutionModulesManager;
 import org.argeo.slc.core.execution.DefaultExecutionFlowDescriptorConverter;
+import org.argeo.slc.deploy.Module;
 import org.argeo.slc.deploy.ModuleDescriptor;
 import org.argeo.slc.execution.ExecutionContext;
 import org.argeo.slc.execution.ExecutionFlow;
@@ -25,118 +47,129 @@ import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.execution.ExecutionModulesListener;
 import org.argeo.slc.process.RealizedFlow;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.BundleListener;
 import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
+import org.osgi.framework.launch.Framework;
+import org.springframework.context.ApplicationContext;
 import org.springframework.osgi.service.importer.OsgiServiceLifecycleListener;
 
+/** Execution modules manager implementation based on an OSGi runtime. */
 public class OsgiExecutionModulesManager extends
-               AbstractExecutionModulesManager implements InitializingBean,
-               DisposableBean, OsgiServiceLifecycleListener {
-
-       static {
-               // Force usage of vanilla Xalan when in OSGi
-               // We would like to do it in a cleaner way
-               // but the integration of Xalan and Xerces in the JRE
-               // makes it very difficult
-               // Suggestions welcome!
-               Properties systemProperties = System.getProperties();
-               // if (!systemProperties
-               // .containsKey("javax.xml.parsers.DocumentBuilderFactory"))
-               // System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
-               // "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
-               // if
-               // (!systemProperties.containsKey("javax.xml.parsers.SAXParserFactory"))
-               // System.setProperty("javax.xml.parsers.SAXParserFactory",
-               // "org.apache.xerces.jaxp.SAXParserFactoryImpl");
-               if (!systemProperties
-                               .containsKey("javax.xml.transform.TransformerFactory"))
-                       System.setProperty("javax.xml.transform.TransformerFactory",
-                                       "org.apache.xalan.processor.TransformerFactoryImpl");
-       }
-
-       private final static String PROPERTY_CACHE_SERVICES = "slc.osgi.execution.cacheServices";
+               AbstractExecutionModulesManager implements
+               OsgiServiceLifecycleListener, BundleListener {
 
        private final static Log log = LogFactory
                        .getLog(OsgiExecutionModulesManager.class);
 
        private BundlesManager bundlesManager;
-       private ServiceTracker executionContextsTracker;
        private Map<OsgiBundle, ExecutionContext> executionContexts = new HashMap<OsgiBundle, ExecutionContext>();
        private Map<OsgiBundle, ExecutionFlowDescriptorConverter> executionFlowDescriptorConverters = new HashMap<OsgiBundle, ExecutionFlowDescriptorConverter>();
        private Map<OsgiBundle, Set<ExecutionFlow>> executionFlows = new HashMap<OsgiBundle, Set<ExecutionFlow>>();
        private ExecutionFlowDescriptorConverter defaultDescriptorConverter = new DefaultExecutionFlowDescriptorConverter();
 
-       private Boolean useCachedServices = Boolean.parseBoolean(System
-                       .getProperty(PROPERTY_CACHE_SERVICES, "true"));
+       private List<ExecutionModulesListener> executionModulesListeners = new ArrayList<ExecutionModulesListener>();
+
+       private Boolean registerFlowsToJmx = false;
+
+       public void init() throws Exception {
+               bundlesManager.getBundleContext().addBundleListener(this);
+
+               final String module = System.getProperty(UNIQUE_LAUNCH_MODULE_PROPERTY);
+               final String flow = System.getProperty(UNIQUE_LAUNCH_FLOW_PROPERTY);
+               if (module != null) {
+                       // launch a flow and stops
+                       new Thread("Unique Flow") {
+                               @Override
+                               public void run() {
+                                       executeFlowAndExit(module, null, flow);
+                               }
+                       }.start();
+               }
+       }
+
+       public void destroy() {
+               bundlesManager.getBundleContext().removeBundleListener(this);
+       }
+
+       /** Executes a single flow and <b>stops the JVM</b> */
+       protected void executeFlowAndExit(final String module,
+                       final String version, final String flow) {
+               if (log.isDebugEnabled())
+                       log.debug("Launch unique flow " + flow + " from module " + module);
+               try {
+                       OsgiBundle osgiBundle = bundlesManager.findFromPattern(module);
+                       Bundle moduleBundle = bundlesManager.findRelatedBundle(osgiBundle);
+                       bundlesManager.startSynchronous(moduleBundle);
+                       RealizedFlow lastLaunch = findRealizedFlow(module, flow);
+                       if (lastLaunch == null)
+                               throw new SlcException("Cannot find launch for " + module + " "
+                                               + flow);
+                       execute(lastLaunch);
+               } catch (Exception e) {
+                       log.error(
+                                       "Error in unique flow " + flow + " from module " + module,
+                                       e);
+               } finally {
+                       if (log.isDebugEnabled())
+                               log.debug("Shutdown OSGi runtime...");
+                       Framework framework = (Framework) bundlesManager.getBundleContext()
+                                       .getBundle(0);
+                       try {
+                               // shutdown framework
+                               framework.stop();
+                               // wait 1 min for shutdown
+                               framework.waitForStop(60 * 1000);
+                               // close VM
+                               System.exit(0);
+                       } catch (Exception e) {
+                               e.printStackTrace();
+                               System.exit(1);
+                       }
+               }
+       }
 
        public synchronized ExecutionModuleDescriptor getExecutionModuleDescriptor(
                        String moduleName, String version) {
                ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-               if (useCachedServices) {
-                       OsgiBundle osgiBundle = null;
-                       BasicNameVersion nameVersion = new BasicNameVersion(moduleName,
-                                       version);
-                       bundles: for (Iterator<OsgiBundle> iterator = executionContexts
-                                       .keySet().iterator(); iterator.hasNext();) {
-                               OsgiBundle ob = iterator.next();
-                               if (ob.equals(nameVersion)) {
-                                       osgiBundle = ob;
-                                       break bundles;
-                               }
+               OsgiBundle osgiBundle = null;
+               BasicNameVersion nameVersion = new BasicNameVersion(moduleName, version);
+               bundles: for (Iterator<OsgiBundle> iterator = executionContexts
+                               .keySet().iterator(); iterator.hasNext();) {
+                       OsgiBundle ob = iterator.next();
+                       if (ob.equals(nameVersion)) {
+                               osgiBundle = ob;
+                               break bundles;
                        }
-                       if (osgiBundle == null)
-                               throw new SlcException("No execution module registered for "
-                                               + nameVersion);
-                       md.setName(osgiBundle.getName());
-                       md.setVersion(osgiBundle.getVersion());
-                       md.setLabel(osgiBundle.getLabel());
-                       md.setDescription(osgiBundle.getDescription());
-               } else {
-                       md.setName(moduleName);
-                       md.setVersion(version);
-                       setMetadataFromBundle(md, null);
                }
+               if (osgiBundle == null)
+                       throw new SlcException("No execution module registered for "
+                                       + nameVersion);
+               md.setName(osgiBundle.getName());
+               md.setVersion(osgiBundle.getVersion());
+               md.setTitle(osgiBundle.getTitle());
+               md.setDescription(osgiBundle.getDescription());
+
                ExecutionFlowDescriptorConverter executionFlowDescriptorConverter = getExecutionFlowDescriptorConverter(
                                moduleName, version);
                if (executionFlowDescriptorConverter == null)
                        throw new SlcException("No flow converter found.");
-               executionFlowDescriptorConverter.addFlowsToDescriptor(md, listFlows(
-                               moduleName, version));
+               executionFlowDescriptorConverter.addFlowsToDescriptor(md,
+                               listFlows(moduleName, version));
                return md;
        }
 
        public synchronized List<ExecutionModuleDescriptor> listExecutionModules() {
                List<ExecutionModuleDescriptor> descriptors = new ArrayList<ExecutionModuleDescriptor>();
 
-               if (useCachedServices) {
-                       for (Iterator<OsgiBundle> iterator = executionContexts.keySet()
-                                       .iterator(); iterator.hasNext();) {
-                               OsgiBundle osgiBundle = iterator.next();
-                               ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-                               setMetadataFromBundle(md, bundlesManager
-                                               .findRelatedBundle(osgiBundle));
-                               descriptors.add(md);
-                       }
-               } else {
-                       ServiceReference[] arr = executionContextsTracker
-                                       .getServiceReferences();
-                       if (arr == null) {
-                               log.error("Tracker returned null.");
-                               return descriptors;
-                       }
-
-                       List<ServiceReference> srs = Arrays.asList(arr);
-                       // ServiceReference[] srs =
-                       // executionContexts.getServiceReferences();
-                       for (ServiceReference sr : srs) {
-                               ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-                               setMetadataFromBundle(md, sr.getBundle());
-                               descriptors.add(md);
-                       }
+               for (Iterator<OsgiBundle> iterator = executionContexts.keySet()
+                               .iterator(); iterator.hasNext();) {
+                       OsgiBundle osgiBundle = iterator.next();
+                       ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
+                       setMetadataFromBundle(md,
+                                       bundlesManager.findRelatedBundle(osgiBundle));
+                       descriptors.add(md);
                }
                return descriptors;
        }
@@ -145,75 +178,50 @@ public class OsgiExecutionModulesManager extends
                        String moduleName, String moduleVersion) {
 
                Map<String, ExecutionFlow> flows = new HashMap<String, ExecutionFlow>();
-               if (useCachedServices) {
-                       Set<ExecutionFlow> flowsT = executionFlows.get(new OsgiBundle(
-                                       moduleName, moduleVersion));
-                       for (ExecutionFlow flow : flowsT)
-                               flows.put(flow.getName(), flow);
-               } else {
-
-                       // TODO: use service trackers?
-                       // String filter = OsgiFilterUtils.unifyFilter(ExecutionFlow.class,
-                       // null);
-
-                       String filter = "(Bundle-SymbolicName=" + moduleName + ")";
-                       ServiceReference[] sfs;
-                       try {
-                               sfs = bundlesManager.getBundleContext().getServiceReferences(
-                                               ExecutionFlow.class.getName(), filter);
-                       } catch (InvalidSyntaxException e) {
-                               throw new SlcException(
-                                               "Cannot retrieve service reference for flow " + filter,
-                                               e);
-                       }
-
-                       for (ServiceReference sf : sfs) {
-                               ExecutionFlow flow = (ExecutionFlow) bundlesManager
-                                               .getBundleContext().getService(sf);
-                               flows.put(flow.getName(), flow);
-                       }
-               }
+               OsgiBundle key = new OsgiBundle(moduleName, moduleVersion);
+               if (!executionFlows.containsKey(key))
+                       return flows;
+               Set<ExecutionFlow> flowsT = executionFlows.get(key);
+               for (ExecutionFlow flow : flowsT)
+                       flows.put(flow.getName(), flow);
                return flows;
        }
 
        protected ExecutionFlow findExecutionFlow(String moduleName,
                        String moduleVersion, String flowName) {
-               String filter = "(&(Bundle-SymbolicName=" + moduleName
-                               + ")(org.springframework.osgi.bean.name=" + flowName + "))";
+               String filter = moduleVersion == null || moduleVersion.equals("0.0.0") ? "(&(Bundle-SymbolicName="
+                               + moduleName
+                               + ")(org.springframework.osgi.bean.name="
+                               + flowName + "))"
+                               : "(&(Bundle-SymbolicName=" + moduleName + ")(Bundle-Version="
+                                               + moduleVersion
+                                               + ")(org.springframework.osgi.bean.name=" + flowName
+                                               + "))";
                return bundlesManager.getSingleServiceStrict(ExecutionFlow.class,
-                               filter);
+                               filter, true);
        }
 
        protected ExecutionContext findExecutionContext(String moduleName,
                        String moduleVersion) {
-               String filter = "(&(Bundle-SymbolicName=" + moduleName
-                               + ")(Bundle-Version=" + moduleVersion + "))";
+               String filter = moduleFilter(moduleName, moduleVersion);
                return bundlesManager.getSingleServiceStrict(ExecutionContext.class,
-                               filter);
+                               filter, true);
        }
 
        protected ExecutionFlowDescriptorConverter findExecutionFlowDescriptorConverter(
                        String moduleName, String moduleVersion) {
-
-               String filter = "(&(Bundle-SymbolicName=" + moduleName
-                               + ")(Bundle-Version=" + moduleVersion + "))";
+               String filter = moduleFilter(moduleName, moduleVersion);
                return bundlesManager.getSingleService(
-                               ExecutionFlowDescriptorConverter.class, filter);
+                               ExecutionFlowDescriptorConverter.class, filter, false);
        }
 
-       public void setBundlesManager(BundlesManager bundlesManager) {
-               this.bundlesManager = bundlesManager;
-       }
-
-       public void afterPropertiesSet() throws Exception {
-               if (!useCachedServices)
-                       executionContextsTracker = bundlesManager
-                                       .newTracker(ExecutionContext.class);
-       }
+       /** Only based on symbolic name if version is null or "0.0.0" */
+       protected String moduleFilter(String moduleName, String moduleVersion) {
+               return moduleVersion == null || moduleVersion.equals("0.0.0") ? "(Bundle-SymbolicName="
+                               + moduleName + ")"
+                               : "(&(Bundle-SymbolicName=" + moduleName + ")(Bundle-Version="
+                                               + moduleVersion + "))";
 
-       public void destroy() throws Exception {
-               if (executionContextsTracker != null)
-                       executionContextsTracker.close();
        }
 
        /**
@@ -252,62 +260,28 @@ public class OsgiExecutionModulesManager extends
                        launch.setFlowDescriptor(descriptor);
                        return launch;
                } else {
-                       log
-                                       .warn("Could not find any execution module matching these requirements.");
+                       log.warn("Could not find any execution module matching these requirements.");
                        return null;
                }
        }
 
-       public void updateAndExecute(RealizedFlow realizedFlow) {
-               OsgiBundle osgiBundle = new OsgiBundle(realizedFlow);
+       public void upgrade(NameVersion nameVersion) {
+               OsgiBundle osgiBundle = new OsgiBundle(nameVersion);
                bundlesManager.upgradeSynchronous(osgiBundle);
-               execute(realizedFlow);
        }
 
        protected synchronized ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
                        String moduleName, String moduleVersion) {
-               if (useCachedServices) {
-                       OsgiBundle osgiBundle = new OsgiBundle(moduleName, moduleVersion);
-                       if (executionFlowDescriptorConverters.containsKey(osgiBundle))
-                               return executionFlowDescriptorConverters.get(osgiBundle);
-                       else
-                               return defaultDescriptorConverter;
-               } else {
-                       // Check whether a descriptor converter is published by this module
-                       ExecutionFlowDescriptorConverter descriptorConverter = findExecutionFlowDescriptorConverter(
-                                       moduleName, moduleVersion);
-                       if (descriptorConverter == null)
-                               return defaultDescriptorConverter;
-                       else
-                               return descriptorConverter;
-               }
+               OsgiBundle osgiBundle = new OsgiBundle(moduleName, moduleVersion);
+               return getExecutionFlowDescriptorConverter(osgiBundle);
        }
 
-       public void execute(RealizedFlow realizedFlow) {
-               if (log.isTraceEnabled())
-                       log.trace("Executing " + realizedFlow);
-
-               String moduleName = realizedFlow.getModuleName();
-               String moduleVersion = realizedFlow.getModuleVersion();
-
-               Map<? extends String, ? extends Object> variablesToAdd = getExecutionFlowDescriptorConverter(
-                               moduleName, moduleVersion).convertValues(
-                               realizedFlow.getFlowDescriptor());
-               ExecutionContext executionContext = findExecutionContext(moduleName,
-                               moduleVersion);
-               for (String key : variablesToAdd.keySet())
-                       executionContext.setVariable(key, variablesToAdd.get(key));
-
-               ExecutionFlow flow = findExecutionFlow(moduleName, moduleVersion,
-                               realizedFlow.getFlowDescriptor().getName());
-
-               //
-               // Actually runs the flow, IN THIS THREAD
-               //
-               flow.run();
-               //
-               //
-               //
+       protected synchronized ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
+                       OsgiBundle osgiBundle) {
+               if (executionFlowDescriptorConverters.containsKey(osgiBundle))
+                       return executionFlowDescriptorConverters.get(osgiBundle);
+               else
+                       return defaultDescriptorConverter;
        }
 
        public ModuleDescriptor getModuleDescriptor(String moduleName,
@@ -326,6 +300,55 @@ public class OsgiExecutionModulesManager extends
                return lst;
        }
 
+       public void start(NameVersion nameVersion) {
+               try {
+                       Bundle bundle = bundlesManager.findRelatedBundle(new OsgiBundle(
+                                       nameVersion));
+                       if (bundle == null)
+                               throw new SlcException("Counld not find bundle for "
+                                               + nameVersion);
+
+                       bundlesManager.startSynchronous(bundle);
+                       if (isSpringInstrumented(bundle)) {
+                               // Wait for Spring application context to be ready
+                               String filter = "(Bundle-SymbolicName="
+                                               + bundle.getSymbolicName() + ")";
+                               try {
+                                       bundlesManager.getServiceRefSynchronous(
+                                                       ApplicationContext.class.getName(), filter);
+                               } catch (Exception e) {
+                                       // stop if application context not found
+                                       bundle.stop();
+                                       throw e;
+                               }
+                       }
+               } catch (Exception e) {
+                       throw new SlcException("Cannot start " + nameVersion, e);
+               }
+       }
+
+       /** Do it calmly in order to avoid NPE */
+       private Boolean isSpringInstrumented(Bundle bundle) {
+               Dictionary<?, ?> headers = bundle.getHeaders();
+               if (headers != null && headers.get("Spring-Context") != null)
+                       return true;
+               Enumeration<?> springEntryPaths = bundle
+                               .getEntryPaths("/META-INF/spring");
+               if (springEntryPaths != null && springEntryPaths.hasMoreElements())
+                       return true;
+               return false;
+       }
+
+       public void stop(NameVersion nameVersion) {
+               try {
+                       Bundle bundle = bundlesManager.findRelatedBundle(new OsgiBundle(
+                                       nameVersion));
+                       bundlesManager.stopSynchronous(bundle);
+               } catch (BundleException e) {
+                       throw new SlcException("Cannot stop " + nameVersion, e);
+               }
+       }
+
        protected void setMetadataFromBundle(ModuleDescriptor md, Bundle bundle) {
                Bundle bdl = bundle;
                if (bdl == null) {
@@ -349,8 +372,25 @@ public class OsgiExecutionModulesManager extends
 
                md.setName(bdl.getSymbolicName());
                md.setVersion(getHeaderSafe(bdl, Constants.BUNDLE_VERSION));
-               md.setLabel(getHeaderSafe(bdl, Constants.BUNDLE_NAME));
+               md.setTitle(getHeaderSafe(bdl, Constants.BUNDLE_NAME));
                md.setDescription(getHeaderSafe(bdl, Constants.BUNDLE_DESCRIPTION));
+
+               // copy manifets header to meta data
+               Dictionary<?, ?> headers = bundle.getHeaders();
+               Enumeration<?> keys = headers.keys();
+               while (keys.hasMoreElements()) {
+                       Object key = keys.nextElement();
+                       Object value = headers.get(key);
+                       if (value != null)
+                               md.getMetadata().put(key.toString(), value.toString());
+               }
+
+               // check if started
+               if (bundle.getState() == Bundle.ACTIVE
+                               || bundle.getState() == Bundle.STARTING)
+                       md.setStarted(true);
+               else
+                       md.setStarted(false);
        }
 
        private String getHeaderSafe(Bundle bundle, Object key) {
@@ -361,98 +401,239 @@ public class OsgiExecutionModulesManager extends
                        return obj.toString();
        }
 
-       @SuppressWarnings("unchecked")
-       public synchronized void bind(Object service, Map properties)
-                       throws Exception {
-               if (service instanceof ExecutionContext) {
-                       ExecutionContext executionContext = (ExecutionContext) service;
-                       OsgiBundle osgiBundle = asOsgiBundle(properties);
-                       Bundle bundle = bundlesManager.findRelatedBundle(osgiBundle);
-                       osgiBundle.setLabel(getHeaderSafe(bundle, Constants.BUNDLE_NAME));
-                       osgiBundle.setDescription(getHeaderSafe(bundle,
-                                       Constants.BUNDLE_DESCRIPTION));
-                       executionContexts.put(osgiBundle, executionContext);
+       /*
+        * REGISTRATION
+        */
+
+       /** Registers an execution context. */
+       public synchronized void register(ExecutionContext executionContext,
+                       Map<String, String> properties) {
+               OsgiBundle osgiBundle = asOsgiBundle(properties);
+               Bundle bundle = bundlesManager.findRelatedBundle(osgiBundle);
+               osgiBundle.setTitle(getHeaderSafe(bundle, Constants.BUNDLE_NAME));
+               osgiBundle.setDescription(getHeaderSafe(bundle,
+                               Constants.BUNDLE_DESCRIPTION));
+               executionContexts.put(osgiBundle, executionContext);
+               if (log.isTraceEnabled())
+                       log.trace("Registered execution context from " + osgiBundle);
+               // Notify
+               ModuleDescriptor md = osgiBundle.getModuleDescriptor();
+               md.setStarted(true);
+               for (ExecutionModulesListener listener : executionModulesListeners)
+                       listener.executionModuleAdded(md);
+       }
+
+       /** Unregisters an execution context. */
+       public synchronized void unregister(ExecutionContext executionContext,
+                       Map<String, String> properties) {
+               OsgiBundle osgiBundle = asOsgiBundle(properties);
+               if (executionContexts.containsKey(osgiBundle)) {
+                       executionContexts.remove(osgiBundle);
                        if (log.isTraceEnabled())
-                               log.debug("Registered execution context from " + osgiBundle);
+                               log.trace("Removed execution context from " + osgiBundle);
                        // Notify
-                       for (ExecutionModulesListener listener : getExecutionModulesListeners())
-                               listener.executionModuleAdded(osgiBundle, executionContext);
+                       ModuleDescriptor md = osgiBundle.getModuleDescriptor();
+                       md.setStarted(false);
+                       for (ExecutionModulesListener listener : executionModulesListeners)
+                               listener.executionModuleRemoved(md);
+               }
+       }
 
-               } else if (service instanceof ExecutionFlow) {
-                       ExecutionFlow executionFlow = (ExecutionFlow) service;
-                       OsgiBundle osgiBundle = asOsgiBundle(properties);
-                       if (!executionFlows.containsKey(osgiBundle)) {
-                               executionFlows.put(osgiBundle, new HashSet());
-                       }
-                       executionFlows.get(osgiBundle).add(executionFlow);
+       /** Registers an execution flow. */
+       public synchronized void register(ExecutionFlow executionFlow,
+                       Map<String, String> properties) {
+               OsgiBundle osgiBundle = asOsgiBundle(properties);
+               if (!executionFlows.containsKey(osgiBundle)) {
+                       executionFlows.put(osgiBundle, new HashSet<ExecutionFlow>());
+               }
+               executionFlows.get(osgiBundle).add(executionFlow);
+               if (log.isTraceEnabled())
+                       log.trace("Registered " + executionFlow + " from " + osgiBundle);
+
+               // notifications
+               if (registerFlowsToJmx)
+                       registerMBean(osgiBundle, executionFlow);
+               ExecutionFlowDescriptorConverter efdc = getExecutionFlowDescriptorConverter(osgiBundle);
+               for (ExecutionModulesListener listener : executionModulesListeners)
+                       listener.executionFlowAdded(osgiBundle.getModuleDescriptor(),
+                                       efdc.getExecutionFlowDescriptor(executionFlow));
+       }
+
+       /** Unregisters an execution flow. */
+       public synchronized void unregister(ExecutionFlow executionFlow,
+                       Map<String, String> properties) {
+               OsgiBundle osgiBundle = asOsgiBundle(properties);
+               if (executionFlows.containsKey(osgiBundle)) {
+                       Set<ExecutionFlow> flows = executionFlows.get(osgiBundle);
+                       flows.remove(executionFlow);
                        if (log.isTraceEnabled())
-                               log
-                                               .debug("Registered " + executionFlow + " from "
-                                                               + osgiBundle);
-                       for (ExecutionModulesListener listener : getExecutionModulesListeners())
-                               listener.executionFlowAdded(osgiBundle, executionFlow);
+                               log.trace("Removed " + executionFlow + " from " + osgiBundle);
+                       if (flows.size() == 0) {
+                               executionFlows.remove(osgiBundle);
+                               if (log.isTraceEnabled())
+                                       log.trace("Removed flows set from " + osgiBundle);
+                       }
+
+                       // notifications
+                       if (registerFlowsToJmx)
+                               unregisterMBean(osgiBundle, executionFlow);
+                       ExecutionFlowDescriptorConverter efdc = getExecutionFlowDescriptorConverter(osgiBundle);
+                       for (ExecutionModulesListener listener : executionModulesListeners)
+                               listener.executionFlowRemoved(osgiBundle.getModuleDescriptor(),
+                                               efdc.getExecutionFlowDescriptor(executionFlow));
+               }
+       }
 
-               } else if (service instanceof ExecutionFlowDescriptorConverter) {
+       /** Registers an execution module listener. */
+       public synchronized void register(
+                       ExecutionModulesListener executionModulesListener,
+                       Map<String, String> properties) {
+               // sync with current state
+               for (OsgiBundle osgiBundle : executionContexts.keySet()) {
+                       executionModulesListener.executionModuleAdded(osgiBundle
+                                       .getModuleDescriptor());
+               }
+               for (OsgiBundle osgiBundle : executionFlows.keySet()) {
+                       ExecutionFlowDescriptorConverter efdc = getExecutionFlowDescriptorConverter(osgiBundle);
+                       for (ExecutionFlow executionFlow : executionFlows.get(osgiBundle))
+                               executionModulesListener.executionFlowAdded(
+                                               osgiBundle.getModuleDescriptor(),
+                                               efdc.getExecutionFlowDescriptor(executionFlow));
+               }
+               executionModulesListeners.add(executionModulesListener);
+       }
+
+       /** Unregisters an execution module listener. */
+       public synchronized void unregister(
+                       ExecutionModulesListener executionModulesListener,
+                       Map<String, String> properties) {
+               executionModulesListeners.remove(executionModulesListener);
+       }
+
+       /*
+        * INTERFACE IMPLEMENTATIONS
+        */
+
+       public void bundleChanged(BundleEvent evt) {
+               Bundle bundle = evt.getBundle();
+               if (bundle.getHeaders().get(
+                               ExecutionModuleDescriptor.SLC_EXECUTION_MODULE) != null) {
+                       OsgiBundle osgiBundle = new OsgiBundle(bundle);
+                       if (evt.getType() == BundleEvent.INSTALLED)
+                               for (ExecutionModulesListener listener : executionModulesListeners)
+                                       listener.executionModuleAdded(osgiBundle
+                                                       .getModuleDescriptor());
+                       else if (evt.getType() == BundleEvent.UNINSTALLED)
+                               for (ExecutionModulesListener listener : executionModulesListeners)
+                                       listener.executionModuleRemoved(osgiBundle
+                                                       .getModuleDescriptor());
+               }
+
+       }
+
+       @SuppressWarnings({ "rawtypes" })
+       public synchronized void bind(Object service, Map properties)
+                       throws Exception {
+               if (service instanceof ExecutionFlowDescriptorConverter) {
                        ExecutionFlowDescriptorConverter executionFlowDescriptorConverter = (ExecutionFlowDescriptorConverter) service;
                        OsgiBundle osgiBundle = asOsgiBundle(properties);
                        executionFlowDescriptorConverters.put(osgiBundle,
                                        executionFlowDescriptorConverter);
                        if (log.isTraceEnabled())
-                               log
-                                               .debug("Registered execution flow descriptor converter from "
-                                                               + osgiBundle);
+                               log.debug("Registered execution flow descriptor converter from "
+                                               + osgiBundle);
                } else {
                        // ignore
                }
        }
 
-       @SuppressWarnings("unchecked")
+       @SuppressWarnings("rawtypes")
        public synchronized void unbind(Object service, Map properties)
                        throws Exception {
-               if (service instanceof ExecutionContext) {
-                       OsgiBundle osgiBundle = asOsgiBundle(properties);
-                       if (executionContexts.containsKey(osgiBundle)) {
-                               ExecutionContext executionContext = executionContexts
-                                               .remove(osgiBundle);
-                               if (log.isTraceEnabled())
-                                       log.debug("Removed execution context from " + osgiBundle);
-                               // Notify
-                               for (ExecutionModulesListener listener : getExecutionModulesListeners())
-                                       listener.executionModuleRemoved(osgiBundle,
-                                                       executionContext);
-                       }
-               } else if (service instanceof ExecutionFlow) {
-                       ExecutionFlow executionFlow = (ExecutionFlow) service;
-                       OsgiBundle osgiBundle = asOsgiBundle(properties);
-                       if (executionFlows.containsKey(osgiBundle)) {
-                               Set flows = executionFlows.get(osgiBundle);
-                               flows.remove(executionFlow);
-                               if (log.isTraceEnabled())
-                                       log.debug("Removed " + executionFlow + " from "
-                                                       + osgiBundle);
-                               if (flows.size() == 0) {
-                                       executionFlows.remove(osgiBundle);
-                                       if (log.isTraceEnabled())
-                                               log.debug("Removed flows set from " + osgiBundle);
-                               }
-                               for (ExecutionModulesListener listener : getExecutionModulesListeners())
-                                       listener.executionFlowRemoved(osgiBundle, executionFlow);
-                       }
-               } else if (service instanceof ExecutionFlowDescriptorConverter) {
+               if (service instanceof ExecutionFlowDescriptorConverter) {
                        OsgiBundle osgiBundle = asOsgiBundle(properties);
                        if (executionFlowDescriptorConverters.containsKey(osgiBundle)) {
                                executionFlowDescriptorConverters.remove(osgiBundle);
                                if (log.isTraceEnabled())
-                                       log
-                                                       .debug("Removed execution flow descriptor converter from "
-                                                                       + osgiBundle);
+                                       log.debug("Removed execution flow descriptor converter from "
+                                                       + osgiBundle);
                        }
                } else {
                        // ignore
                }
        }
 
-       @SuppressWarnings("unchecked")
+       /*
+        * JMX
+        */
+       protected MBeanServer getMBeanServer() {
+               return ManagementFactory.getPlatformMBeanServer();
+       }
+
+       public void registerMBean(Module module, ExecutionFlow executionFlow) {
+               try {
+                       StandardMBean mbean = new StandardMBean(executionFlow,
+                                       ExecutionFlow.class);
+                       getMBeanServer().registerMBean(mbean,
+                                       flowMBeanName(module, executionFlow));
+               } catch (Exception e) {
+                       String msg = "Cannot register execution flow " + executionFlow
+                                       + " as mbean";
+                       throw new SlcException(msg, e);
+               }
+       }
+
+       public void unregisterMBean(Module module, ExecutionFlow executionFlow) {
+               try {
+                       getMBeanServer().unregisterMBean(
+                                       flowMBeanName(module, executionFlow));
+               } catch (Exception e) {
+                       String msg = "Cannot unregister execution flow " + executionFlow
+                                       + " as mbean";
+                       throw new SlcException(msg, e);
+               }
+       }
+
+       @SuppressWarnings("deprecation")
+       protected ObjectName flowMBeanName(Module module,
+                       ExecutionFlow executionFlow) {
+               String executionModulesPrefix = "SLCExecutionModules";
+               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('/'));
+               }
+
+               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++;
+                               }
+                       }
+               }
+               buf.append("name=").append(name);
+               try {
+                       return new ObjectName(buf.toString());
+               } catch (Exception e) {
+                       throw new SlcException("Cannot generate object name based on "
+                                       + buf, e);
+               }
+       }
+
+       /*
+        * UTILITIES
+        */
+       @SuppressWarnings("rawtypes")
        private OsgiBundle asOsgiBundle(Map properties) {
                String bundleSymbolicName = checkAndGet(Constants.BUNDLE_SYMBOLICNAME,
                                properties);
@@ -460,7 +641,7 @@ public class OsgiExecutionModulesManager extends
                return new OsgiBundle(bundleSymbolicName, bundleVersion);
        }
 
-       @SuppressWarnings("unchecked")
+       @SuppressWarnings("rawtypes")
        private String checkAndGet(Object key, Map properties) {
                if (!properties.containsKey(key) || properties.get(key) == null)
                        throw new SlcException(key + " not set in " + properties);
@@ -468,8 +649,17 @@ public class OsgiExecutionModulesManager extends
                        return properties.get(key).toString();
        }
 
+       public void setBundlesManager(BundlesManager bundlesManager) {
+               this.bundlesManager = bundlesManager;
+       }
+
        public void setDefaultDescriptorConverter(
                        ExecutionFlowDescriptorConverter defaultDescriptorConverter) {
                this.defaultDescriptorConverter = defaultDescriptorConverter;
        }
+
+       public void setRegisterFlowsToJmx(Boolean registerFlowsToJmx) {
+               this.registerFlowsToJmx = registerFlowsToJmx;
+       }
+
 }