Prepare for release candidate

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / cli / DefaultSlcRuntime.java

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java
index ea046bb13e792b8c2bce1ead6307438aa0b6be52..3596dd61c6411141406e4c6172d0e446e8419e86 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java
@@ -12,14 +12,15 @@ import java.util.UUID;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.ant.AntExecutionContext;
 import org.argeo.slc.ant.AntSlcApplication;
-import org.argeo.slc.ant.SlcAntConstants;
-import org.argeo.slc.ant.SlcAntException;
+import org.argeo.slc.ant.AntConstants;
 import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.runtime.SlcExecutionContext;
+import org.argeo.slc.runtime.SlcExecutionOutput;
 import org.argeo.slc.spring.SpringUtils;
 import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 public class DefaultSlcRuntime {
@@ -27,23 +28,73 @@ public class DefaultSlcRuntime {
 
        public final static String SLC_ROOT_FILE_NAME = "slcRoot.properties";
 
-       public SlcExecutionContext executeScript(Resource script,
-                       Properties properties, Map<String, Object> references) {
+       /**
+        * Simplified execution with default runtime, default target, and no
+        * properties/reference arguments.
+        * 
+        * @param script
+        *            path to the script
+        * @param executionOutput
+        *            output
+        * 
+        * @see #executeScript(String, String, String, Properties, Map,
+        *      SlcExecutionOutput)
+        */
+       public void executeScript(String script,
+                       SlcExecutionOutput<AntExecutionContext> executionOutput) {
+               executeScript(null, script, null, null, null, executionOutput);
+       }
 
-               Resource slcRootFile = findSlcRootFile(script);
-               String scriptRelativePath = SpringUtils.extractRelativePath(SpringUtils
-                               .getParent(slcRootFile), script);
+       /**
+        * Simplified execution with default runtime, and no properties/reference
+        * arguments.
+        * 
+        * @param script
+        *            path to the script
+        * @param targets
+        *            comma separated list of targets
+        * @param executionOutput
+        *            output
+        * @see #executeScript(String, String, String, Properties, Map,
+        *      SlcExecutionOutput)
+        */
+       public void executeScript(String script, String targets,
+                       SlcExecutionOutput<AntExecutionContext> executionOutput) {
+               executeScript(null, script, targets, null, null, executionOutput);
+       }
 
-               SlcExecution slcExecution = createSlcExecution();
-               slcExecution.setStatus(SlcExecution.STATUS_RUNNING);
-               slcExecution.getAttributes().put(SlcAntConstants.EXECATTR_ANT_FILE,
-                               scriptRelativePath);
+       public void executeScript(String runtime, String script, String targets,
+                       Properties properties, Map<String, Object> references,
+                       SlcExecutionOutput<AntExecutionContext> executionOutput) {
+
+               Resource scriptRes = findScript(script);
+               Resource slcRootFile = findSlcRootFile(scriptRes);
+               if (slcRootFile == null)
+                       throw new SlcException(
+                                       "Could not find any SLC root file, "
+                                                       + "please configure one at the root of your scripts hierarchy.");
+
+               SlcExecution slcExecution = createSlcExecution(runtime, slcRootFile,
+                               scriptRes, targets);
 
                AntSlcApplication application = getApplication(slcRootFile);
-               return application.execute(slcExecution, properties, references);
+               application.execute(slcExecution, properties, references,
+                               executionOutput);
        }
 
-       protected SlcExecution createSlcExecution() {
+       protected Resource findScript(String scriptStr) {
+               Resource scriptRes;
+               if (new File(scriptStr).exists()) {
+                       scriptRes = new FileSystemResource(scriptStr);
+               } else {
+                       scriptRes = new DefaultResourceLoader(SlcMain.class
+                                       .getClassLoader()).getResource(scriptStr);
+               }
+               return scriptRes;
+       }
+
+       protected SlcExecution createSlcExecution(String runtimeStr,
+                       Resource slcRootFile, Resource script, String targets) {
                SlcExecution slcExecution = new SlcExecution();
                slcExecution.setUuid(UUID.randomUUID().toString());
                try {
@@ -52,9 +103,23 @@ public class DefaultSlcRuntime {
                        slcExecution.setHost(SlcExecution.UNKOWN_HOST);
                }
 
-               slcExecution.setType(SlcAntConstants.EXECTYPE_SLC_ANT);
+               slcExecution.setType(AntConstants.EXECTYPE_SLC_ANT);
 
                slcExecution.setUser(System.getProperty("user.name"));
+
+               if (runtimeStr != null)
+                       slcExecution.getAttributes().put(AntConstants.EXECATTR_RUNTIME,
+                                       runtimeStr);
+               String scriptRelativePath = SpringUtils.extractRelativePath(SpringUtils
+                               .getParent(slcRootFile), script);
+
+               slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_FILE,
+                               scriptRelativePath);
+               if (targets != null)
+                       slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_TARGETS,
+                                       targets);
+
+               slcExecution.setStatus(SlcExecution.STATUS_SCHEDULED);
                return slcExecution;
        }
 
@@ -76,7 +141,7 @@ public class DefaultSlcRuntime {
 
                        // Conf dir
                        String confDirStr = rootProps
-                                       .getProperty(SlcAntConstants.CONF_DIR_PROPERTY);
+                                       .getProperty(AntConstants.CONF_DIR_PROPERTY);
                        if (confDirStr != null)
                                confDir = new DefaultResourceLoader(application.getClass()
                                                .getClassLoader()).getResource(confDirStr);
@@ -89,7 +154,7 @@ public class DefaultSlcRuntime {
 
                        // Work dir
                        String workDirStr = rootProps
-                                       .getProperty(SlcAntConstants.WORK_DIR_PROPERTY);
+                                       .getProperty(AntConstants.WORK_DIR_PROPERTY);
                        if (workDirStr != null) {
                                workDir = new File(workDirStr);
                        }
@@ -134,6 +199,8 @@ public class DefaultSlcRuntime {
                try {
                        Resource slcRootFile = currDir.createRelative(SLC_ROOT_FILE_NAME);
                        if (slcRootFile.exists()) {
+                               if (log.isDebugEnabled())
+                                       log.debug("Found SLC root file: " + slcRootFile);
                                return slcRootFile;
                        } else {
                                String currPath = currDir.getURL().getPath();
@@ -155,7 +222,7 @@ public class DefaultSlcRuntime {
                try {
                        p.load(in);
                } catch (IOException e) {
-                       throw new SlcAntException("Cannot read SLC root file", e);
+                       throw new SlcException("Cannot read SLC root file", e);
                }
                return p;
        }