Improve logging and project structure

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

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java
index e46bc8434c07164252186f8015c7514ce151e2bc..dccced3e5ebbe822b9b0ca523745fbb39980d011 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java
@@ -154,9 +154,15 @@ public class SlcMain {
 
                // Execution
                if (mode.equals(Mode.single)) {
-                       DefaultSlcRuntime runtime = new DefaultSlcRuntime();
-                       runtime.executeScript(runtimeStr, script, targets, properties,
-                                       null, null);
+                       try {
+                               DefaultSlcRuntime runtime = new DefaultSlcRuntime();
+                               runtime.executeScript(runtimeStr, script, targets, properties,
+                                               null, null);
+                               System.exit(0);
+                       } catch (SlcException e) {
+                               log.error("SLC client terminated with an error: ", e);
+                               System.exit(1);
+                       }
                }
        }
 

diff --git a/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties b/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties
index 3803c75d08e3f894e19104012724da32dceefc46..c13c36f800398c5bc6abf92996cc37a94c383e40 100644 (file)
--- a/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties
+++ b/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties
@@ -3,6 +3,11 @@ log4j.rootLogger=WARN, console, file
 ## Levels
 log4j.logger.org.argeo=INFO
 
+## Ant (Ant error logging is to verbose)
+log4j.logger.org.apache.tools.ant.UnknownElement=OFF
+log4j.logger.org.apache.tools.ant.Target=OFF
+log4j.logger.org.apache.tools.ant.Project=OFF
+
 ## Appenders
 # console uses PatternLayout.
 log4j.appender.console=org.apache.log4j.ConsoleAppender