From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Apr 2008 11:15:48 +0000 (+0000)
Subject: Fix bugs with slc execution notifications
X-Git-Tag: argeo-slc-2.1.7~2992
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=566554259d48596809aafc567ccc845cefdfb905;p=gpl%2Fargeo-slc.git

Fix bugs with slc execution notifications

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

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 327c02385..a39bf2453 100644
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -30,8 +30,9 @@
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
+				<version>6.1.9</version>
 				<configuration>
-					<scanIntervalSeconds>5</scanIntervalSeconds>
+					<scanIntervalSeconds>10</scanIntervalSeconds>
 					<contextPath>org.argeo.slc.webapp</contextPath>
 					<useTestClasspath>true</useTestClasspath>
 					<webAppSourceDirectory>
diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java
index 945ee8079..bb28343f5 100644
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java
@@ -1,5 +1,7 @@
 package org.argeo.slc.ws.process;
 
+import java.util.List;
+
 import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
 
 import org.apache.commons.logging.Log;
@@ -7,6 +9,7 @@ import org.apache.commons.logging.LogFactory;
 
 import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.core.process.SlcExecutionStep;
 import org.argeo.slc.dao.process.SlcExecutionDao;
 import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
 
@@ -32,7 +35,14 @@ public class SlcExecutionStepsRequestEp extends
 			if (slcExecution == null)
 				throw new SlcException("Could not find slc execution " + uuid);
 
-			slcExecution.getSteps().addAll(msg.getSteps());
+			List<SlcExecutionStep> additionalSteps = msg.getSteps();
+			if(log.isTraceEnabled()){
+				log.trace("Trying to add additional steps to slc execution "+uuid+":");
+				for(SlcExecutionStep step: additionalSteps){
+					log.trace("Step "+step.getUuid()+" (in slc execution "+uuid+")");
+				}
+			}
+			slcExecution.getSteps().addAll(additionalSteps);
 
 			slcExecutionDao.update(slcExecution);
 			log.debug("Added " + msg.getSteps().size()
diff --git a/org.argeo.slc.server/src/test/resources/log4j.properties b/org.argeo.slc.server/src/test/resources/log4j.properties
index 8eb8b0c9c..c49b71be8 100644
--- a/org.argeo.slc.server/src/test/resources/log4j.properties
+++ b/org.argeo.slc.server/src/test/resources/log4j.properties
@@ -4,6 +4,7 @@ log4j.rootLogger=INFO, console
 ## Levels
 # Slc
 log4j.logger.org.argeo.slc=DEBUG
+log4j.logger.org.argeo.slc.ws.process=DEBUG
 # Spring
 log4j.logger.org.springframework=INFO
 # Hibernate