Introduce ListSlcExecution service

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

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 (file)
index 0000000..c9531ce
--- /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;\r
+\r
+import java.util.List;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.argeo.slc.dao.process.SlcExecutionDao;\r
+import org.argeo.slc.msg.ObjectList;\r
+import org.argeo.slc.process.SlcExecution;\r
+import org.argeo.slc.web.mvc.AbstractServiceController;\r
+import org.springframework.web.servlet.ModelAndView;\r
+\r
+/** Lists SLC executions possibly filtering them. */\r
+public class ListSlcExecutionsController extends AbstractServiceController {\r
+       private final SlcExecutionDao slcExecutionDao;\r
+\r
+       public ListSlcExecutionsController(SlcExecutionDao slcExecutionDao) {\r
+               this.slcExecutionDao = slcExecutionDao;\r
+       }\r
+\r
+       @Override\r
+       protected void handleServiceRequest(HttpServletRequest request,\r
+                       HttpServletResponse response, ModelAndView modelAndView)\r
+                       throws Exception {\r
+               List<SlcExecution> list = slcExecutionDao.listSlcExecutions();\r
+               modelAndView.addObject("list", new ObjectList(list));\r
+       }\r
+}\r

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 3e64f53315d2ec83dcbb149c04e42686ced2a695..7d0e33aae74a2c437be5ee865e6b25efb48d5bee 100644 (file)
--- 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 c066d2f1d6bf6f7fee79d4e6cf64316b381c18dc..a52fea533f2c33cb37aac045443ec8e3dd884bae 100644 (file)
--- 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;\r
 \r
+import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.TreeMap;\r
-import java.util.Vector;\r
 \r
 public class SlcExecution {\r
        public final static String STATUS_SCHEDULED = "SCHEDULED";\r
@@ -21,7 +21,7 @@ public class SlcExecution {
        private String status;\r
        private Map<String, String> attributes = new TreeMap<String, String>();\r
 \r
-       private List<SlcExecutionStep> steps = new Vector<SlcExecutionStep>();\r
+       private List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();\r
 \r
        public List<SlcExecutionStep> getSteps() {\r
                return steps;\r

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 59cf231d834cdee6299e0008d0ed493f1189f36a..54e363efbbe8d50bb97682eb9594297392032346 100644 (file)
--- 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;\r
 import java.io.StringReader;\r
 import java.io.StringWriter;\r
+import java.util.ArrayList;\r
 import java.util.Date;\r
 import java.util.List;\r
 import java.util.UUID;\r
-import java.util.Vector;\r
 \r
 import org.apache.commons.io.IOUtils;\r
 \r
@@ -16,7 +16,7 @@ public class SlcExecutionStep {
        private String uuid;\r
        private String type;\r
        private Date begin;\r
-       private List<String> logLines = new Vector<String>();\r
+       private List<String> logLines = new ArrayList<String>();\r
 \r
        /** Empty constructor */\r
        public SlcExecutionStep() {\r

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 d37f3f8391a1f20fdbd45bb00210dd67ae78f2d3..5cb7ccd5815306c4c2bb46f8ac4ad1cfcdf9f0fb 100644 (file)
--- 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" />\r
                <field name="host" />\r
                <field name="user" />\r
-               <field name="steps" collection="vector"\r
+               <field name="steps" collection="arraylist"\r
                        type="org.argeo.slc.process.SlcExecutionStep">\r
                        <bind-xml auto-naming="deriveByClass" location="steps" />\r
                </field>\r
@@ -43,7 +43,7 @@
                </field>\r
                <field name="type" />\r
                <field name="begin" />\r
-               <field name="logLines" collection="vector" type="string">\r
+               <field name="logLines" collection="arraylist" type="string">\r
                        <bind-xml name="log-line" location="log-lines" />\r
                </field>\r
        </class>\r