X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcExecutionBuildListener.java;h=d2661792bcefef3a12d891b81877fdf63fc5ba5e;hb=b7f351768f4577c0799ab3c5df116ce30270af49;hp=da682ba6fe606236a53cc9966b344a961342b673;hpb=8912b1cdb0b73547d70d2a2729ea075751f37f35;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java index da682ba6f..d2661792b 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java @@ -63,7 +63,7 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements if (slcExecution != null) { if (currentStepNotified) { slcExecution.getSteps().add( - new SlcExecutionStep("LOG", event.getMessage())); + new SlcExecutionStep(event.getMessage())); notifyStep(slcExecution, slcExecution.currentStep()); currentStepNotified = true; } else { @@ -99,7 +99,7 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements if (logTaskStartFinish) msg = "Task " + event.getTask().getTaskName() + " started"; - slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg)); + slcExecution.getSteps().add(new SlcExecutionStep(msg)); currentStepNotified = false; } @@ -130,16 +130,16 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements protected SlcExecution getSlcExecution(Project project) { SlcExecution slcExecution = (SlcExecution) project - .getReference(SlcAntConstants.REF_SLC_EXECUTION); + .getReference(AntConstants.REF_SLC_EXECUTION); if (slcExecution == null) - throw new SlcAntException("No SLC Execution registered."); + throw new SlcException("No SLC Execution registered."); return slcExecution; } protected void addLogStep(BuildEvent event, String msg) { SlcExecution slcExecution = getSlcExecution(event); - slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg)); + slcExecution.getSteps().add(new SlcExecutionStep(msg)); notifyStep(slcExecution, slcExecution.currentStep()); currentStepNotified = true; @@ -162,14 +162,14 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements @Override protected void append(LoggingEvent event) { - Project project = (Project) MDC.get(SlcAntConstants.MDC_ANT_PROJECT); + 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("LOG", event.getMessage().toString())); + new SlcExecutionStep(event.getMessage().toString())); currentStepNotified = false; } else { slcExecution.currentStep().addLog(event.getMessage().toString());