Move to execution package

git-svn-id: https://svn.argeo.org/slc/trunk@2697 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
index 5fa0d015f896fc2014538f9952084aa6529fb901..4e5672638fb1311b40a26e847285101f67fe24b4 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
@@ -3,7 +3,6 @@ package org.argeo.slc.core.execution;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.argeo.slc.core.execution.internal.ProcessThread;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.process.SlcExecutionNotifier;

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
new file mode 100644 (file)
index 0000000..08dfca2
--- /dev/null
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
@@ -0,0 +1,66 @@
+package org.argeo.slc.core.execution;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.execution.ExecutionFlowDescriptor;
+import org.argeo.slc.process.RealizedFlow;
+import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.process.SlcExecutionNotifier;
+import org.argeo.slc.process.SlcExecutionStep;
+
+/** Thread of a single execution */
+public class ExecutionThread extends Thread {
+       private final static Log log = LogFactory.getLog(ExecutionThread.class);
+
+       private final RealizedFlow realizedFlow;
+       private final ProcessThread processThread;
+
+       public ExecutionThread(ProcessThread processThread,
+                       RealizedFlow realizedFlow) {
+               super(processThread.getProcessThreadGroup(), "Flow "
+                               + realizedFlow.getFlowDescriptor().getName());
+               this.realizedFlow = realizedFlow;
+               this.processThread = processThread;
+       }
+
+       public void run() {
+               ExecutionFlowDescriptor executionFlowDescriptor = realizedFlow
+                               .getFlowDescriptor();
+               String flowName = executionFlowDescriptor.getName();
+
+               dispatchAddStep(processThread.getSlcProcess(), new SlcExecutionStep(
+                               SlcExecutionStep.TYPE_PHASE_START, "Flow " + flowName));
+
+               try {
+                       processThread.getExecutionModulesManager().execute(realizedFlow);
+               } catch (Exception e) {
+                       // TODO: re-throw exception ?
+                       String msg = "Execution of flow " + flowName + " failed.";
+                       log.error(msg, e);
+                       dispatchAddStep(processThread.getSlcProcess(),
+                                       new SlcExecutionStep(msg + " " + e.getMessage()));
+               } finally {
+                       processThread.flowCompleted();
+                       dispatchAddStep(processThread.getSlcProcess(),
+                                       new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_END,
+                                                       "Flow " + flowName));
+               }
+       }
+
+       protected void dispatchAddStep(SlcExecution slcExecution,
+                       SlcExecutionStep step) {
+               slcExecution.getSteps().add(step);
+               List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
+               steps.add(step);
+               for (Iterator<SlcExecutionNotifier> it = processThread
+                               .getExecutionModulesManager().getSlcExecutionNotifiers()
+                               .iterator(); it.hasNext();) {
+                       it.next().addSteps(slcExecution, steps);
+               }
+       }
+
+}

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
new file mode 100644 (file)
index 0000000..678e6f6
--- /dev/null
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
@@ -0,0 +1,84 @@
+package org.argeo.slc.core.execution;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.process.RealizedFlow;
+import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.process.SlcExecutionNotifier;
+
+/** Thread of the SLC Process, starting the sub executions. */
+public class ProcessThread extends Thread {
+       private final static Log log = LogFactory.getLog(ProcessThread.class);
+
+       private final AbstractExecutionModulesManager executionModulesManager;
+       private final SlcExecution slcProcess;
+       private final ThreadGroup processThreadGroup;
+       private final List<RealizedFlow> flowsToProcess = new ArrayList<RealizedFlow>();
+
+       public ProcessThread(
+                       AbstractExecutionModulesManager executionModulesManager,
+                       SlcExecution slcExecution) {
+               super(executionModulesManager.getProcessesThreadGroup(),
+                               "SLC Process #" + slcExecution.getUuid());
+               this.executionModulesManager = executionModulesManager;
+               this.slcProcess = slcExecution;
+               processThreadGroup = new ThreadGroup("SLC Process #"
+                               + slcExecution.getUuid() + " thread group");
+       }
+
+       public void run() {
+               log.info("\n##\n## Process SLC Execution " + slcProcess + "\n##\n");
+
+               slcProcess.setStatus(SlcExecution.STATUS_RUNNING);
+               dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_SCHEDULED,
+                               SlcExecution.STATUS_RUNNING);
+
+               flowsToProcess.addAll(slcProcess.getRealizedFlows());
+
+               while (flowsToProcess.size() > 0) {
+                       RealizedFlow flow = flowsToProcess.remove(0);
+                       ExecutionThread thread = new ExecutionThread(this, flow);
+                       thread.start();
+
+                       synchronized (this) {
+                               try {
+                                       wait();
+                               } catch (InterruptedException e) {
+                                       // silent
+                               }
+                       }
+               }
+
+               slcProcess.setStatus(SlcExecution.STATUS_FINISHED);
+               dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_RUNNING,
+                               SlcExecution.STATUS_FINISHED);
+       }
+
+       protected void dispatchUpdateStatus(SlcExecution slcExecution,
+                       String oldStatus, String newStatus) {
+               for (Iterator<SlcExecutionNotifier> it = executionModulesManager
+                               .getSlcExecutionNotifiers().iterator(); it.hasNext();) {
+                       it.next().updateStatus(slcExecution, oldStatus, newStatus);
+               }
+       }
+
+       public synchronized void flowCompleted() {
+               notifyAll();
+       }
+
+       public SlcExecution getSlcProcess() {
+               return slcProcess;
+       }
+
+       public ThreadGroup getProcessThreadGroup() {
+               return processThreadGroup;
+       }
+
+       public AbstractExecutionModulesManager getExecutionModulesManager() {
+               return executionModulesManager;
+       }
+}

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/internal/ExecutionThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/internal/ExecutionThread.java
deleted file mode 100644 (file)
index 043f74b..0000000
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/internal/ExecutionThread.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.argeo.slc.core.execution.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.execution.ExecutionFlowDescriptor;
-import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionNotifier;
-import org.argeo.slc.process.SlcExecutionStep;
-
-/** Thread of a single execution */
-public class ExecutionThread extends Thread {
-       private final static Log log = LogFactory.getLog(ExecutionThread.class);
-
-       private final RealizedFlow realizedFlow;
-       private final ProcessThread processThread;
-
-       public ExecutionThread(ProcessThread processThread,
-                       RealizedFlow realizedFlow) {
-               super(processThread.getProcessThreadGroup(), "Flow "
-                               + realizedFlow.getFlowDescriptor().getName());
-               this.realizedFlow = realizedFlow;
-               this.processThread = processThread;
-       }
-
-       public void run() {
-               ExecutionFlowDescriptor executionFlowDescriptor = realizedFlow
-                               .getFlowDescriptor();
-               String flowName = executionFlowDescriptor.getName();
-
-               dispatchAddStep(processThread.getSlcProcess(), new SlcExecutionStep(
-                               SlcExecutionStep.TYPE_PHASE_START, "Flow " + flowName));
-
-               try {
-                       processThread.getExecutionModulesManager().execute(realizedFlow);
-               } catch (Exception e) {
-                       // TODO: re-throw exception ?
-                       String msg = "Execution of flow " + flowName + " failed.";
-                       log.error(msg, e);
-                       dispatchAddStep(processThread.getSlcProcess(),
-                                       new SlcExecutionStep(msg + " " + e.getMessage()));
-               } finally {
-                       processThread.flowCompleted();
-                       dispatchAddStep(processThread.getSlcProcess(),
-                                       new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_END,
-                                                       "Flow " + flowName));
-               }
-       }
-
-       protected void dispatchAddStep(SlcExecution slcExecution,
-                       SlcExecutionStep step) {
-               slcExecution.getSteps().add(step);
-               List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
-               steps.add(step);
-               for (Iterator<SlcExecutionNotifier> it = processThread
-                               .getExecutionModulesManager().getSlcExecutionNotifiers()
-                               .iterator(); it.hasNext();) {
-                       it.next().addSteps(slcExecution, steps);
-               }
-       }
-
-}

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/internal/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/internal/ProcessThread.java
deleted file mode 100644 (file)
index 0bfca64..0000000
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/internal/ProcessThread.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.argeo.slc.core.execution.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.core.execution.AbstractExecutionModulesManager;
-import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionNotifier;
-
-/** Thread of the SLC Process, starting the sub executions. */
-public class ProcessThread extends Thread {
-       private final static Log log = LogFactory.getLog(ProcessThread.class);
-
-       private final AbstractExecutionModulesManager executionModulesManager;
-       private final SlcExecution slcProcess;
-       private final ThreadGroup processThreadGroup;
-       private final List<RealizedFlow> flowsToProcess = new ArrayList<RealizedFlow>();
-
-       public ProcessThread(
-                       AbstractExecutionModulesManager executionModulesManager,
-                       SlcExecution slcExecution) {
-               super(executionModulesManager.getProcessesThreadGroup(),
-                               "SLC Process #" + slcExecution.getUuid());
-               this.executionModulesManager = executionModulesManager;
-               this.slcProcess = slcExecution;
-               processThreadGroup = new ThreadGroup("SLC Process #"
-                               + slcExecution.getUuid() + " thread group");
-       }
-
-       public void run() {
-               log.info("\n##\n## Process SLC Execution " + slcProcess + "\n##\n");
-
-               slcProcess.setStatus(SlcExecution.STATUS_RUNNING);
-               dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_SCHEDULED,
-                               SlcExecution.STATUS_RUNNING);
-
-               flowsToProcess.addAll(slcProcess.getRealizedFlows());
-
-               while (flowsToProcess.size() > 0) {
-                       RealizedFlow flow = flowsToProcess.remove(0);
-                       ExecutionThread thread = new ExecutionThread(this, flow);
-                       thread.start();
-
-                       synchronized (this) {
-                               try {
-                                       wait();
-                               } catch (InterruptedException e) {
-                                       // silent
-                               }
-                       }
-               }
-
-               slcProcess.setStatus(SlcExecution.STATUS_FINISHED);
-               dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_RUNNING,
-                               SlcExecution.STATUS_FINISHED);
-       }
-
-       protected void dispatchUpdateStatus(SlcExecution slcExecution,
-                       String oldStatus, String newStatus) {
-               for (Iterator<SlcExecutionNotifier> it = executionModulesManager
-                               .getSlcExecutionNotifiers().iterator(); it.hasNext();) {
-                       it.next().updateStatus(slcExecution, oldStatus, newStatus);
-               }
-       }
-
-       public synchronized void flowCompleted() {
-               notifyAll();
-       }
-
-       public SlcExecution getSlcProcess() {
-               return slcProcess;
-       }
-
-       public ThreadGroup getProcessThreadGroup() {
-               return processThreadGroup;
-       }
-
-       public AbstractExecutionModulesManager getExecutionModulesManager() {
-               return executionModulesManager;
-       }
-}