Prepare for release candidate

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / ant / SlcExecutionBuildListener.java

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 2b9400e4b0efb58fe3b7baff387ca68f70d91b6d..d2661792bcefef3a12d891b81877fdf63fc5ba5e 100644 (file)
--- 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;
 \r
 import org.apache.log4j.AppenderSkeleton;\r
 import org.apache.log4j.Level;\r
-import org.apache.log4j.LogManager;\r
 import org.apache.log4j.MDC;\r
-import org.apache.log4j.Priority;\r
 import org.apache.log4j.spi.LoggingEvent;\r
 import org.apache.tools.ant.BuildEvent;\r
 import org.apache.tools.ant.BuildListener;\r
@@ -16,7 +14,6 @@ import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.process.SlcExecution;\r
 import org.argeo.slc.core.process.SlcExecutionNotifier;\r
 import org.argeo.slc.core.process.SlcExecutionStep;\r
-import org.argeo.slc.ws.process.WebServiceSlcExecutionNotifier;\r
 \r
 public class SlcExecutionBuildListener extends AppenderSkeleton implements\r
                BuildListener {\r
@@ -66,7 +63,7 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
                if (slcExecution != null) {\r
                        if (currentStepNotified) {\r
                                slcExecution.getSteps().add(\r
-                                               new SlcExecutionStep("LOG", event.getMessage()));\r
+                                               new SlcExecutionStep(event.getMessage()));\r
                                notifyStep(slcExecution, slcExecution.currentStep());\r
                                currentStepNotified = true;\r
                        } else {\r
@@ -102,7 +99,7 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
                if (logTaskStartFinish)\r
                        msg = "Task " + event.getTask().getTaskName() + " started";\r
 \r
-               slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg));\r
+               slcExecution.getSteps().add(new SlcExecutionStep(msg));\r
 \r
                currentStepNotified = false;\r
        }\r
@@ -133,16 +130,16 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 \r
        protected SlcExecution getSlcExecution(Project project) {\r
                SlcExecution slcExecution = (SlcExecution) project\r
-                               .getReference(SlcAntConstants.REF_SLC_EXECUTION);\r
+                               .getReference(AntConstants.REF_SLC_EXECUTION);\r
 \r
                if (slcExecution == null)\r
-                       throw new SlcAntException("No SLC Execution registered.");\r
+                       throw new SlcException("No SLC Execution registered.");\r
                return slcExecution;\r
        }\r
 \r
        protected void addLogStep(BuildEvent event, String msg) {\r
                SlcExecution slcExecution = getSlcExecution(event);\r
-               slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg));\r
+               slcExecution.getSteps().add(new SlcExecutionStep(msg));\r
 \r
                notifyStep(slcExecution, slcExecution.currentStep());\r
                currentStepNotified = true;\r
@@ -165,14 +162,14 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 \r
        @Override\r
        protected void append(LoggingEvent event) {\r
-               Project project = (Project) MDC.get(SlcAntConstants.MDC_ANT_PROJECT);\r
+               Project project = (Project) MDC.get(AntConstants.MDC_ANT_PROJECT);\r
                if (project == null)\r
                        throw new SlcException("No Ant project registered in Log4j MDC.");\r
 \r
                SlcExecution slcExecution = getSlcExecution(project);\r
                if (currentStepNotified) {\r
                        slcExecution.getSteps().add(\r
-                                       new SlcExecutionStep("LOG", event.getMessage().toString()));\r
+                                       new SlcExecutionStep(event.getMessage().toString()));\r
                        currentStepNotified = false;\r
                } else {\r
                        slcExecution.currentStep().addLog(event.getMessage().toString());\r