X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.launcher%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcli%2FSlcMain.java;h=c4193369a0b172b3b66eb165503538a1b43f005d;hb=2995b63156cd89a45446422195c315e2ee96f170;hp=cf52581c87c86f799d35d03cf4edb8382f0125a1;hpb=f567ffc9b86811568513a17fd53ad3140a475650;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java
index cf52581c8..c4193369a 100644
--- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java
+++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java
@@ -1,8 +1,6 @@
 package org.argeo.slc.cli;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Properties;
 
 import org.apache.commons.cli.CommandLine;
@@ -16,9 +14,10 @@ import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.ant.AntConstants;
-import org.argeo.slc.core.SlcException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.logging.Log4jUtils;
+import org.argeo.slc.runtime.SlcExecutionContext;
+import org.argeo.slc.runtime.SlcRuntime;
 
 public class SlcMain {
 	public enum Mode {
@@ -155,11 +154,16 @@ public class SlcMain {
 		// Execution
 		if (mode.equals(Mode.single)) {
 			try {
-				DefaultSlcRuntime runtime = new DefaultSlcRuntime();
+				// DefaultSlcRuntime runtime = new DefaultSlcRuntime();
+				// FIXME: inject this more cleanly
+				ClassLoader cl = Thread.currentThread().getContextClassLoader();
+				Class clss = cl.loadClass("org.argeo.slc.ant.AntSlcRuntime");
+				SlcRuntime<? extends SlcExecutionContext> runtime = (SlcRuntime<? extends SlcExecutionContext>) clss
+						.newInstance();
 				runtime.executeScript(runtimeStr, script, targets, properties,
 						null, null);
-				//System.exit(0);
-			} catch (SlcException e) {
+				// System.exit(0);
+			} catch (Exception e) {
 				log.error("SLC client terminated with an error: ", e);
 				System.exit(1);
 			}