X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.ant%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcExecutionBuildListener.java;h=d8c5565d0ffb4fcee48b342e2bb3d008b21a1ac0;hb=56f9a29fc3d208bb1a0e9476b9d67dc372098e70;hp=7447583ab5f89fc76df66d453317582594572b7b;hpb=b0fffb8f8fccaa85cd4629644db6dabad1c5941c;p=gpl%2Fargeo-slc.git 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 7447583ab..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 @@ -10,10 +10,10 @@ import org.apache.log4j.spi.LoggingEvent; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionNotifier; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.SlcException; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionNotifier; +import org.argeo.slc.process.SlcExecutionStep; public class SlcExecutionBuildListener extends AppenderSkeleton implements BuildListener { @@ -163,16 +163,19 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements @Override protected void append(LoggingEvent event) { Project project = (Project) MDC.get(AntConstants.MDC_ANT_PROJECT); - if (project == null) - throw new SlcException("No Ant project registered in Log4j MDC."); - - SlcExecution slcExecution = getSlcExecution(project); - if (currentStepNotified) { - slcExecution.getSteps().add( - new SlcExecutionStep(event.getMessage().toString())); - currentStepNotified = false; + if (project == null) { + // TODO: find a way to notify it + //System.err.println("No Ant project registered in Log4j MDC."); } else { - slcExecution.currentStep().addLog(event.getMessage().toString()); + SlcExecution slcExecution = getSlcExecution(project); + if (currentStepNotified) { + slcExecution.getSteps().add( + new SlcExecutionStep(event.getMessage().toString())); + currentStepNotified = false; + } else { + slcExecution.currentStep() + .addLog(event.getMessage().toString()); + } } }