Introduce collection management

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 7727629dc665e4615c91825b1951ebbf6635f01d..b4be84fa99a7c4ea8e784b2495a30d9b5fe3a537 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -42,10 +42,25 @@
                <property name="suppressClose" value="true" />\r
        </bean>\r
 \r
+       <!-- Services -->\r
+       <bean id="testManagerService"\r
+               class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">\r
+               <constructor-arg ref="testResultDao" />\r
+               <constructor-arg ref="testRunDescriptorDao" />\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <constructor-arg ref="testResultCollectionDao" />\r
+       </bean>\r
+\r
+       <!-- DAOs -->\r
        <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r
        </bean>\r
 \r
+       <bean id="testResultCollectionDao"\r
+               parent="slcTemplates.dao.testResultCollectionDao">\r
+               <property name="sessionFactory" ref="sessionFactory" />\r
+       </bean>\r
+\r
        <bean id="testRunDescriptorDao"\r
                parent="slcTemplates.dao.testRunDescriptorDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp
new file mode 100644 (file)
index 0000000..f1453bd
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>Add result to collection</h1>\r
+Result <b>${param.resultUuid}</b> successfully added to collection <b>${param.collectionId}</b>.\r
+</div>\r
+\r
+<%@include file="footer.txt"%>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp
index a7cca86de58fd85aa3a562b76086ce1f68c421ef..0abd193d1efe5b91a5e99814b95935795458d02b 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp
@@ -9,5 +9,34 @@
        <tr>\r
                <td class="nav1"><a href="home.web">Home</a></td>\r
        </tr>\r
+       <tr>\r
+               <td class="nav1">Overview</td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="resultCollectionList.web">Collections</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="resultList.web">All Results</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="slcExecutionList.web">SLC\r
+               Executions</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav1"><a href="resultCollectionList.web">Collections</a></td>\r
+       </tr>\r
+       <c:forEach items="${resultCollections}" var="resultCollection">\r
+               <tr>\r
+                       <td class="nav2"><a\r
+                               href="resultCollectionView.web?id=${resultCollection.id}">${resultCollection.id}</a></td>\r
+               </tr>\r
+       </c:forEach>\r
+       <tr>\r
+               <td class="nav1">Technical</td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="slcService/slcDefinition.wsdl">WSDL\r
+               Definition</a></td>\r
+       </tr>\r
 </table>\r
 </div>\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
index 6e33dc286e26c9d24aa13947215fe268918518bc..d90466931b6385918fea6bbbb050fdcfc6c5fd27 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -9,13 +9,6 @@
 <div id="main">\r
 <h1>SLC Home</h1>\r
 \r
-<h2>Web</h2>\r
-<a href="resultList.web">Results</a><br/>\r
-<a href="slcExecutionList.web">SLC Executions</a>\r
-\r
-<h2>Web Services</h2>\r
-<a href="slcService/slcDefinition.wsdl">WSDL Definition</a>\r
-\r
 </div>\r
 \r
 <%@include file="footer.txt"%>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp
new file mode 100644 (file)
index 0000000..dd7a773
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>Remove result from collection</h1>\r
+Result <b>${param.resultUuid}</b> successfully removed from collection <b>${param.collectionId}</b>.\r
+</div>\r
+\r
+<%@include file="footer.txt"%>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp
new file mode 100644 (file)
index 0000000..7eb19a2
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>Result Collections</h1>\r
+\r
+<table cellspacing="0">\r
+       <thead>\r
+               <tr>\r
+                       <th>Id</th>\r
+               </tr>\r
+       </thead>\r
+       <c:forEach items="${resultCollections}" var="resultCollection">\r
+               <tr>\r
+                       <td>${resultCollection.id}</td>\r
+                       <td><a\r
+                               href="resultCollectionView.web?id=${resultCollection.id}">view</a></td>\r
+               </tr>\r
+       </c:forEach>\r
+</table>\r
+\r
+</div>\r
+\r
+<%@include file="footer.txt"%>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp
new file mode 100644 (file)
index 0000000..d4aa538
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>Result Collection ${resultCollection.id}</h1>\r
+\r
+<table cellspacing="0">\r
+       <thead>\r
+               <tr>\r
+                       <th>Id</th>\r
+                       <th>Status</th>\r
+               </tr>\r
+       </thead>\r
+       <c:forEach items="${resultCollection.results}" var="result">\r
+               <tr>\r
+                       <td>${result.uuid}</td>\r
+                       <c:choose>\r
+                               <c:when test="${result.closeDate != null}">\r
+                                       <td>${result.closeDate}</td>\r
+                               </c:when>\r
+                               <c:otherwise>\r
+                                       <td>NOT CLOSED</td>\r
+                               </c:otherwise>\r
+                       </c:choose>\r
+                       <td><a href="resultView.web?uuid=${result.uuid}">view</a></td>\r
+                       <td><a\r
+                               href="removeResultFromCollection.web?resultUuid=${result.uuid}&collectionId=${resultCollection.id}">remove</a></td>\r
+               </tr>\r
+       </c:forEach>\r
+</table>\r
+\r
+</div>\r
+\r
+<%@include file="footer.txt"%>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
index 39c701d6999492f6957d1dedf1e8ddd80109a360..66e63a11d3be71062ad2c73e4c01505be978c89f 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
@@ -11,9 +11,15 @@
 <h1>Result #${result.uuid}</h1>\r
 \r
 <jsp:useBean id="describedPaths" type="java.util.SortedMap"\r
-       scope="request" /> <jsp:useBean id="toc" type="java.util.SortedMap"\r
+       scope="request" /> \r
+<jsp:useBean id="toc" type="java.util.SortedMap"\r
        scope="request" />\r
 \r
+<p>\r
+<a href="addResultToCollection.web?resultUuid=${result.uuid}&collectionId=staging">Add to staging collection</a><br/>\r
+<a href="addResultToCollection.web?resultUuid=${result.uuid}&collectionId=official">Add to official collection</a>\r
+</p>\r
+\r
 <table>\r
        <c:forEach items="${toc}" var="tocEntry">\r
                <jsp:useBean id="tocEntry" type="java.util.Map.Entry" />\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
index 04a66b23626ed424a3ea0d082535551fb2e0ab89..95886aeb09ca24f93f75326e1a0623ac1f42ee41 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
@@ -34,6 +34,30 @@
                <property name="viewName" value="resultView" />\r
        </bean>\r
 \r
+       <bean name="/resultCollectionList.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultCollectionListController">\r
+               <constructor-arg ref="testResultCollectionDao" />\r
+               <property name="viewName" value="resultCollectionList" />\r
+       </bean>\r
+\r
+       <bean name="/resultCollectionView.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">\r
+               <constructor-arg ref="testResultCollectionDao" />\r
+               <property name="viewName" value="resultCollectionView" />\r
+       </bean>\r
+       \r
+       <bean name="/addResultToCollection.web"\r
+               class="org.argeo.slc.web.mvc.result.AddResultToCollectionController">\r
+               <constructor-arg ref="testManagerService" />\r
+               <property name="viewName" value="addResultToCollectionS" />\r
+       </bean>\r
+\r
+       <bean name="/removeResultFromCollection.web"\r
+               class="org.argeo.slc.web.mvc.result.RemoveResultFromCollectionController">\r
+               <constructor-arg ref="testManagerService" />\r
+               <property name="viewName" value="removeResultFromCollectionS" />\r
+       </bean>\r
+\r
        <bean name="/testRunView.web"\r
                class="org.argeo.slc.web.mvc.result.TestRunViewController">\r
                <constructor-arg ref="testRunDescriptorDao" />\r
@@ -42,6 +66,16 @@
 \r
        <bean id="handlerMapping"\r
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r
+               <property name="interceptors">\r
+                       <list>\r
+                               <ref bean="resultInterceptor" />\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="resultInterceptor"\r
+               class="org.argeo.slc.web.mvc.result.ResultInterceptor">\r
+               <constructor-arg ref="testResultCollectionDao" />\r
        </bean>\r
 \r
        <bean id="viewResolver"\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
index e09d30ad78926cb4bfbe5b904cb7229cd24e1477..3fc84efef232ce78968f4ae7420c8444fbb01b41 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
@@ -44,7 +44,7 @@
        <bean name="resultPartRequestEp"\r
                class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
                <constructor-arg ref="testResultDao" />\r
-               <constructor-arg ref="testRunDescriptorDao" />\r
+               <constructor-arg ref="testManagerService" />\r
                <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
                <property name="unmarshaller"\r
                        ref="slcDefault.castor.marshaller" />\r