Restructure deployed system manager

git-svn-id: https://svn.argeo.org/slc/trunk@1361 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java
index 1056d4e713866b457916b64e486030a8051369eb..c4cc74bb1c1bfb11411b912065a3a97aeca34b48 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java
@@ -20,7 +20,7 @@ public class SlcManagerTask extends SAwareTask {
                        method.invoke(systemManager, null);
                } catch (Exception e) {
                        throw new SlcException("Cannot execute action " + action
-                                       + " for manager " + manager);
+                                       + " for manager " + manager, e);
                }
        }
 

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 3fc2a5671fced3e77bb54b9fb7c290e84d5a6607..10e988cc262095c9d70e80ef73fcadd339569436 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
@@ -69,6 +69,10 @@ public class DefaultSlcRuntime {
 
                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);
@@ -112,8 +116,8 @@ public class DefaultSlcRuntime {
                slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_FILE,
                                scriptRelativePath);
                if (targets != null)
-                       slcExecution.getAttributes().put(
-                                       AntConstants.EXECATTR_ANT_TARGETS, targets);
+                       slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_TARGETS,
+                                       targets);
 
                slcExecution.setStatus(SlcExecution.STATUS_SCHEDULED);
                return slcExecution;