Introduce JCR agent. Client agent not needed anymore.

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / ExecutionThread.java

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
index db289b4a5c6bf878788e9ea5ff7d6a8fa7d566c2..9190ea6fc1647c38d097390fff116237322de466 100644 (file)
--- 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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.core.execution;
 
 import org.apache.commons.logging.Log;
@@ -35,7 +51,7 @@ public class ExecutionThread extends Thread {
                                .getFlowDescriptor();
                String flowName = executionFlowDescriptor.getName();
 
-               dispatchAddStep(new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_START,
+               dispatchAddStep(new SlcExecutionStep(SlcExecutionStep.PHASE_START,
                                "Flow " + flowName));
 
                try {
@@ -49,12 +65,13 @@ public class ExecutionThread extends Thread {
                        // TODO: re-throw exception ?
                        String msg = "Execution of flow " + flowName + " failed.";
                        log.error(msg, e);
-                       dispatchAddStep(new SlcExecutionStep(msg + " " + e.getMessage()));
+                       dispatchAddStep(new SlcExecutionStep(SlcExecutionStep.ERROR, msg
+                                       + " " + e.getMessage()));
                        processThread.notifyError();
                } finally {
                        processThread.flowCompleted();
-                       dispatchAddStep(new SlcExecutionStep(
-                                       SlcExecutionStep.TYPE_PHASE_END, "Flow " + flowName));
+                       dispatchAddStep(new SlcExecutionStep(SlcExecutionStep.PHASE_END,
+                                       "Flow " + flowName));
                }
        }