]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
Improve executions and system calls
[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.osgi / src / main / java / org / argeo / slc / osgi / OsgiExecutionModulesManager.java
index 5e61ddba08ad68aebb24dd56cb20d5be48435791..50967384e8d8f097647b6ee1d9f99c812f18f0c8 100644 (file)
@@ -1,13 +1,20 @@
 package org.argeo.slc.osgi;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.build.BasicNameVersion;
+import org.argeo.slc.build.NameVersion;
 import org.argeo.slc.core.execution.AbstractExecutionModulesManager;
 import org.argeo.slc.core.execution.DefaultExecutionFlowDescriptorConverter;
 import org.argeo.slc.deploy.ModuleDescriptor;
@@ -16,6 +23,7 @@ import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionFlowDescriptorConverter;
 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.Constants;
@@ -24,66 +32,152 @@ 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.springframework.osgi.service.importer.OsgiServiceLifecycleListener;
 
 public class OsgiExecutionModulesManager extends
                AbstractExecutionModulesManager implements InitializingBean,
-               DisposableBean {
+               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";
+
        private final static Log log = LogFactory
                        .getLog(OsgiExecutionModulesManager.class);
 
        private BundlesManager bundlesManager;
-       private ServiceTracker executionContexts;
+       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();
 
-       public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+       private Boolean useCachedServices = Boolean.parseBoolean(System
+                       .getProperty(PROPERTY_CACHE_SERVICES, "true"));
+
+       public synchronized ExecutionModuleDescriptor getExecutionModuleDescriptor(
                        String moduleName, String version) {
                ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-               md.setName(moduleName);
-               md.setVersion(version);
-               setMetadataFromBundle(md, null);
-               getExecutionFlowDescriptorConverter(moduleName, version)
-                               .addFlowsToDescriptor(md, listFlows(moduleName, version));
+               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;
+                               }
+                       }
+                       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);
+               }
+               ExecutionFlowDescriptorConverter executionFlowDescriptorConverter = getExecutionFlowDescriptorConverter(
+                               moduleName, version);
+               if (executionFlowDescriptorConverter == null)
+                       throw new SlcException("No flow converter found.");
+               executionFlowDescriptorConverter.addFlowsToDescriptor(md, listFlows(
+                               moduleName, version));
                return md;
        }
 
-       public List<ExecutionModuleDescriptor> listExecutionModules() {
+       public synchronized List<ExecutionModuleDescriptor> listExecutionModules() {
                List<ExecutionModuleDescriptor> descriptors = new ArrayList<ExecutionModuleDescriptor>();
 
-               ServiceReference[] srs = executionContexts.getServiceReferences();
-               for (ServiceReference sr : srs) {
-                       ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-                       setMetadataFromBundle(md, sr.getBundle());
-                       descriptors.add(md);
+               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);
+                       }
                }
                return descriptors;
        }
 
-       protected Map<String, ExecutionFlow> listFlows(String moduleName,
-                       String moduleVersion) {
-               // 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);
-               }
+       protected synchronized Map<String, ExecutionFlow> listFlows(
+                       String moduleName, String moduleVersion) {
 
                Map<String, ExecutionFlow> flows = new HashMap<String, ExecutionFlow>();
-               for (ServiceReference sf : sfs) {
-                       ExecutionFlow flow = (ExecutionFlow) bundlesManager
-                                       .getBundleContext().getService(sf);
-                       flows.put(flow.getName(), flow);
+               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);
+                       }
                }
                return flows;
        }
 
-       public ExecutionFlow findExecutionFlow(String moduleName,
+       protected ExecutionFlow findExecutionFlow(String moduleName,
                        String moduleVersion, String flowName) {
                String filter = "(&(Bundle-SymbolicName=" + moduleName
                                + ")(org.springframework.osgi.bean.name=" + flowName + "))";
@@ -91,7 +185,7 @@ public class OsgiExecutionModulesManager extends
                                filter);
        }
 
-       public ExecutionContext findExecutionContext(String moduleName,
+       protected ExecutionContext findExecutionContext(String moduleName,
                        String moduleVersion) {
                String filter = "(&(Bundle-SymbolicName=" + moduleName
                                + ")(Bundle-Version=" + moduleVersion + "))";
@@ -99,8 +193,9 @@ public class OsgiExecutionModulesManager extends
                                filter);
        }
 
-       public ExecutionFlowDescriptorConverter findExecutionFlowDescriptorConverter(
+       protected ExecutionFlowDescriptorConverter findExecutionFlowDescriptorConverter(
                        String moduleName, String moduleVersion) {
+
                String filter = "(&(Bundle-SymbolicName=" + moduleName
                                + ")(Bundle-Version=" + moduleVersion + "))";
                return bundlesManager.getSingleService(
@@ -112,12 +207,14 @@ public class OsgiExecutionModulesManager extends
        }
 
        public void afterPropertiesSet() throws Exception {
-               executionContexts = bundlesManager.newTracker(ExecutionContext.class);
+               if (!useCachedServices)
+                       executionContextsTracker = bundlesManager
+                                       .newTracker(ExecutionContext.class);
        }
 
        public void destroy() throws Exception {
-               if (executionContexts != null)
-                       executionContexts.close();
+               if (executionContextsTracker != null)
+                       executionContextsTracker.close();
        }
 
        /**
@@ -162,48 +259,28 @@ public class OsgiExecutionModulesManager extends
                }
        }
 
-       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 ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
+       protected synchronized ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
                        String moduleName, String moduleVersion) {
-               // Check whether a descriptor converter is published by this module
-               ExecutionFlowDescriptorConverter descriptorConverter = findExecutionFlowDescriptorConverter(
-                               moduleName, moduleVersion);
-               if (descriptorConverter == null)
-                       return defaultDescriptorConverter;
-               else
-                       return descriptorConverter;
-       }
-
-       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();
-               //
-               //
-               //
+               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;
+               }
        }
 
        public ModuleDescriptor getModuleDescriptor(String moduleName,
@@ -256,4 +333,116 @@ public class OsgiExecutionModulesManager extends
                else
                        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);
+                       if (log.isTraceEnabled())
+                               log.debug("Registered execution context from " + osgiBundle);
+                       // Notify
+                       for (ExecutionModulesListener listener : getExecutionModulesListeners())
+                               listener.executionModuleAdded(osgiBundle, executionContext);
+
+               } 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);
+                       if (log.isTraceEnabled())
+                               log
+                                               .debug("Registered " + executionFlow + " from "
+                                                               + osgiBundle);
+                       for (ExecutionModulesListener listener : getExecutionModulesListeners())
+                               listener.executionFlowAdded(osgiBundle, executionFlow);
+
+               } else 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);
+               } else {
+                       // ignore
+               }
+       }
+
+       @SuppressWarnings("unchecked")
+       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) {
+                       OsgiBundle osgiBundle = asOsgiBundle(properties);
+                       if (executionFlowDescriptorConverters.containsKey(osgiBundle)) {
+                               executionFlowDescriptorConverters.remove(osgiBundle);
+                               if (log.isTraceEnabled())
+                                       log
+                                                       .debug("Removed execution flow descriptor converter from "
+                                                                       + osgiBundle);
+                       }
+               } else {
+                       // ignore
+               }
+       }
+
+       @SuppressWarnings("unchecked")
+       private OsgiBundle asOsgiBundle(Map properties) {
+               String bundleSymbolicName = checkAndGet(Constants.BUNDLE_SYMBOLICNAME,
+                               properties);
+               String bundleVersion = checkAndGet(Constants.BUNDLE_VERSION, properties);
+               return new OsgiBundle(bundleSymbolicName, bundleVersion);
+       }
+
+       @SuppressWarnings("unchecked")
+       private String checkAndGet(Object key, Map properties) {
+               if (!properties.containsKey(key) || properties.get(key) == null)
+                       throw new SlcException(key + " not set in " + properties);
+               else
+                       return properties.get(key).toString();
+       }
+
+       public void setDefaultDescriptorConverter(
+                       ExecutionFlowDescriptorConverter defaultDescriptorConverter) {
+               this.defaultDescriptorConverter = defaultDescriptorConverter;
+       }
 }