From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Apr 2008 22:53:51 +0000 (+0000)
Subject: Improve SlcExecution notifications
X-Git-Tag: argeo-slc-2.1.7~2971
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c40be4f393a3609e7892095db01e783a36a6c46b;p=gpl%2Fargeo-slc.git

Improve SlcExecution notifications

git-svn-id: https://svn.argeo.org/slc/trunk@1069 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index b46e8a7a0..6959e7708 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.9-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
-	</parent>
-	<artifactId>argeo-slc-core</artifactId>
-	<name>Argeo SLC Core</name>
-	<description>SLC Core</description>
-	<scm>
-		<connection>
-			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
-		</connection>
-		<url>
-			https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
-		</url>
-	</scm>
-	<build>
-		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc</artifactId>
+		<version>0.9-SNAPSHOT</version>
+		<relativePath>../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>argeo-slc-core</artifactId>
+	<name>Argeo SLC Core</name>
+	<description>SLC Core</description>
+	<scm>
+		<connection>
+			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
+		</connection>
+		<url>
+			https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
+		</url>
+	</scm>
+	<build>
+		<plugins>
+			<!-- Look to parent pom for inheritances -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/base.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assembly-base</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/base.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>assembly-base</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -58,35 +58,35 @@
 					</excludes>
 				</configuration>
 			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-				<dependency>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>javax.transaction</groupId>
+			<artifactId>jta</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-core</artifactId>
 		</dependency>
@@ -112,26 +112,30 @@
 			<groupId>com.sun.xml.messaging.saaj</groupId>
 			<artifactId>saaj-impl</artifactId>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.dbunit</groupId>
-			<artifactId>dbunit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-		</dependency>
-	</dependencies>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dbunit</groupId>
+			<artifactId>dbunit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
index 7f0b30b2e..f2bedce40 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
@@ -31,7 +31,8 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 	// private Map<SlcExecution, SlcExecutionStep> currentStep = new
 	// HashMap<SlcExecution, SlcExecutionStep>();
 
-	private SlcExecutionStep currentStep = null;
+	// private SlcExecutionStep currentStep = null;
+	private boolean currentStepNotified = true;
 
 	public void init(Project project) {
 		if (this.project != null) {
@@ -72,12 +73,13 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 	public void messageLogged(BuildEvent event) {
 		SlcExecution slcExecution = getSlcExecution(event);
 		if (slcExecution != null) {
-			if (currentStep == null) {
-				currentStep = new SlcExecutionStep("LOG", event.getMessage());
-				notifyStep(slcExecution, currentStep);
-				currentStep = null;
+			if (currentStepNotified) {
+				slcExecution.getSteps().add(
+						new SlcExecutionStep("LOG", event.getMessage()));
+				notifyStep(slcExecution, slcExecution.currentStep());
+				currentStepNotified = true;
 			} else {
-				currentStep.addLog(event.getMessage());
+				slcExecution.currentStep().addLog(event.getMessage());
 			}
 		} else {
 			// TODO: log before initialization?
@@ -94,23 +96,24 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 
 	public void taskStarted(BuildEvent event) {
 		SlcExecution slcExecution = getSlcExecution(event);
-		if (currentStep != null) {
-			notifyStep(slcExecution, currentStep);
-			currentStep = null;
+		if (!currentStepNotified) {
+			notifyStep(slcExecution, slcExecution.currentStep());
+			currentStepNotified = true;
 		}
 
-		currentStep = new SlcExecutionStep("LOG", "Task "
-				+ event.getTask().getTaskName() + " started");
+		slcExecution.getSteps().add(
+				new SlcExecutionStep("LOG", "Task "
+						+ event.getTask().getTaskName() + " started"));
+		currentStepNotified = false;
 	}
 
 	public void taskFinished(BuildEvent event) {
 		SlcExecution slcExecution = getSlcExecution(event);
-		if (currentStep != null) {
-			currentStep.addLog("Task " + event.getTask().getTaskName()
-					+ " finished");
-			slcExecution.getSteps().add(currentStep);
-			notifyStep(slcExecution, currentStep);
-			currentStep = null;
+		if (!currentStepNotified) {
+			slcExecution.currentStep().addLog(
+					"Task " + event.getTask().getTaskName() + " finished");
+			notifyStep(slcExecution, slcExecution.currentStep());
+			currentStepNotified = true;
 		}
 	}
 
@@ -129,49 +132,15 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 
 		if (slcExecution == null)
 			throw new SlcAntException("No SLC Execution registered.");
-
-		// if (slcExecution == null) {
-		// // for log4j
-		// this.project = project;
-		// if (!LogManager.getRootLogger().isAttached(this)) {
-		// LogManager.getRootLogger().addAppender(this);
-		// }
-		//			
-		// slcExecution = new SlcExecution();
-		// slcExecution.setUuid(UUID.randomUUID().toString());
-		// try {
-		// slcExecution.setHost(InetAddress.getLocalHost().getHostName());
-		// } catch (UnknownHostException e) {
-		// slcExecution.setHost(SlcExecution.UNKOWN_HOST);
-		// }
-		//
-		// if (project.getReference(SlcProjectHelper.REF_ROOT_CONTEXT) != null)
-		// {
-		// slcExecution.setType(SLC_ANT_TYPE);
-		// } else {
-		// slcExecution.setType(ANT_TYPE);
-		// }
-		//
-		// slcExecution.setPath(project.getProperty("ant.file"));
-		// slcExecution.setStatus(SlcExecution.STATUS_RUNNING);
-		//
-		// project.addReference(REF_SLC_EXECUTION, slcExecution);
-		//
-		// for (SlcExecutionNotifier notifier : notifiers) {
-		// notifier.newExecution(slcExecution);
-		// }
-		//
-		// }
-
 		return slcExecution;
 	}
 
 	protected void addLogStep(BuildEvent event, String msg) {
-		SlcExecutionStep step = new SlcExecutionStep("LOG", msg);
 		SlcExecution slcExecution = getSlcExecution(event);
-		slcExecution.getSteps().add(step);
+		slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg));
 
-		notifyStep(slcExecution, step);
+		notifyStep(slcExecution, slcExecution.currentStep());
+		currentStepNotified = true;
 	}
 
 	protected void notifyStep(SlcExecution slcExecution, SlcExecutionStep step) {
@@ -207,11 +176,14 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 			SlcExecution slcExecution = (SlcExecution) project
 					.getReference(REF_SLC_EXECUTION);
 			if (slcExecution != null) {
-				if (currentStep == null) {
-					currentStep = new SlcExecutionStep("LOG", event
-							.getMessage().toString());
+				if (currentStepNotified) {
+					slcExecution.getSteps().add(
+							new SlcExecutionStep("LOG", event.getMessage()
+									.toString()));
+					currentStepNotified = false;
 				}
-				currentStep.addLog(event.getMessage().toString());
+				slcExecution.currentStep()
+						.addLog(event.getMessage().toString());
 			} else {
 				// TODO: log before initialization?
 			}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java
index 0f2d1b66c..5b9b995cd 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java
@@ -68,6 +68,13 @@ public class SlcExecution {
 		this.status = status;
 	}
 
+	public SlcExecutionStep currentStep() {
+		if (steps.size() > 0)
+			return steps.get(steps.size() - 1);
+		else
+			return null;
+	}
+
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof SlcExecution) {