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 327c023858d90fe6b8943afc2d60d6433e59514d..a39bf24539562e4bc7d9977a71662918be8b574a 100644 (file)
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -30,8 +30,9 @@
                        <plugin>\r
                                <groupId>org.mortbay.jetty</groupId>\r
                                <artifactId>maven-jetty-plugin</artifactId>\r
+                               <version>6.1.9</version>\r
                                <configuration>\r
-                                       <scanIntervalSeconds>5</scanIntervalSeconds>\r
+                                       <scanIntervalSeconds>10</scanIntervalSeconds>\r
                                        <contextPath>org.argeo.slc.webapp</contextPath>\r
                                        <useTestClasspath>true</useTestClasspath>\r
                                        <webAppSourceDirectory>\r

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 945ee80791f05e456014b418ea626eadb09226db..bb28343f581a11c5555a9ed53b020166652bc7b8 100644 (file)
--- 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 8eb8b0c9c86c72ddc2f5b61d305686653e16efae..c49b71be87f601869ac3e4bfa4b0501360414e1f 100644 (file)
--- 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\r
 # Slc\r
 log4j.logger.org.argeo.slc=DEBUG\r
+log4j.logger.org.argeo.slc.ws.process=DEBUG\r
 # Spring\r
 log4j.logger.org.springframework=INFO\r
 # Hibernate\r