X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.runtime%2Fsrc%2Forg%2Fargeo%2Fslc%2Fruntime%2FDefaultExecutionFlow.java;h=07d044b77beb5c06e47e15f2b70bc11743b502e7;hb=09c9e5093fe1353aaac344ac8a8caf2e1dcc0778;hp=f99ce9d7148d1a865f88409620857ec13820d9a8;hpb=58b35f147f3c1c1a12a07c303105618f679c7161;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java
index f99ce9d71..07d044b77 100644
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java
+++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java
@@ -1,22 +1,24 @@
 package org.argeo.slc.runtime;
 
+import static java.lang.System.Logger.Level.ERROR;
+import static java.lang.System.Logger.Level.WARNING;
+
+import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.SlcException;
-import org.argeo.slc.execution.ExecutionContext;
-import org.argeo.slc.execution.ExecutionFlow;
-import org.argeo.slc.execution.ExecutionSpec;
-import org.argeo.slc.execution.ExecutionSpecAttribute;
+import org.argeo.api.slc.SlcException;
+import org.argeo.api.slc.execution.ExecutionContext;
+import org.argeo.api.slc.execution.ExecutionFlow;
+import org.argeo.api.slc.execution.ExecutionSpec;
+import org.argeo.api.slc.execution.ExecutionSpecAttribute;
 
 /** Default implementation of an execution flow. */
 public class DefaultExecutionFlow implements ExecutionFlow {
-	private final static Log log = LogFactory.getLog(DefaultExecutionFlow.class);
+	private final static System.Logger logger = System.getLogger(DefaultExecutionFlow.class.getName());
 
 	private final ExecutionSpec executionSpec;
 	private String name = null;
@@ -84,7 +86,7 @@ public class DefaultExecutionFlow implements ExecutionFlow {
 		try {
 			for (Runnable executable : executables) {
 				if (Thread.interrupted()) {
-					log.error("Flow '" + getName() + "' killed before '" + executable + "'");
+					logger.log(ERROR, "Flow '" + getName() + "' killed before '" + executable + "'");
 					Thread.currentThread().interrupt();
 					return;
 					// throw new ThreadDeath();
@@ -93,7 +95,7 @@ public class DefaultExecutionFlow implements ExecutionFlow {
 			}
 		} catch (RuntimeException e) {
 			if (Thread.interrupted()) {
-				log.error("Flow '" + getName() + "' killed while receiving an unrelated exception", e);
+				logger.log(ERROR, "Flow '" + getName() + "' killed while receiving an unrelated exception", e);
 				Thread.currentThread().interrupt();
 				return;
 				// throw new ThreadDeath();
@@ -101,9 +103,9 @@ public class DefaultExecutionFlow implements ExecutionFlow {
 			if (failOnError)
 				throw e;
 			else {
-				log.error("Execution flow failed," + " but process did not fail" + " because failOnError property"
-						+ " is set to false: " + e);
-				if (log.isTraceEnabled())
+				logger.log(ERROR, "Execution flow failed," + " but process did not fail"
+						+ " because failOnError property" + " is set to false: " + e);
+				if (logger.isLoggable(Level.TRACE))
 					e.printStackTrace();
 			}
 		}
@@ -156,7 +158,7 @@ public class DefaultExecutionFlow implements ExecutionFlow {
 					DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
 					String newPath = path + '/' + flow.getName();
 					flow.setPath(newPath);
-					log.warn(newPath + " was forcibly set on " + flow);
+					logger.log(WARNING, newPath + " was forcibly set on " + flow);
 				}
 			}
 		}