From 8403cc7566ac6b8c5c63357faa0659e3e09141e7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 6 Jul 2008 13:15:08 +0000 Subject: [PATCH] Restructure deployed system manager git-svn-id: https://svn.argeo.org/slc/trunk@1361 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/slc/ant/deploy/SlcManagerTask.java | 2 +- .../main/java/org/argeo/slc/cli/DefaultSlcRuntime.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) 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 1056d4e71..c4cc74bb1 100644 --- 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 3fc2a5671..10e988cc2 100644 --- 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; -- 2.39.5