Improve executions and system calls

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.osgi / src / main / java / org / argeo / slc / osgi / OsgiExecutionModulesManager.java

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
index 6c442c71defc6883e61a87f637bc6147dff4bcbe..50967384e8d8f097647b6ee1d9f99c812f18f0c8 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
@@ -14,6 +14,7 @@ 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;
@@ -22,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;
@@ -43,13 +45,14 @@ public class OsgiExecutionModulesManager extends
                // 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.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",
@@ -256,10 +259,9 @@ 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 synchronized ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
@@ -281,33 +283,6 @@ public class OsgiExecutionModulesManager extends
                }
        }
 
-       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();
-               //
-               //
-               //
-       }
-
        public ModuleDescriptor getModuleDescriptor(String moduleName,
                        String version) {
                return getExecutionModuleDescriptor(moduleName, version);
@@ -372,6 +347,10 @@ public class OsgiExecutionModulesManager extends
                        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);
@@ -383,6 +362,8 @@ public class OsgiExecutionModulesManager extends
                                log
                                                .debug("Registered " + executionFlow + " from "
                                                                + osgiBundle);
+                       for (ExecutionModulesListener listener : getExecutionModulesListeners())
+                               listener.executionFlowAdded(osgiBundle, executionFlow);
 
                } else if (service instanceof ExecutionFlowDescriptorConverter) {
                        ExecutionFlowDescriptorConverter executionFlowDescriptorConverter = (ExecutionFlowDescriptorConverter) service;
@@ -404,9 +385,14 @@ public class OsgiExecutionModulesManager extends
                if (service instanceof ExecutionContext) {
                        OsgiBundle osgiBundle = asOsgiBundle(properties);
                        if (executionContexts.containsKey(osgiBundle)) {
-                               executionContexts.remove(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;
@@ -422,6 +408,8 @@ public class OsgiExecutionModulesManager extends
                                        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);