From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 6 May 2009 20:58:18 +0000 (+0000)
Subject: Notify directly the new execution
X-Git-Tag: argeo-slc-2.1.7~1913
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=d8ae26046184c02fab744ca2ff63c357c5845a80;p=gpl%2Fargeo-slc.git

Notify directly the new execution

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

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java
index 0540bae29..2e19764e6 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java
@@ -11,6 +11,7 @@ import org.argeo.slc.msg.MsgConstants;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.runtime.SlcAgent;
 import org.argeo.slc.runtime.SlcAgentFactory;
+import org.argeo.slc.services.process.SlcExecutionService;
 import org.argeo.slc.web.mvc.AbstractServiceController;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.web.servlet.ModelAndView;
@@ -23,15 +24,16 @@ public class NewSlcExecutionController extends AbstractServiceController {
 
 	private SlcAgentFactory agentFactory;
 	private Unmarshaller unmarshaller;
+	private SlcExecutionService slcExecutionService;
 
 	@Override
 	protected void handleServiceRequest(HttpServletRequest request,
 			HttpServletResponse response, ModelAndView modelAndView)
 			throws Exception {
-		
-		if(log.isDebugEnabled()){
-			log.debug("Content-Type: "+request.getContentType());
-			log.debug("Content-Length: "+request.getContentLength());
+
+		if (log.isTraceEnabled()) {
+			log.debug("Content-Type: " + request.getContentType());
+			log.debug("Content-Length: " + request.getContentLength());
 		}
 
 		String agentId = request
@@ -43,19 +45,22 @@ public class NewSlcExecutionController extends AbstractServiceController {
 			BufferedReader reader = request.getReader();
 			StringBuffer buffer = new StringBuffer();
 			String line = null;
-			while (((line = reader.readLine())!=null)) {
+			while (((line = reader.readLine()) != null)) {
 				buffer.append(line);
 			}
 			answer = buffer.toString();
 		}
 
-		if (log.isDebugEnabled())
+		if (log.isTraceEnabled())
 			log.debug("Received message:\n" + answer);
 
 		StringSource source = new StringSource(answer);
 		SlcExecution slcExecution = (SlcExecution) unmarshaller
 				.unmarshal(source);
 
+		slcExecution.setStatus(SlcExecution.STATUS_SCHEDULED);
+		slcExecutionService.newExecution(slcExecution);
+
 		SlcAgent agent = agentFactory.getAgent(agentId);
 		agent.runSlcExecution(slcExecution);
 	}
@@ -68,4 +73,8 @@ public class NewSlcExecutionController extends AbstractServiceController {
 		this.agentFactory = agentFactory;
 	}
 
+	public void setSlcExecutionService(SlcExecutionService slcExecutionService) {
+		this.slcExecutionService = slcExecutionService;
+	}
+
 }
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
index 461f88963..b2b4a0ca2 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
@@ -26,6 +26,7 @@
 	<reference id="testManagerService"
 		interface="org.argeo.slc.services.test.TestManagerService" />
 	<reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />
+	<reference id="slcExecutionService" interface="org.argeo.slc.services.process.SlcExecutionService" />
 
 	<reference id="hibernateTransactionManager"
 		interface="org.springframework.transaction.PlatformTransactionManager"
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
index eb90e3015..2de1cd8d5 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
@@ -59,6 +59,7 @@
 		class="org.argeo.slc.web.mvc.process.NewSlcExecutionController">
 		<property name="agentFactory" ref="agentFactory" />
 		<property name="unmarshaller" ref="slcDefault.castor.marshaller" />
+		<property name="slcExecutionService" ref="slcExecutionService" />
 	</bean>
 
 	<bean name="/getExecutionDescriptor.service" class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">