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=32c3ce90660f3c8ffc87a745e5b9eb153e1a7c0c;hpb=11a9d0e8d3e9f610d0546463cfaf07ae884cb249;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 32c3ce906..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,6 +1,7 @@
 package org.argeo.slc.cli;
 
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Properties;
 
 import org.apache.commons.cli.CommandLine;
@@ -18,18 +19,19 @@ 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.ApplicationContext;
 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(
@@ -173,29 +175,31 @@ public class SlcMain {
 		}
 		// Agent
 		else if (mode.equals(Mode.agent)) {
-			if (runtimeStr == null)
-				runtimeStr = "agent.xml";
-			final ConfigurableApplicationContext applicationContext = new FileSystemXmlApplicationContext(
-					"agent.xml");
+			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.");
-
-			Thread shutdownHook = new Thread("SLC agent shutdown hook") {
-				public void run() {
-					applicationContext.stop();
-					applicationContext.close();
-					log.info("Closed agent application context.");
-				}
-			};
-			Runtime.getRuntime().addShutdownHook(shutdownHook);
-
-			while (applicationContext.isActive()) {
-				try {
-					Thread.sleep(1000);
-				} catch (InterruptedException e) {
-					// silent
-				}
+		}
+		// 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.");
 		}
 	}