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=08d4d9db02f45cb219f0743585d89a6bb4b54d6b;hb=49d1ccd3b9f4d55d90de5e956a44bdbe83f600ef;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..08d4d9db0 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,7 +1,6 @@
 package org.argeo.slc.cli;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 
@@ -16,18 +15,23 @@ 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;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 public class SlcMain {
 	public enum Mode {
-		single, agent
+		single, agent, osgi
 	}
 
 	private static Log log = null;
 
 	private final static String BOOTSTRAP_LOG4J_CONFIG = "org/argeo/slc/cli/bootstrapLog4j.properties";
+	private final static String DEFAULT_AGENT_CONTEXT = "classpath:org/argeo/slc/cli/spring-agent-default.xml";
 
 	private final static Option modeOpt = OptionBuilder.withLongOpt("mode")
 			.withArgName("mode").hasArg().withDescription(
@@ -155,15 +159,48 @@ 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);
 			}
 		}
+		// Agent
+		else if (mode.equals(Mode.agent)) {
+			final ConfigurableApplicationContext applicationContext;
+			if (runtimeStr == null) {
+				applicationContext = new ClassPathXmlApplicationContext(
+						DEFAULT_AGENT_CONTEXT);
+			} else {
+				applicationContext = new FileSystemXmlApplicationContext(
+						runtimeStr);
+			}
+			applicationContext.registerShutdownHook();
+			applicationContext.start();
+			log.info("SLC Agent context started.");
+		}
+		// OSGi
+		else if (mode.equals(Mode.osgi)) {
+			final ConfigurableApplicationContext applicationContext;
+			if (runtimeStr == null) {
+				applicationContext = new ClassPathXmlApplicationContext(
+						DEFAULT_AGENT_CONTEXT);
+			} else {
+				applicationContext = new FileSystemXmlApplicationContext(
+						runtimeStr);
+			}
+			applicationContext.registerShutdownHook();
+			applicationContext.start();
+			log.info("SLC Agent context started.");
+		}
 	}
 
 	public static void printUsage() {