From 587e0275296f6ad1291613839aae7d4157cc84f5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 19 Jan 2009 21:03:41 +0000 Subject: [PATCH] Properly pass properties git-svn-id: https://svn.argeo.org/slc/trunk@2111 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/slc/ant/SlcExecutionBuildListener.java | 3 ++- .../org/argeo/slc/core/runtime/AbstractAgent.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) 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 33a389d2a..d8c5565d0 100644 --- 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) { Project project = (Project) MDC.get(AntConstants.MDC_ANT_PROJECT); if (project == null) { - System.err.println("No Ant project registered in Log4j MDC."); + // TODO: find a way to notify it + //System.err.println("No Ant project registered in Log4j MDC."); } else { SlcExecution slcExecution = getSlcExecution(project); if (currentStepNotified) { 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 e6b8a3845..fc34d1f17 100644 --- 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 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."); } -- 2.39.2