Properly pass properties

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

diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
index 33a389d2a9079e15c865e167cdc1924a9373e6ec..d8c5565d0ffb4fcee48b342e2bb3d008b21a1ac0 100644 (file)
--- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
+++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
@@ -164,7 +164,8 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
        protected void append(LoggingEvent event) {\r
                Project project = (Project) MDC.get(AntConstants.MDC_ANT_PROJECT);\r
                if (project == null) {\r
-                       System.err.println("No Ant project registered in Log4j MDC.");\r
+                       // TODO: find a way to notify it\r
+                       //System.err.println("No Ant project registered in Log4j MDC.");\r
                } else {\r
                        SlcExecution slcExecution = getSlcExecution(project);\r
                        if (currentStepNotified) {\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java
index e6b8a38451979247a9d7fc20026a145b0e992e75..fc34d1f178b13f003cc2b74b3ba49d6c4e38173e 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.core.runtime;
 
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
@@ -17,8 +18,14 @@ public abstract class AbstractAgent {
                // TODO: in a separate process
                Thread thread = new Thread("SlcExecution " + slcExecution.getUuid()) {
                        public void run() {
-                               slcApplication.execute(slcExecution, new Properties(), null,
-                                               null);
+                               Properties props = new Properties();
+                               Map<String, String> attributes = slcExecution.getAttributes();
+                               for (String key : attributes.keySet()) {
+                                       props.setProperty(key, attributes.get(key));
+                                       if (log.isTraceEnabled())
+                                               log.trace(key + "=" + props.getProperty(key));
+                               }
+                               slcApplication.execute(slcExecution, props, null, null);
                                log.debug("Thread for SLC execution #" + slcExecution.getUuid()
                                                + " finished.");
                        }