From 93b66f36bdb8042d2aac73b75dda76e65d8e7994 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 22 Jan 2009 20:18:02 +0000 Subject: [PATCH] Remove old webapp git-svn-id: https://svn.argeo.org/slc/trunk@2114 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc-jsp/addResultToCollectionS.jsp | 4 - .../src/main/webapp/WEB-INF/slc-jsp/home.jsp | 4 - .../slc-jsp/removeResultFromCollectionS.jsp | 4 - .../WEB-INF/slc-jsp/resultCollectionList.jsp | 21 ---- .../WEB-INF/slc-jsp/resultCollectionView.jsp | 29 ----- .../webapp/WEB-INF/slc-jsp/resultList.jsp | 32 ----- .../webapp/WEB-INF/slc-jsp/resultView.jsp | 55 --------- .../WEB-INF/slc-jsp/slcExecutionList.jsp | 24 ---- .../WEB-INF/slc-jsp/slcExecutionView.jsp | 45 ------- .../webapp/WEB-INF/slc-jsp/testRunView.jsp | 22 ---- .../main/webapp/WEB-INF/slc-ui-servlet.xml | 9 -- .../main/webapp/WEB-INF/slc-ui/resultList.jsp | 26 ---- .../main/webapp/WEB-INF/slc-web-servlet.xml | 9 -- .../main/webapp/WEB-INF/specific/coda.jspf | 2 - .../main/webapp/WEB-INF/specific/common.jsp | 40 ------ .../main/webapp/WEB-INF/specific/prelude.jspf | 16 --- .../src/main/webapp/WEB-INF/web.xml | 47 -------- .../src/main/webapp/WEB-INF/xslt-servlet.xml | 6 +- .../slc/web/mvc/admin/HomeController.java | 16 --- .../process/SlcExecutionListController.java | 37 ------ .../process/SlcExecutionViewController.java | 57 --------- ...ava => GetResultCollectionController.java} | 17 ++- .../slc/web/mvc/result/ResultExcelView.java | 2 +- .../slc/web/mvc/result/ResultInterceptor.java | 27 ----- .../web/mvc/result/ResultListController.java | 34 ------ .../slc/web/mvc/result/ResultPdfView.java | 2 +- .../web/mvc/result/ResultViewController.java | 114 ------------------ .../slc/server/spring/slc-doc-servlet.xml | 18 +-- .../slc/server/spring/slc-service-servlet.xml | 12 +- .../slc/server/spring/slc-ui-servlet.xml | 42 ------- .../slc/server/spring/slc-web-servlet.xml | 95 --------------- .../slc/server/spring/slc-xslt-servlet.xml | 15 +-- 32 files changed, 26 insertions(+), 857 deletions(-) delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui-servlet.xml delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui/resultList.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/{ResultCollectionViewController.java => GetResultCollectionController.java} (57%) delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultInterceptor.java delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java delete mode 100644 runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ui-servlet.xml delete mode 100644 runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp deleted file mode 100644 index bceedf377..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp +++ /dev/null @@ -1,4 +0,0 @@ -
-

Add result to collection

-Result ${param.resultUuid} successfully added to collection ${param.collectionId}. -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp deleted file mode 100644 index 12fa0919c..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp +++ /dev/null @@ -1,4 +0,0 @@ -
-

SLC Home

- -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp deleted file mode 100644 index 30a2b9fa8..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp +++ /dev/null @@ -1,4 +0,0 @@ -
-

Remove result from collection

-Result ${param.resultUuid} successfully removed from collection ${param.collectionId}. -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp deleted file mode 100644 index 576361f23..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp +++ /dev/null @@ -1,21 +0,0 @@ -
-

Result Collections

- - - - - - - - - - - - - - -
Id
${resultCollection.id}viewxml
- -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp deleted file mode 100644 index 2d741d9bf..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp +++ /dev/null @@ -1,29 +0,0 @@ -
-

Result Collection ${resultCollection.id}

- - - - - - - - - - - - - - - - - - - - - - - -
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewremove
- -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp deleted file mode 100644 index 2bfd1a3a3..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp +++ /dev/null @@ -1,32 +0,0 @@ -
-

Results

- - - - - - - - - - - - - - - - - - - - - - - - - - -
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewxslxmlxlspdf
- -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp deleted file mode 100644 index 08c87a72f..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp +++ /dev/null @@ -1,55 +0,0 @@ -
-

Result #${result.uuid}

- - - - -

-Add to staging collection
-Add to official collection -

- - - - - - - - -
${tocEntry.key.name }
- - - - -

<%=describedPaths.get(resultPartEntry.getKey())%>

- - - - - - - -
${tagEntry.key}${tagEntry.value}
- - - - - - - - - - -
- ${part.message} - - 
${part.exceptionMessage}
- - 		- test run -
- -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp deleted file mode 100644 index 1848c26e9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp +++ /dev/null @@ -1,24 +0,0 @@ -
-

SLC Execution List

- - - - - - - - - - - - - - - - - - - -
UUIDSTATUSHOSTTYPE
${slcExecution.uuid}${slcExecution.status}${slcExecution.host}${slcExecution.type}view
- -
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp deleted file mode 100644 index 360e98ef6..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp +++ /dev/null @@ -1,45 +0,0 @@ -
-

SLC Execution #${slcExecution.uuid}

- -

Details

- - - - - - - - - - - - - - - - - - - - - - - - - -
Host${slcExecution.host}
User${slcExecution.user}
Status${slcExecution.status}
Type${slcExecution.type}
Script${slcExecution.attributes['ant.file']}
- -

Execution Steps

- - -

${slcExecutionStep.begin} - - ${slcExecutionStep.uuid} (${slcExecutionStep.type})

- - - - - - -
${slcExecutionStepLogLine}
-
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp deleted file mode 100644 index 9c77b6e12..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp +++ /dev/null @@ -1,22 +0,0 @@ -
-

TestRun #${testRunDescriptor.testRunUuid}

- - - Related SLC Execution: ${testRunDescriptor.slcExecutionUuid} -
- - Related SLC Execution Step: ${testRunDescriptor.slcExecutionStepUuid} -
- - - Related Test Result: ${testRunDescriptor.testResultUuid} -
- - - - Related Deployed System: ${testRunDescriptor.deployedSytemId} -
- diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui-servlet.xml deleted file mode 100644 index 7ab8e40f8..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui-servlet.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui/resultList.jsp deleted file mode 100644 index 39b6d281f..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ui/resultList.jsp +++ /dev/null @@ -1,26 +0,0 @@ - -<%@ page language="java" contentType="text/xml"%> - -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - - - ${result.uuid} - ${result.uuid} - - - ${result.closeDate} - - - NOT CLOSED - - - org.argeo.slc.web.Applet - XSL - XML - Excel - Portable Document Format - - - \ No newline at end of file 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 deleted file mode 100644 index a334e911c..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf deleted file mode 100644 index 691287b6e..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp deleted file mode 100644 index 71e66e2b9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp +++ /dev/null @@ -1,40 +0,0 @@ - - - diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf deleted file mode 100644 index 229119023..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf +++ /dev/null @@ -1,16 +0,0 @@ - -<%@ page language="java" contentType="text/html"%> - -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - - - -SLC Web - - - - -<%@include file="common.jsp"%> diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml index d7105cf49..812a662f8 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml @@ -28,28 +28,6 @@ /slcService/* - - - slc-web - org.springframework.web.servlet.DispatcherServlet - - - - slc-web - *.web - - - - - slc-ui - org.springframework.web.servlet.DispatcherServlet - - - - slc-ui - *.ui - - xslt @@ -87,15 +65,6 @@ org.springframework.web.context.ContextLoaderListener - - - /WEB-INF/slc-jsp/*.jsp - ISO-8859-1 - /WEB-INF/specific/prelude.jspf - /WEB-INF/specific/coda.jspf - - - jdbc/mainDs @@ -152,12 +121,6 @@ - - - QueueBrowseServlet - org.apache.activemq.web.QueueBrowseServlet - - AjaxServlet /amq/* @@ -167,11 +130,6 @@ MessageServlet /amqMessage/* - - - QueueBrowseServlet - /amqQueueBrowse/* - session @@ -186,9 +144,4 @@ session /amqMessage/* - - session - /amqQueueBrowse/* - - diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml index 34ae15987..ddfd925ce 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml @@ -8,19 +8,19 @@ resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml" /> + class="org.argeo.slc.web.mvc.result.GetResultController"> + class="org.argeo.slc.web.mvc.result.GetResultController"> + class="org.argeo.slc.web.mvc.result.GetResultCollectionController"> diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java deleted file mode 100644 index 7d294d594..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.argeo.slc.web.mvc.admin; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -public class HomeController extends ParameterizableViewController { - @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { - ModelAndView modelAndView = new ModelAndView(); - return modelAndView; - } -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java deleted file mode 100644 index cd95fc9f7..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.argeo.slc.web.mvc.process; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.dao.process.SlcExecutionDao; -import org.argeo.slc.process.SlcExecution; - -public class SlcExecutionListController extends ParameterizableViewController { - private Log log = LogFactory.getLog(getClass()); - - private final SlcExecutionDao slcExecutionDao; - - public SlcExecutionListController(SlcExecutionDao slcExecutionDao) { - this.slcExecutionDao = slcExecutionDao; - } - - @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { - ModelAndView modelAndView = new ModelAndView(); - - List slcExecutions = slcExecutionDao.listSlcExecutions(); - modelAndView.addObject("slcExecutions", slcExecutions); - modelAndView.setViewName(getViewName()); - return modelAndView; - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java deleted file mode 100644 index fd947d9c1..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.argeo.slc.web.mvc.process; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.SlcException; -import org.argeo.slc.dao.process.SlcExecutionDao; -import org.argeo.slc.process.SlcExecution; -import org.argeo.slc.process.SlcExecutionStep; - -public class SlcExecutionViewController extends ParameterizableViewController { - private Log log = LogFactory.getLog(getClass()); - - private final SlcExecutionDao slcExecutionDao; - - public SlcExecutionViewController(SlcExecutionDao slcExecutionDao) { - this.slcExecutionDao = slcExecutionDao; - } - - @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { - ModelAndView modelAndView = new ModelAndView(); - - // List slcExecutions = - // slcExecutionDao.listSlcExecutions(); - String uuid = request.getParameter("uuid"); - if (uuid == null) - throw new SlcException("Parameter uuid required."); - - SlcExecution slcExecution = slcExecutionDao.getSlcExecution(uuid); - - if (slcExecution == null) - throw new SlcException("Could not find slc execution with uuid " - + uuid + "."); - - if (log.isDebugEnabled()) { - log.debug("SlcExecution " + slcExecution.getUuid()); - } - - List slcExecutionSteps = slcExecution.getSteps(); - - modelAndView.addObject("slcExecutionSteps", slcExecutionSteps); - modelAndView.addObject("slcExecution", slcExecution); - modelAndView.setViewName(getViewName()); - return modelAndView; - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java similarity index 57% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java index 52950fdae..f6cf3df56 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java @@ -5,30 +5,27 @@ import javax.servlet.http.HttpServletResponse; import org.argeo.slc.core.test.tree.TreeTestResultCollection; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; +import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; -public class ResultCollectionViewController extends - ParameterizableViewController { +public class GetResultCollectionController extends AbstractServiceController { private final TreeTestResultCollectionDao testResultCollectionDao; - public ResultCollectionViewController( + public GetResultCollectionController( TreeTestResultCollectionDao testResultCollectionDao) { this.testResultCollectionDao = testResultCollectionDao; } @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { + protected void handleServiceRequest(HttpServletRequest request, + HttpServletResponse response, ModelAndView modelAndView) + throws Exception { - String id = request.getParameter("id"); + String id = request.getParameter("collectionId"); TreeTestResultCollection resultCollection = testResultCollectionDao .getTestResultCollection(id); - ModelAndView modelAndView = new ModelAndView(); modelAndView.addObject("resultCollection", resultCollection); - modelAndView.setViewName(getViewName()); - return modelAndView; } } diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java index 5083719f8..ac3a0d2a9 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java @@ -27,7 +27,7 @@ public class ResultExcelView extends AbstractJExcelView { WritableSheet sheet = workbook.getSheet("SLC"); TreeTestResult ttr = (TreeTestResult) model - .get(ResultViewController.MODELKEY_RESULT); + .get(GetResultController.MODELKEY_RESULT); sheet.addCell(new Label(0, 0, "Result " + ttr.getUuid())); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultInterceptor.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultInterceptor.java deleted file mode 100644 index 51484133f..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultInterceptor.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.argeo.slc.web.mvc.result; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; - -import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; - -public class ResultInterceptor extends HandlerInterceptorAdapter { - private final TreeTestResultCollectionDao testResultCollectionDao; - - public ResultInterceptor(TreeTestResultCollectionDao testResultCollectionDao) { - this.testResultCollectionDao = testResultCollectionDao; - } - - @Override - public void postHandle(HttpServletRequest request, - HttpServletResponse response, Object handler, - ModelAndView modelAndView) throws Exception { - request.setAttribute("resultCollections", testResultCollectionDao - .listCollections()); - super.postHandle(request, response, handler, modelAndView); - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java deleted file mode 100644 index c522642e5..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultListController.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.argeo.slc.web.mvc.result; - -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; - -public class ResultListController extends ParameterizableViewController { - private final TreeTestResultDao testResultDao; - - public ResultListController(TreeTestResultDao testResultDao) { - this.testResultDao = testResultDao; - } - - @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { - - ModelAndView modelAndView = new ModelAndView(); - - SortedSet results = new TreeSet(); - results.addAll(testResultDao.listTestResults()); - modelAndView.addObject("results", results); - modelAndView.setViewName(getViewName()); - return modelAndView; - } -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java index debe797c2..1c4ea5124 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java @@ -27,7 +27,7 @@ public class ResultPdfView extends AbstractPdfView { PdfWriter writer, HttpServletRequest request, HttpServletResponse response) throws Exception { TreeTestResult ttr = (TreeTestResult) model - .get(ResultViewController.MODELKEY_RESULT); + .get(GetResultController.MODELKEY_RESULT); document.addTitle("Result " + ttr.getUuid()); document.add(new Paragraph("Result " + ttr.getUuid())); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java deleted file mode 100644 index 2c6d19240..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.argeo.slc.web.mvc.result; - -import java.util.SortedMap; -import java.util.TreeMap; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.test.tree.PartSubList; -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.structure.StructureElement; -import org.argeo.slc.test.TestResultPart; -import org.argeo.slc.test.TestStatus; - -public class ResultViewController extends ParameterizableViewController { - public final static String MODELKEY_RESULT = "result"; - - private final TreeTestResultDao testResultDao; - - public ResultViewController(TreeTestResultDao testResultDao) { - this.testResultDao = testResultDao; - } - - @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { - - String uuid = request.getParameter("uuid"); - TreeTestResult result = testResultDao.getTestResult(uuid); - - SortedMap toc = generateToc(result); - - SortedMap describedPaths = new TreeMap(); - for (TreeSPath path : toc.keySet()) { - describedPaths.put(path, describedPath(path, result)); - } - - SortedMap anchors = new TreeMap(); - for (TreeSPath path : toc.keySet()) { - anchors.put(path, anchor(path)); - } - - ModelAndView modelAndView = new ModelAndView(); - - modelAndView.addObject(MODELKEY_RESULT, result); - modelAndView.addObject("toc", toc); - modelAndView.addObject("describedPaths", describedPaths); - modelAndView.addObject("anchors", anchors); - modelAndView.setViewName(getViewName()); - return modelAndView; - } - - private SortedMap generateToc(TreeTestResult result) { - SortedMap toc = new TreeMap(); - for (TreeSPath path : result.getResultParts().keySet()) { - PartSubList subList = (PartSubList) result.getResultParts().get( - path); - boolean isFailed = false; - for (TestResultPart part : subList.getParts()) { - if (!part.getStatus().equals(TestStatus.PASSED)) { - isFailed = true; - break; - } - } - fillToc(toc, path, isFailed); - } - return toc; - } - - private void fillToc(SortedMap toc, TreeSPath path, - boolean isFailed) { - if (isFailed) { - toc.put(path, "failed"); - } else { - if (!toc.containsKey(path)) { - toc.put(path, "passed"); - } - } - - if (path.getParent() != null) { - fillToc(toc, path.getParent(), isFailed); - } - } - - private static String anchor(TreeSPath path) { - return path.getAsUniqueString().replace(path.getSeparator(), '_'); - } - - private static String describedPath(TreeSPath path, TreeTestResult ttr) { - StringBuffer buf = new StringBuffer(""); - // TODO :optimize with hierarchy - describedPath(path, buf, ttr); - return buf.toString(); - } - - private static void describedPath(TreeSPath path, StringBuffer buf, - TreeTestResult ttr) { - if (path.getParent() != null) { - describedPath(path.getParent(), buf, ttr); - } - String description = path.getName(); - StructureElement element = ttr.getElements().get(path); - if (element != null) { - description = element.getLabel(); - } - buf.append('/').append(description); - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-doc-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-doc-servlet.xml index 18e5f6f5d..9b58275c0 100644 --- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-doc-servlet.xml +++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-doc-servlet.xml @@ -1,28 +1,22 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> - + - + - + - + - + - - diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ui-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ui-servlet.xml deleted file mode 100644 index 43766210e..000000000 --- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ui-servlet.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - org.springframework.web.servlet.view.JstlView - - - WEB-INF/slc-ui/ - - - .jsp - - - - - \ No newline at end of file diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml deleted file mode 100644 index 06d7cebf4..000000000 --- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.springframework.web.servlet.view.JstlView - - - WEB-INF/slc-jsp/ - - - .jsp - - - - - \ No newline at end of file diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml index 35afb02f6..b08521809 100644 --- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml +++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml @@ -1,12 +1,9 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> - + @@ -18,10 +15,10 @@ - + - org.argeo.slc.web.mvc.XsltMarshallerView + org.argeo.slc.web.mvc.XsltMarshallerView + WEB-INF/xslt/ -- 2.39.2