From fb3193e4e860ef199a47cd18fa536e37a0a1d82b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 19 Jan 2009 10:36:59 +0000
Subject: [PATCH] Introduce ListSlcExecution service

git-svn-id: https://svn.argeo.org/slc/trunk@2104 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../process/ListSlcExecutionsController.java  | 29 +++++++++++++++++++
 .../slc/server/spring/slc-service-servlet.xml |  5 ++++
 .../org/argeo/slc/process/SlcExecution.java   |  4 +--
 .../argeo/slc/process/SlcExecutionStep.java   |  4 +--
 .../org/argeo/slc/castor/process.xml          |  4 +--
 5 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/ListSlcExecutionsController.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/ListSlcExecutionsController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/ListSlcExecutionsController.java
new file mode 100644
index 000000000..c9531ce9f
--- /dev/null
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/ListSlcExecutionsController.java
@@ -0,0 +1,29 @@
+package org.argeo.slc.web.mvc.process;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.argeo.slc.dao.process.SlcExecutionDao;
+import org.argeo.slc.msg.ObjectList;
+import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.web.mvc.AbstractServiceController;
+import org.springframework.web.servlet.ModelAndView;
+
+/** Lists SLC executions possibly filtering them. */
+public class ListSlcExecutionsController extends AbstractServiceController {
+	private final SlcExecutionDao slcExecutionDao;
+
+	public ListSlcExecutionsController(SlcExecutionDao slcExecutionDao) {
+		this.slcExecutionDao = slcExecutionDao;
+	}
+
+	@Override
+	protected void handleServiceRequest(HttpServletRequest request,
+			HttpServletResponse response, ModelAndView modelAndView)
+			throws Exception {
+		List<SlcExecution> list = slcExecutionDao.listSlcExecutions();
+		modelAndView.addObject("list", new ObjectList(list));
+	}
+}
diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
index 3e64f5331..7d0e33aae 100644
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
+++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
@@ -41,6 +41,11 @@
 		<constructor-arg ref="slcAgentDescriptorDao" />
 	</bean>
 
+	<bean name="/listSlcExecutions.service" class="org.argeo.slc.web.mvc.process.ListSlcExecutionsController">
+		<constructor-arg ref="slcExecutionDao" />
+	</bean>
+
+
 	<!--
 		<bean name="/resultList.service"
 		class="org.argeo.slc.web.mvc.result.ResultListController">
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java
index c066d2f1d..a52fea533 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java
@@ -1,9 +1,9 @@
 package org.argeo.slc.process;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.Vector;
 
 public class SlcExecution {
 	public final static String STATUS_SCHEDULED = "SCHEDULED";
@@ -21,7 +21,7 @@ public class SlcExecution {
 	private String status;
 	private Map<String, String> attributes = new TreeMap<String, String>();
 
-	private List<SlcExecutionStep> steps = new Vector<SlcExecutionStep>();
+	private List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
 
 	public List<SlcExecutionStep> getSteps() {
 		return steps;
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java
index 59cf231d8..54e363efb 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java
@@ -3,10 +3,10 @@ package org.argeo.slc.process;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import java.util.Vector;
 
 import org.apache.commons.io.IOUtils;
 
@@ -16,7 +16,7 @@ public class SlcExecutionStep {
 	private String uuid;
 	private String type;
 	private Date begin;
-	private List<String> logLines = new Vector<String>();
+	private List<String> logLines = new ArrayList<String>();
 
 	/** Empty constructor */
 	public SlcExecutionStep() {
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml
index d37f3f839..5cb7ccd58 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml
@@ -15,7 +15,7 @@
 		<field name="type" />
 		<field name="host" />
 		<field name="user" />
-		<field name="steps" collection="vector"
+		<field name="steps" collection="arraylist"
 			type="org.argeo.slc.process.SlcExecutionStep">
 			<bind-xml auto-naming="deriveByClass" location="steps" />
 		</field>
@@ -43,7 +43,7 @@
 		</field>
 		<field name="type" />
 		<field name="begin" />
-		<field name="logLines" collection="vector" type="string">
+		<field name="logLines" collection="arraylist" type="string">
 			<bind-xml name="log-line" location="log-lines" />
 		</field>
 	</class>
-- 
2.39.2