--- /dev/null
+</body>
+</html>
\ No newline at end of file
+++ /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
-</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
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<div id="main">\r
-<h1>SLC Home</h1>\r
-\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"%>
+++ /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\r
- href="resultCollectionView.web?id=${resultCollection.id}">view</a></td>\r
- </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">\r
-<h1>Results</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="${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 style="padding-right: 5px"><a href="resultView.web?uuid=${result.uuid}">view</a></td>\r
- <td><a href="resultView.xslt?uuid=${result.uuid}">xsl</a></td>\r
- </tr>\r
- </c:forEach>\r
-</table>\r
-\r
-</div>\r
+++ /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' : 'failed'}">\r
- ${part.message}</td>\r
- <c:if test="${part.testRunUuid!=null}">\r
- <td>\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="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="slc-jsp/common.jsp"%>
--- /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="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
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<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\r
+ href="resultCollectionView.web?id=${resultCollection.id}">view</a></td>\r
+ </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">\r
+<h1>Results</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="${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 style="padding-right: 5px"><a href="resultView.web?uuid=${result.uuid}">view</a></td>\r
+ <td><a href="resultView.xslt?uuid=${result.uuid}">xsl</a></td>\r
+ </tr>\r
+ </c:forEach>\r
+</table>\r
+\r
+</div>\r
--- /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' : 'failed'}">\r
+ ${part.message}</td>\r
+ <c:if test="${part.testRunUuid!=null}">\r
+ <td>\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
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
xmlns:aop="http://www.springframework.org/schema/aop"\r
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"\r
- default-lazy-init="true">\r
-\r
- <bean name="/home.web"\r
- class="org.argeo.slc.web.mvc.admin.HomeController">\r
- <property name="viewName" value="home.jsp" />\r
- </bean>\r
-\r
- <bean name="/slcExecutionList.web"\r
- class="org.argeo.slc.web.mvc.process.SlcExecutionListController">\r
- <constructor-arg ref="slcExecutionDao" />\r
- <property name="viewName" value="slcExecutionList" />\r
- </bean>\r
-\r
- <bean name="/slcExecutionView.web"\r
- class="org.argeo.slc.web.mvc.process.SlcExecutionViewController">\r
- <constructor-arg ref="slcExecutionDao" />\r
- <property name="viewName" value="slcExecutionView" />\r
- </bean>\r
-\r
- <bean name="/resultList.web"\r
- class="org.argeo.slc.web.mvc.result.ResultListController">\r
- <constructor-arg ref="testResultDao" />\r
- <property name="viewName" value="resultList" />\r
- </bean>\r
-\r
- <bean name="/resultView.web"\r
- class="org.argeo.slc.web.mvc.result.ResultViewController">\r
- <constructor-arg ref="testResultDao" />\r
- <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
- <property name="viewName" value="testRunView" />\r
- </bean>\r
-\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
- class="org.springframework.web.servlet.view.InternalResourceViewResolver">\r
- <property name="viewClass">\r
- <value>org.springframework.web.servlet.view.JstlView</value>\r
- </property>\r
- <property name="prefix">\r
- <value>WEB-INF/jsp/</value>\r
- </property>\r
- <property name="suffix">\r
- <value>.jsp</value>\r
- </property>\r
- </bean>\r
-\r
-\r
+ default-lazy-init="true">
+
+ <import resource="classpath:/org/argeo/slc/server/spring/slc-web-servlet.xml"/>\r
</beans>
\ No newline at end of file
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
default-lazy-init="true">\r
\r
- <import\r
- resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
- <import\r
- resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />\r
-\r
- <bean name="slcExecutionRequestEp"\r
- class="org.argeo.slc.ws.process.SlcExecutionRequestEp">\r
- <constructor-arg ref="slcExecutionDao" />\r
- <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
- <property name="unmarshaller"\r
- ref="slcDefault.castor.marshaller" />\r
- </bean>\r
-\r
- <bean name="slcExecutionStepsRequestEp"\r
- class="org.argeo.slc.ws.process.SlcExecutionStepsRequestEp">\r
- <constructor-arg ref="slcExecutionDao" />\r
- <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
- <property name="unmarshaller"\r
- ref="slcDefault.castor.marshaller" />\r
- </bean>\r
-\r
- <bean name="createTreeTestResultRequestEp"\r
- class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">\r
- <constructor-arg ref="testResultDao" />\r
- <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
- <property name="unmarshaller"\r
- ref="slcDefault.castor.marshaller" />\r
- </bean>\r
-\r
- <bean name="closeTreeTestResultRequestEp"\r
- class="org.argeo.slc.ws.test.tree.CloseTreeTestResultRequestEp">\r
- <constructor-arg ref="testResultDao" />\r
- <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
- <property name="unmarshaller"\r
- ref="slcDefault.castor.marshaller" />\r
- </bean>\r
-\r
- <bean name="resultPartRequestEp"\r
- class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
- <constructor-arg ref="testResultDao" />\r
- <constructor-arg ref="testManagerService" />\r
- <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
- <property name="unmarshaller"\r
- ref="slcDefault.castor.marshaller" />\r
- </bean>\r
-\r
- <bean id="endPointMapping"\r
- class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">\r
- <property name="mappings">\r
-\r
- <props>\r
- <prop\r
- key="{http://argeo.org/projects/slc/schemas}slc-execution-request">\r
- slcExecutionRequestEp\r
- </prop>\r
- <prop\r
- key="{http://argeo.org/projects/slc/schemas}slc-execution-status-request">\r
- slcExecutionRequestEp\r
- </prop>\r
- <prop\r
- key="{http://argeo.org/projects/slc/schemas}slc-execution-steps-request">\r
- slcExecutionStepsRequestEp\r
- </prop>\r
- <prop\r
- key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">\r
- createTreeTestResultRequestEp\r
- </prop>\r
- <prop\r
- key="{http://argeo.org/projects/slc/schemas}close-tree-test-result-request">\r
- closeTreeTestResultRequestEp\r
- </prop>\r
- <prop\r
- key="{http://argeo.org/projects/slc/schemas}result-part-request">\r
- resultPartRequestEp\r
- </prop>\r
- </props>\r
- </property>\r
-\r
- <property name="interceptors">\r
- <bean\r
- class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor" />\r
- </property>\r
- </bean>\r
-\r
- <bean id="slcDefinition"\r
- class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">\r
- <property name="schema" ref="slcDefault.xml.xsdSchema" />\r
- <property name="portTypeName" value="Slc" />\r
- <property name="locationUri"\r
- value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />\r
- <property name="targetNamespace"\r
- value="http://argeo.org/projects/slc/definitions" />\r
- <property name="requestSuffix" value="-request" />\r
- </bean>\r
-\r
- <bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />\r
+ <import resource="classpath:/org/argeo/slc/server/spring/slc-ws-servlet.xml"/>
</beans>
\ No newline at end of file
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"\r
default-lazy-init="true">\r
\r
- <import\r
- resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
-\r
- <bean name="/resultView.xslt"\r
- class="org.argeo.slc.web.mvc.result.ResultViewController">\r
- <constructor-arg ref="testResultDao" />\r
- <property name="viewName" value="resultView" />\r
- </bean>\r
-\r
- <bean\r
- class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r
- </bean>\r
-\r
-\r
- <bean id="viewResolverXslt"\r
- class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">\r
- <property name="viewClass">\r
- <value>org.argeo.slc.web.mvc.XsltMarshallerView</value>\r
- </property>\r
- <property name="prefix">\r
- <value>WEB-INF/xslt/</value>\r
- </property>\r
- <property name="suffix">\r
- <value>.xsl</value>\r
- </property>\r
- <property name="marshaller" ref="slcDefault.castor.marshaller"/>\r
- </bean>\r
-\r
-\r
+ <import resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml"/>
</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>\r
+<xsl:stylesheet version="1.0"\r
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
+ xmlns:slc="http://argeo.org/projects/slc/schemas"\r
+ exclude-result-prefixes="slc">\r
+\r
+ <xsl:output method="html" omit-xml-declaration="yes" />\r
+\r
+ <xsl:template match="/">\r
+ <html>\r
+ <head>\r
+ <title>Result</title>\r
+ </head>\r
+ <body style="font-family: sans-serif">\r
+ <h1>\r
+ Result\r
+ <xsl:value-of select="slc:tree-test-result/@uuid" />\r
+ </h1>\r
+ <xsl:for-each\r
+ select="slc:tree-test-result/slc:result-parts/slc:result-part">\r
+ <h2>\r
+ <xsl:value-of select="@path" />\r
+ </h2>\r
+ <table>\r
+ <xsl:for-each\r
+ select="slc:part-sub-list/slc:parts/slc:simple-result-part">\r
+ <tr>\r
+ <xsl:choose>\r
+ <xsl:when\r
+ test="slc:status = 'PASSED' ">\r
+ <td style="color:green">\r
+ <xsl:value-of\r
+ select="slc:message" />\r
+ </td>\r
+ </xsl:when>\r
+ <xsl:otherwise>\r
+ <td style="color:red">\r
+ <xsl:value-of\r
+ select="slc:message" />\r
+ </td>\r
+ </xsl:otherwise>\r
+ </xsl:choose>\r
+ </tr>\r
+ </xsl:for-each>\r
+ </table>\r
+ </xsl:for-each>\r
+ </body>\r
+ </html>\r
+ </xsl:template>\r
+</xsl:stylesheet>
\ No newline at end of file
<jsp-property-group>
<url-pattern>*.jsp</url-pattern>
<page-encoding>ISO-8859-1</page-encoding>
- <include-prelude>/WEB-INF/jsp/prelude.jspf</include-prelude>
- <include-coda>/WEB-INF/jsp/coda.jspf</include-coda>
+ <include-prelude>/WEB-INF/prelude.jspf</include-prelude>
+ <include-coda>/WEB-INF/coda.jspf</include-coda>
</jsp-property-group>
</jsp-config>
</web-app>
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>\r
-<xsl:stylesheet version="1.0"\r
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
- xmlns:slc="http://argeo.org/projects/slc/schemas"\r
- exclude-result-prefixes="slc">\r
-\r
- <xsl:output method="html" omit-xml-declaration="yes" />\r
-\r
- <xsl:template match="/">\r
- <html>\r
- <head>\r
- <title>Result</title>\r
- </head>\r
- <body style="font-family: sans-serif">\r
- <h1>\r
- Result\r
- <xsl:value-of select="slc:tree-test-result/@uuid" />\r
- </h1>\r
- <xsl:for-each\r
- select="slc:tree-test-result/slc:result-parts/slc:result-part">\r
- <h2>\r
- <xsl:value-of select="@path" />\r
- </h2>\r
- <table>\r
- <xsl:for-each\r
- select="slc:part-sub-list/slc:parts/slc:simple-result-part">\r
- <tr>\r
- <xsl:choose>\r
- <xsl:when\r
- test="slc:status = 'PASSED' ">\r
- <td style="color:green">\r
- <xsl:value-of\r
- select="slc:message" />\r
- </td>\r
- </xsl:when>\r
- <xsl:otherwise>\r
- <td style="color:red">\r
- <xsl:value-of\r
- select="slc:message" />\r
- </td>\r
- </xsl:otherwise>\r
- </xsl:choose>\r
- </tr>\r
- </xsl:for-each>\r
- </table>\r
- </xsl:for-each>\r
- </body>\r
- </html>\r
- </xsl:template>\r
-</xsl:stylesheet>
\ No newline at end of file
projects / gpl / argeo-slc.git / commitdiff