+++ /dev/null
-<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
+++ /dev/null
-<div id="main">\r
-<h1>SLC Home</h1>\r
-\r
-</div>\r
+++ /dev/null
-<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
+++ /dev/null
-<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
- href="resultCollectionView.web?id=${resultCollection.id}">view</a></td>
- <td><a
- href="resultCollectionViewXml.xslt?id=${resultCollection.id}">xml</a></td>
- </tr>\r
- </c:forEach>\r
-</table>\r
-\r
-</div>\r
+++ /dev/null
-<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
+++ /dev/null
-<div id="main">
-<h1>Results</h1>
-
-<table cellspacing="0">
- <thead>
- <tr>
- <th>Id</th>
- <th>Status</th>
- </tr>
- </thead>
- <c:forEach items="${results}" var="result">
- <tr>
- <td>${result.uuid}</td>
- <c:choose>
- <c:when test="${result.closeDate != null}">
- <td>${result.closeDate}</td>
- </c:when>
- <c:otherwise>
- <td>NOT CLOSED</td>
- </c:otherwise>
- </c:choose>
- <td style="padding-right: 5px"><a
- href="resultView.web?uuid=${result.uuid}">view</a></td>
- <td><a href="resultView.xslt?uuid=${result.uuid}">xsl</a></td>
- <td><a href="resultViewXml.xslt?uuid=${result.uuid}">xml</a></td>
- <td><a href="resultView.xls?uuid=${result.uuid}">xls</a></td>
- <td><a href="resultView.pdf?uuid=${result.uuid}">pdf</a></td>
- </tr>
- </c:forEach>
-</table>
-
-</div>
+++ /dev/null
-<div id="main">\r
-<h1>Result #${result.uuid}</h1>\r
-\r
-<jsp:useBean id="describedPaths" 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
- <tr>\r
- <td style="padding-left: ${tocEntry.key.depth}0px"\r
- class="${tocEntry.value}">${tocEntry.key.name }</td>\r
- </tr>\r
- </c:forEach>\r
-</table>\r
-\r
-<c:forEach items="${result.resultParts}" var="resultPartEntry">\r
- <jsp:useBean id="resultPartEntry" type="java.util.Map.Entry" />\r
-\r
- <h2><%=describedPaths.get(resultPartEntry.getKey())%></h2>\r
- <table>\r
- <c:forEach items="${result.elements[resultPartEntry.key].tags}" var="tagEntry">\r
- <tr>\r
- <td style="font-style: italic;font-size: 80%">${tagEntry.key}</td>\r
- <td style="font-size: 80%">${tagEntry.value}</td>\r
- </tr>\r
- </c:forEach>\r
- </table>\r
- <table>\r
- \r
- <c:forEach items="${resultPartEntry.value.parts}" var="part">\r
- <tr>\r
- <td class="${part.status == 0 ? 'passed' : (part.status == 1 ? 'failed': 'error')}" style="vertical-align:top">\r
- ${part.message}
- <c:if test="${part.status == 2}">
- <pre>${part.exceptionMessage}</pre>
- </c:if>
- </td>\r
- <c:if test="${part.testRunUuid!=null}">\r
- <td style="vertical-align:top">\r
- <a href="testRunView.web?uuid=${part.testRunUuid}">test run</a>\r
- </td>\r
- </c:if>\r
- </tr>\r
- </c:forEach>\r
- </table>\r
-\r
-</c:forEach></div>\r
+++ /dev/null
-<div id="main">\r
-<h1>SLC Execution List</h1>\r
-\r
-<table>\r
- <thead>\r
- <tr>\r
- <td>UUID</td>\r
- <td>STATUS</td>\r
- <td>HOST</td>\r
- <td>TYPE</td>\r
- </tr>\r
- </thead>\r
- <c:forEach items="${slcExecutions}" var="slcExecution">\r
- <tr>\r
- <td>${slcExecution.uuid}</td>\r
- <td>${slcExecution.status}</td>\r
- <td>${slcExecution.host}</td>\r
- <td>${slcExecution.type}</td>\r
- <td><a href="slcExecutionView.web?uuid=${slcExecution.uuid}">view</a></td>\r
- </tr>\r
- </c:forEach>\r
-</table>\r
-\r
-</div>\r
+++ /dev/null
-<div id="main">\r
-<h1>SLC Execution #${slcExecution.uuid}</h1>\r
-\r
-<h2>Details</h2>\r
-<table>\r
- <tr>\r
- <td>Host</td>\r
- <td>${slcExecution.host}</td>\r
- </tr>\r
- <tr>\r
- <td>User</td>\r
- <td>${slcExecution.user}</td>\r
- </tr>\r
- <tr>\r
- <td>Status</td>\r
- <td>${slcExecution.status}</td>\r
- </tr>\r
- <tr>\r
- <td>Type</td>\r
- <td>${slcExecution.type}</td>\r
- </tr>\r
- <c:choose>\r
- <c:when test="${slcExecution.type == 'org.argeo.slc.ant'}">\r
- <tr>\r
- <td>Script</td>\r
- <td>${slcExecution.attributes['ant.file']}</td>\r
- </tr>\r
- </c:when>\r
- </c:choose>\r
-</table>\r
-\r
-<h2>Execution Steps</h2>\r
-<c:forEach items="${slcExecutionSteps}" var="slcExecutionStep">\r
- <a name="step_${slcExecutionStep.uuid}"></a>\r
- <h3 class="executionStep">${slcExecutionStep.begin} -\r
- ${slcExecutionStep.uuid} (${slcExecutionStep.type})</h3>\r
- <table>\r
- <c:forEach items="${slcExecutionStep.logLines}"\r
- var="slcExecutionStepLogLine">\r
- <tr>\r
- <td colspan="3">${slcExecutionStepLogLine}</td>\r
- </tr>\r
- </c:forEach>\r
- </table>\r
-</c:forEach></div>\r
+++ /dev/null
-<div id="main">\r
-<h1>TestRun #${testRunDescriptor.testRunUuid}</h1>\r
-\r
-<c:if test="${testRunDescriptor.slcExecutionUuid !=null}">\r
- Related SLC Execution: <a\r
- href="slcExecutionView.web?uuid=${testRunDescriptor.slcExecutionUuid}">${testRunDescriptor.slcExecutionUuid}</a>\r
- <br />\r
- <c:if test="${testRunDescriptor.slcExecutionStepUuid !=null}">\r
- Related SLC Execution Step: <a\r
- href="slcExecutionView.web?uuid=${testRunDescriptor.slcExecutionUuid}#step_${testRunDescriptor.slcExecutionStepUuid}">${testRunDescriptor.slcExecutionStepUuid}</a>\r
- <br />\r
- </c:if>\r
-</c:if> <c:if test="${testRunDescriptor.testResultUuid !=null}">\r
- Related Test Result: <a\r
- href="resultView.web?uuid=${testRunDescriptor.testResultUuid}">${testRunDescriptor.testResultUuid}</a>\r
- <br />\r
-</c:if> \r
-\r
-<c:if test="${testRunDescriptor.deployedSytemId !=null}">\r
- Related Deployed System: ${testRunDescriptor.deployedSytemId}\r
- <br />\r
-</c:if>\r
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- 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">
-
- <import
- resource="classpath:/org/argeo/slc/server/spring/slc-ui-servlet.xml" />
-</beans>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/xml"%>
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<dataSet>
-<c:forEach items="${results}" var="result">
- <data>
- <param name="testName">${result.uuid}</param>
- <param name="uuid">${result.uuid}</param>
-<c:choose>
- <c:when test="${result.closeDate != null}">
- <param name="date">${result.closeDate}</param>
- </c:when>
- <c:otherwise>
- <param name="date">NOT CLOSED</param>
- </c:otherwise>
-</c:choose>
- <report type="applet">org.argeo.slc.web.Applet</report>
- <report type="download" commandid="xsl">XSL</report>
- <report type="download" commandid="xml">XML</report>
- <report type="download" commandid="xls">Excel</report>
- <report type="download" commandid="pdf">Portable Document Format</report>
- </data>
-</c:forEach>
-</dataSet>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- 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">
-
- <import
- resource="classpath:/org/argeo/slc/server/spring/slc-web-servlet.xml" />
-</beans>
\ No newline at end of file
+++ /dev/null
-</body>
-</html>
\ No newline at end of file
+++ /dev/null
-<div id="banner"><a href="home.web"><img\r
- src="images/SpartaBanner.gif" /></a></div>\r
-\r
-<div id="navigation">\r
-\r
-<table border="0" cellspacing="0">\r
- <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
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ 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"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html" />
-<title>SLC Web</title>
-<link href="style.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-
-<%@include file="common.jsp"%>
<url-pattern>/slcService/*</url-pattern>
</servlet-mapping>
- <!-- WEB servlet -->
- <servlet>
- <servlet-name>slc-web</servlet-name>
- <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>slc-web</servlet-name>
- <url-pattern>*.web</url-pattern>
- </servlet-mapping>
-
- <!-- UI servlet -->
- <servlet>
- <servlet-name>slc-ui</servlet-name>
- <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>slc-ui</servlet-name>
- <url-pattern>*.ui</url-pattern>
- </servlet-mapping>
-
<!-- XSLT servlet -->
<servlet>
<servlet-name>xslt</servlet-name>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
- <jsp-config>
- <jsp-property-group>
- <url-pattern>/WEB-INF/slc-jsp/*.jsp</url-pattern>
- <page-encoding>ISO-8859-1</page-encoding>
- <include-prelude>/WEB-INF/specific/prelude.jspf</include-prelude>
- <include-coda>/WEB-INF/specific/coda.jspf</include-coda>
- </jsp-property-group>
- </jsp-config>
-
<!-- Env refs -->
<resource-env-ref>
<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
</servlet>
- <!-- the queue browse servlet -->
- <servlet>
- <servlet-name>QueueBrowseServlet</servlet-name>
- <servlet-class>org.apache.activemq.web.QueueBrowseServlet</servlet-class>
- </servlet>
-
<servlet-mapping>
<servlet-name>AjaxServlet</servlet-name>
<url-pattern>/amq/*</url-pattern>
<servlet-name>MessageServlet</servlet-name>
<url-pattern>/amqMessage/*</url-pattern>
</servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>QueueBrowseServlet</servlet-name>
- <url-pattern>/amqQueueBrowse/*</url-pattern>
- </servlet-mapping>
<filter>
<filter-name>session</filter-name>
<filter-name>session</filter-name>
<url-pattern>/amqMessage/*</url-pattern>
</filter-mapping>
- <filter-mapping>
- <filter-name>session</filter-name>
- <url-pattern>/amqQueueBrowse/*</url-pattern>
- </filter-mapping>
-
</web-app>
resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml" />
<bean name="/resultView.xslt"
- class="org.argeo.slc.web.mvc.result.ResultViewController">
+ class="org.argeo.slc.web.mvc.result.GetResultController">
<constructor-arg ref="testResultDao" />
<property name="viewName" value="resultView" />
</bean>
<bean name="/resultViewXml.xslt"
- class="org.argeo.slc.web.mvc.result.ResultViewController">
+ class="org.argeo.slc.web.mvc.result.GetResultController">
<constructor-arg ref="testResultDao" />
<property name="viewName" value="viewXml" />
</bean>
<bean name="/resultCollectionViewXml.xslt"
- class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">
+ class="org.argeo.slc.web.mvc.result.GetResultCollectionController">
<constructor-arg ref="testResultCollectionDao" />
<property name="viewName" value="viewXml" />
</bean>
+++ /dev/null
-package org.argeo.slc.web.mvc.admin;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-public class HomeController extends ParameterizableViewController {\r
- @Override\r
- protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
- HttpServletResponse response) throws Exception {\r
- ModelAndView modelAndView = new ModelAndView();\r
- return modelAndView;\r
- }\r
-}\r
+++ /dev/null
-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.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-\r
-import org.argeo.slc.dao.process.SlcExecutionDao;\r
-import org.argeo.slc.process.SlcExecution;\r
-\r
-public class SlcExecutionListController extends ParameterizableViewController {\r
- private Log log = LogFactory.getLog(getClass());\r
-\r
- private final SlcExecutionDao slcExecutionDao;\r
-\r
- public SlcExecutionListController(SlcExecutionDao slcExecutionDao) {\r
- this.slcExecutionDao = slcExecutionDao;\r
- }\r
-\r
- @Override\r
- protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
- HttpServletResponse response) throws Exception {\r
- ModelAndView modelAndView = new ModelAndView();\r
-\r
- List<SlcExecution> slcExecutions = slcExecutionDao.listSlcExecutions();\r
- modelAndView.addObject("slcExecutions", slcExecutions);\r
- modelAndView.setViewName(getViewName());\r
- return modelAndView;\r
- }\r
-\r
-}\r
+++ /dev/null
-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.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-\r
-import org.argeo.slc.SlcException;\r
-import org.argeo.slc.dao.process.SlcExecutionDao;\r
-import org.argeo.slc.process.SlcExecution;\r
-import org.argeo.slc.process.SlcExecutionStep;\r
-\r
-public class SlcExecutionViewController extends ParameterizableViewController {\r
- private Log log = LogFactory.getLog(getClass());\r
-\r
- private final SlcExecutionDao slcExecutionDao;\r
-\r
- public SlcExecutionViewController(SlcExecutionDao slcExecutionDao) {\r
- this.slcExecutionDao = slcExecutionDao;\r
- }\r
-\r
- @Override\r
- protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
- HttpServletResponse response) throws Exception {\r
- ModelAndView modelAndView = new ModelAndView();\r
-\r
- // List<SlcExecution> slcExecutions =\r
- // slcExecutionDao.listSlcExecutions();\r
- String uuid = request.getParameter("uuid");\r
- if (uuid == null)\r
- throw new SlcException("Parameter uuid required.");\r
-\r
- SlcExecution slcExecution = slcExecutionDao.getSlcExecution(uuid);\r
-\r
- if (slcExecution == null)\r
- throw new SlcException("Could not find slc execution with uuid "\r
- + uuid + ".");\r
-\r
- if (log.isDebugEnabled()) {\r
- log.debug("SlcExecution " + slcExecution.getUuid());\r
- }\r
-\r
- List<SlcExecutionStep> slcExecutionSteps = slcExecution.getSteps();\r
-\r
- modelAndView.addObject("slcExecutionSteps", slcExecutionSteps);\r
- modelAndView.addObject("slcExecution", slcExecution);\r
- modelAndView.setViewName(getViewName());\r
- return modelAndView;\r
- }\r
-\r
-}\r
--- /dev/null
+package org.argeo.slc.web.mvc.result;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
+import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
+import org.argeo.slc.web.mvc.AbstractServiceController;\r
+import org.springframework.web.servlet.ModelAndView;\r
+\r
+public class GetResultCollectionController extends AbstractServiceController {\r
+ private final TreeTestResultCollectionDao testResultCollectionDao;\r
+\r
+ public GetResultCollectionController(\r
+ TreeTestResultCollectionDao testResultCollectionDao) {\r
+ this.testResultCollectionDao = testResultCollectionDao;\r
+ }\r
+\r
+ @Override\r
+ protected void handleServiceRequest(HttpServletRequest request,\r
+ HttpServletResponse response, ModelAndView modelAndView)\r
+ throws Exception {\r
+\r
+ String id = request.getParameter("collectionId");\r
+\r
+ TreeTestResultCollection resultCollection = testResultCollectionDao\r
+ .getTestResultCollection(id);\r
+\r
+ modelAndView.addObject("resultCollection", resultCollection);\r
+ }\r
+}\r
+++ /dev/null
-package org.argeo.slc.web.mvc.result;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
-import org.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-public class ResultCollectionViewController extends\r
- ParameterizableViewController {\r
- private final TreeTestResultCollectionDao testResultCollectionDao;\r
-\r
- public ResultCollectionViewController(\r
- TreeTestResultCollectionDao testResultCollectionDao) {\r
- this.testResultCollectionDao = testResultCollectionDao;\r
- }\r
-\r
- @Override\r
- protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
- HttpServletResponse response) throws Exception {\r
-\r
- String id = request.getParameter("id");\r
-\r
- TreeTestResultCollection resultCollection = testResultCollectionDao\r
- .getTestResultCollection(id);\r
-\r
- ModelAndView modelAndView = new ModelAndView();\r
- modelAndView.addObject("resultCollection", resultCollection);\r
- modelAndView.setViewName(getViewName());\r
- return modelAndView;\r
- }\r
-}\r
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()));
+++ /dev/null
-package org.argeo.slc.web.mvc.result;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;\r
-\r
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
-\r
-public class ResultInterceptor extends HandlerInterceptorAdapter {\r
- private final TreeTestResultCollectionDao testResultCollectionDao;\r
-\r
- public ResultInterceptor(TreeTestResultCollectionDao testResultCollectionDao) {\r
- this.testResultCollectionDao = testResultCollectionDao;\r
- }\r
-\r
- @Override\r
- public void postHandle(HttpServletRequest request,\r
- HttpServletResponse response, Object handler,\r
- ModelAndView modelAndView) throws Exception {\r
- request.setAttribute("resultCollections", testResultCollectionDao\r
- .listCollections());\r
- super.postHandle(request, response, handler, modelAndView);\r
- }\r
-\r
-}\r
+++ /dev/null
-package org.argeo.slc.web.mvc.result;\r
-\r
-import java.util.SortedSet;\r
-import java.util.TreeSet;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
-\r
-public class ResultListController extends ParameterizableViewController {\r
- private final TreeTestResultDao testResultDao;\r
-\r
- public ResultListController(TreeTestResultDao testResultDao) {\r
- this.testResultDao = testResultDao;\r
- }\r
-\r
- @Override\r
- protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
- HttpServletResponse response) throws Exception {\r
-\r
- ModelAndView modelAndView = new ModelAndView();\r
-\r
- SortedSet<TreeTestResult> results = new TreeSet<TreeTestResult>();\r
- results.addAll(testResultDao.listTestResults());\r
- modelAndView.addObject("results", results);\r
- modelAndView.setViewName(getViewName());\r
- return modelAndView;\r
- }\r
-}\r
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()));
+++ /dev/null
-package org.argeo.slc.web.mvc.result;\r
-\r
-import java.util.SortedMap;\r
-import java.util.TreeMap;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.test.tree.PartSubList;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
-import org.argeo.slc.structure.StructureElement;\r
-import org.argeo.slc.test.TestResultPart;\r
-import org.argeo.slc.test.TestStatus;\r
-\r
-public class ResultViewController extends ParameterizableViewController {\r
- public final static String MODELKEY_RESULT = "result";\r
-\r
- private final TreeTestResultDao testResultDao;\r
-\r
- public ResultViewController(TreeTestResultDao testResultDao) {\r
- this.testResultDao = testResultDao;\r
- }\r
-\r
- @Override\r
- protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
- HttpServletResponse response) throws Exception {\r
-\r
- String uuid = request.getParameter("uuid");\r
- TreeTestResult result = testResultDao.getTestResult(uuid);\r
-\r
- SortedMap<TreeSPath, String> toc = generateToc(result);\r
-\r
- SortedMap<TreeSPath, String> describedPaths = new TreeMap<TreeSPath, String>();\r
- for (TreeSPath path : toc.keySet()) {\r
- describedPaths.put(path, describedPath(path, result));\r
- }\r
-\r
- SortedMap<TreeSPath, String> anchors = new TreeMap<TreeSPath, String>();\r
- for (TreeSPath path : toc.keySet()) {\r
- anchors.put(path, anchor(path));\r
- }\r
-\r
- ModelAndView modelAndView = new ModelAndView();\r
-\r
- modelAndView.addObject(MODELKEY_RESULT, result);\r
- modelAndView.addObject("toc", toc);\r
- modelAndView.addObject("describedPaths", describedPaths);\r
- modelAndView.addObject("anchors", anchors);\r
- modelAndView.setViewName(getViewName());\r
- return modelAndView;\r
- }\r
-\r
- private SortedMap<TreeSPath, String> generateToc(TreeTestResult result) {\r
- SortedMap<TreeSPath, String> toc = new TreeMap<TreeSPath, String>();\r
- for (TreeSPath path : result.getResultParts().keySet()) {\r
- PartSubList subList = (PartSubList) result.getResultParts().get(\r
- path);\r
- boolean isFailed = false;\r
- for (TestResultPart part : subList.getParts()) {\r
- if (!part.getStatus().equals(TestStatus.PASSED)) {\r
- isFailed = true;\r
- break;\r
- }\r
- }\r
- fillToc(toc, path, isFailed);\r
- }\r
- return toc;\r
- }\r
-\r
- private void fillToc(SortedMap<TreeSPath, String> toc, TreeSPath path,\r
- boolean isFailed) {\r
- if (isFailed) {\r
- toc.put(path, "failed");\r
- } else {\r
- if (!toc.containsKey(path)) {\r
- toc.put(path, "passed");\r
- }\r
- }\r
-\r
- if (path.getParent() != null) {\r
- fillToc(toc, path.getParent(), isFailed);\r
- }\r
- }\r
-\r
- private static String anchor(TreeSPath path) {\r
- return path.getAsUniqueString().replace(path.getSeparator(), '_');\r
- }\r
-\r
- private static String describedPath(TreeSPath path, TreeTestResult ttr) {\r
- StringBuffer buf = new StringBuffer("");\r
- // TODO :optimize with hierarchy\r
- describedPath(path, buf, ttr);\r
- return buf.toString();\r
- }\r
-\r
- private static void describedPath(TreeSPath path, StringBuffer buf,\r
- TreeTestResult ttr) {\r
- if (path.getParent() != null) {\r
- describedPath(path.getParent(), buf, ttr);\r
- }\r
- String description = path.getName();\r
- StructureElement element = ttr.getElements().get(path);\r
- if (element != null) {\r
- description = element.getLabel();\r
- }\r
- buf.append('/').append(description);\r
- }\r
-\r
-}\r
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- 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"
- default-lazy-init="true">
+ 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">
- <bean name="/resultView.xls"
- class="org.argeo.slc.web.mvc.result.ResultViewController">
+ <bean name="/resultView.xls" class="org.argeo.slc.web.mvc.result.GetResultController">
<constructor-arg ref="testResultDao" />
<property name="viewName" value="resultExcelView" />
</bean>
- <bean name="resultExcelView"
- class="org.argeo.slc.web.mvc.result.ResultExcelView">
+ <bean name="resultExcelView" class="org.argeo.slc.web.mvc.result.ResultExcelView">
</bean>
- <bean name="/resultView.pdf"
- class="org.argeo.slc.web.mvc.result.ResultViewController">
+ <bean name="/resultView.pdf" class="org.argeo.slc.web.mvc.result.GetResultController">
<constructor-arg ref="testResultDao" />
<property name="viewName" value="resultPdfView" />
</bean>
- <bean name="resultPdfView"
- class="org.argeo.slc.web.mvc.result.ResultPdfView">
+ <bean name="resultPdfView" class="org.argeo.slc.web.mvc.result.ResultPdfView">
</bean>
<bean
<constructor-arg ref="slcAgentDescriptorDao" />
</bean>
- <bean name="/listSlcExecutions.service" class="org.argeo.slc.web.mvc.process.ListSlcExecutionsController">
+ <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">
- <constructor-arg ref="testResultDao" /> </bean> <bean
- name="/resultCollectionView.service"
- class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">
- <constructor-arg ref="testResultCollectionDao" /> </bean>
- -->
<bean id="handlerMapping"
class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
<property name="interceptors">
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- 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">
-
- <bean name="/resultList.ui"
- class="org.argeo.slc.web.mvc.result.ResultListController">
- <constructor-arg ref="testResultDao" />
- <property name="viewName" value="resultList" />
- </bean>
-
- <bean id="handlerMapping"
- class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
- <property name="interceptors">
- <list>
- <ref bean="resultInterceptor" />
- <ref bean="osivInterceptor" />
- </list>
- </property>
- </bean>
-
- <bean id="resultInterceptor"
- class="org.argeo.slc.web.mvc.result.ResultInterceptor">
- <constructor-arg ref="testResultCollectionDao" />
- </bean>
-
- <bean id="viewResolver"
- class="org.springframework.web.servlet.view.InternalResourceViewResolver">
- <property name="viewClass">
- <value>org.springframework.web.servlet.view.JstlView</value>
- </property>
- <property name="prefix">
- <value>WEB-INF/slc-ui/</value>
- </property>
- <property name="suffix">
- <value>.jsp</value>
- </property>
- </bean>
-
-
-</beans>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- 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">
-
- <bean name="/home.web"
- class="org.argeo.slc.web.mvc.admin.HomeController">
- <property name="viewName" value="home.jsp" />
- </bean>
-
- <bean name="/slcExecutionList.web"
- class="org.argeo.slc.web.mvc.process.SlcExecutionListController">
- <constructor-arg ref="slcExecutionDao" />
- <property name="viewName" value="slcExecutionList" />
- </bean>
-
- <bean name="/slcExecutionView.web"
- class="org.argeo.slc.web.mvc.process.SlcExecutionViewController">
- <constructor-arg ref="slcExecutionDao" />
- <property name="viewName" value="slcExecutionView" />
- </bean>
-
- <bean name="/resultList.web"
- class="org.argeo.slc.web.mvc.result.ResultListController">
- <constructor-arg ref="testResultDao" />
- <property name="viewName" value="resultList" />
- </bean>
-
- <bean name="/resultView.web"
- class="org.argeo.slc.web.mvc.result.ResultViewController">
- <constructor-arg ref="testResultDao" />
- <property name="viewName" value="resultView" />
- </bean>
-
- <bean name="/resultCollectionList.web"
- class="org.argeo.slc.web.mvc.result.ResultCollectionListController">
- <constructor-arg ref="testResultCollectionDao" />
- <property name="viewName" value="resultCollectionList" />
- </bean>
-
- <bean name="/resultCollectionView.web"
- class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">
- <constructor-arg ref="testResultCollectionDao" />
- <property name="viewName" value="resultCollectionView" />
- </bean>
-
- <bean name="/addResultToCollection.web"
- class="org.argeo.slc.web.mvc.result.AddResultToCollectionController">
- <constructor-arg ref="testManagerService" />
- <property name="viewName" value="addResultToCollectionS" />
- </bean>
-
- <bean name="/removeResultFromCollection.web"
- class="org.argeo.slc.web.mvc.result.RemoveResultFromCollectionController">
- <constructor-arg ref="testManagerService" />
- <property name="viewName" value="removeResultFromCollectionS" />
- </bean>
-
- <bean name="/testRunView.web"
- class="org.argeo.slc.web.mvc.result.TestRunViewController">
- <constructor-arg ref="testRunDescriptorDao" />
- <property name="viewName" value="testRunView" />
- </bean>
-
- <bean id="handlerMapping"
- class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
- <property name="interceptors">
- <list>
- <ref bean="resultInterceptor" />
- <ref bean="osivInterceptor" />
- </list>
- </property>
- </bean>
-
- <bean id="resultInterceptor"
- class="org.argeo.slc.web.mvc.result.ResultInterceptor">
- <constructor-arg ref="testResultCollectionDao" />
- </bean>
-
- <bean id="viewResolver"
- class="org.springframework.web.servlet.view.InternalResourceViewResolver">
- <property name="viewClass">
- <value>org.springframework.web.servlet.view.JstlView</value>
- </property>
- <property name="prefix">
- <value>WEB-INF/slc-jsp/</value>
- </property>
- <property name="suffix">
- <value>.jsp</value>
- </property>
- </bean>
-
-
-</beans>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- 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"
- default-lazy-init="true">
+ 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">
- <import
- resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
+ <import resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
<bean
class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
</bean>
- <bean id="viewResolverXslt"
- class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">
+ <bean id="viewResolverXslt" class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">
<property name="viewClass">
- <value>org.argeo.slc.web.mvc.XsltMarshallerView</value>
+ <value>org.argeo.slc.web.mvc.XsltMarshallerView
+ </value>
</property>
<property name="prefix">
<value>WEB-INF/xslt/</value>
projects / gpl / argeo-slc.git / commitdiff