Make tomcat configurable via system properties

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

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 7447583ab5f89fc76df66d453317582594572b7b..d8c5565d0ffb4fcee48b342e2bb3d008b21a1ac0 100644 (file)
--- 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;\r
 import org.apache.tools.ant.BuildListener;\r
 import org.apache.tools.ant.Project;\r
-import org.argeo.slc.core.SlcException;\r
-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.SlcException;\r
+import org.argeo.slc.process.SlcExecution;\r
+import org.argeo.slc.process.SlcExecutionNotifier;\r
+import org.argeo.slc.process.SlcExecutionStep;\r
 \r
 public class SlcExecutionBuildListener extends AppenderSkeleton implements\r
                BuildListener {\r
@@ -163,16 +163,19 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
        @Override\r
        protected void append(LoggingEvent event) {\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(event.getMessage().toString()));\r
-                       currentStepNotified = false;\r
+               if (project == null) {\r
+                       // TODO: find a way to notify it\r
+                       //System.err.println("No Ant project registered in Log4j MDC.");\r
                } else {\r
-                       slcExecution.currentStep().addLog(event.getMessage().toString());\r
+                       SlcExecution slcExecution = getSlcExecution(project);\r
+                       if (currentStepNotified) {\r
+                               slcExecution.getSteps().add(\r
+                                               new SlcExecutionStep(event.getMessage().toString()));\r
+                               currentStepNotified = false;\r
+                       } else {\r
+                               slcExecution.currentStep()\r
+                                               .addLog(event.getMessage().toString());\r
+                       }\r
                }\r
        }\r
 \r