X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcExecutionBuildListener.java;h=d2661792bcefef3a12d891b81877fdf63fc5ba5e;hb=3c5f8c5427a10e45c50888fbd05f4c59c1750b91;hp=2b9400e4b0efb58fe3b7baff387ca68f70d91b6d;hpb=5ac335634ca09f980e452051dd41bc1ce1ea8c16;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 2b9400e4b..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
@@ -5,9 +5,7 @@ import java.util.Vector;
 
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
 import org.apache.log4j.MDC;
-import org.apache.log4j.Priority;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
@@ -16,7 +14,6 @@ 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.ws.process.WebServiceSlcExecutionNotifier;
 
 public class SlcExecutionBuildListener extends AppenderSkeleton implements
 		BuildListener {
@@ -66,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 {
@@ -102,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;
 	}
@@ -133,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;
@@ -165,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());