From 4262cb85637c48319fc914ae5f251b44d4791f86 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 15 Jul 2010 14:40:24 +0000
Subject: [PATCH] finish cleaning of controllers : -> annotations -> get rid of
 old unused controllers -> remove unused packages

git-svn-id: https://svn.argeo.org/slc/trunk@3709 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.slc.demo.log4j/log4j.properties | 10 +++-
 .../META-INF/MANIFEST.MF                      |  1 -
 .../WEB-INF/doc-servlet.xml                   | 37 +++++++-----
 .../org.argeo.slc.webapp.war/WEB-INF/web.xml  | 25 +++-----
 .../WEB-INF/xslt-servlet.xml                  | 46 ---------------
 .../WEB-INF/xslt/resultXmlView.xsl            | 10 ++++
 .../WEB-INF/xslt/resultXsltView.xsl           | 51 ++++++++++++++++
 .../web/mvc/{result => }/ResultExcelView.java |  2 +-
 .../web/mvc/{result => }/ResultPdfView.java   |  7 ++-
 .../RenderingResultController.java            | 58 ++++++++++---------
 .../result/GetResultCollectionController.java | 47 ---------------
 .../web/mvc/result/GetResultController.java   | 50 ----------------
 .../ResultCollectionReferencesController.java | 52 -----------------
 .../web/mvc/result/TestRunViewController.java | 49 ----------------
 14 files changed, 137 insertions(+), 308 deletions(-)
 delete mode 100644 modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
 create mode 100644 modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXmlView.xsl
 create mode 100644 modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXsltView.xsl
 rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/{result => }/ResultExcelView.java (98%)
 rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/{result => }/ResultPdfView.java (93%)
 delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java
 delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultController.java
 delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionReferencesController.java
 delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java

diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index fc0e6be9b..6b7f307ef 100644
--- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -2,28 +2,33 @@ log4j.rootLogger=WARN, console
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.service=TRACE
 log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
 log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
 log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
 log4j.logger.org.argeo.security.mvc.ArgeoRememberMeServices=WARN
+log4j.logger.org.argeo.server.mvc=TRACE
 
 log4j.logger.org.argeo.slc.jms.JmsAgentProxy=TRACE
 #log4j.logger.org.argeo.slc.jms.JmsAgent=TRACE
 #log4j.logger.org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor=TRACE
 
-#log4j.logger.org.argeo.slc.web.mvc=TRACE
+log4j.logger.org.argeo.slc.web.mvc=TRACE
 #log4j.logger.org.argeo.slc.jms=TRACE
 #log4j.logger.org.argeo.server.json=TRACE
 
+log4j.logger.org.hibernate=WARN
 #log4j.logger.org.hibernate.SQL=DEBUG
 #log4j.logger.org.hibernate.tool.hbm2ddl=DEBUG
 
+
 log4j.logger.org.springframework=WARN
 #log4j.logger.org.springframework.web=DEBUG
 #log4j.logger.org.springframework.jms=WARN
 #log4j.logger.org.springframework.security=DEBUG
 #log4j.logger.org.springframework.ldap=TRACE
 #log4j.logger.org.springframework.osgi.web=TRACE
+log4j.logger.org.springframework.osgi.web.tomcat=INFO
 
 log4j.logger.org.apache.activemq=WARN
 log4j.logger.org.apache.activemq.transport=WARN
@@ -33,7 +38,6 @@ log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
 log4j.logger.org.apache.tomcat=INFO
-log4j.logger.org.springframework.osgi.web.tomcat=INFO
 
 log4j.logger.org.apache.directory.server=INFO
 log4j.logger.org.apache.directory.server.core.partition=ERROR
@@ -48,4 +52,4 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender
 
 # console uses PatternLayout.
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index 396c89871..d5b0eb9a9 100644
--- a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -29,7 +29,6 @@ Import-Package: javax.jcr;specification-version="1.0.0",
  org.argeo.slc.web.mvc,
  org.argeo.slc.web.mvc.controllers,
  org.argeo.slc.web.mvc.provisioning,
- org.argeo.slc.web.mvc.result,
  org.hibernate.hql.ast;resolution:=optional,
  org.hibernate.jdbc;resolution:=optional,
  org.springframework.aop,
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
index 5528640f3..dfba3ef3d 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
@@ -5,22 +5,35 @@
 
 
 	<bean class="org.argeo.slc.web.mvc.controllers.RenderingResultController">
-		<property name="testResultDao" ref="testResultDao" />
-		<property name="resultExcelView" ref="resultExcelView" />
-		<property name="resultPdfView" ref="resultPdfView" />
+		<property name="treeTestResultDao" ref="testResultDao" />
 	</bean>
 
+	<!--
+		Bean views for pdf & xls, resolved by the BeanNameViewResolver
+	-->
+	<bean name="resultExcelView" class="org.argeo.slc.web.mvc.ResultExcelView" />
+	<bean name="resultPdfView" class="org.argeo.slc.web.mvc.ResultPdfView" />
 
-	<bean name="resultExcelView" class="org.argeo.slc.web.mvc.result.ResultExcelView">
-	</bean>
-
-	<bean name="resultPdfView" class="org.argeo.slc.web.mvc.result.ResultPdfView">
-	</bean>
+	<bean class="org.springframework.web.servlet.view.BeanNameViewResolver" />
 
 	<!--
-		bean
-		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"
+		.xml & .xslt URI files doesn't have a bean : the
+		XsltMarshallerViewResolver handle the views
 	-->
+	<bean id="viewResolverXslt" class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">
+		<property name="viewClass">
+			<value>org.argeo.slc.web.mvc.XsltMarshallerView
+			</value>
+		</property>
+		<property name="prefix">
+			<value>WEB-INF/xslt/</value>
+		</property>
+		<property name="suffix">
+			<value>.xsl</value>
+		</property>
+		<property name="marshaller" ref="marshaller" />
+	</bean>
+
 	<bean id="handlerMapping"
 		class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
 		<property name="interceptors">
@@ -30,8 +43,4 @@
 		</property>
 	</bean>
 
-	<bean id="viewResolverXls"
-		class="org.springframework.web.servlet.view.BeanNameViewResolver">
-	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
index 8ffca90ac..e4341a78b 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -20,22 +20,7 @@
 		<url-pattern>*.service</url-pattern>
 	</servlet-mapping>
 
-	<!-- XSLT servlet -->
-	<servlet>
-		<servlet-name>xslt</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextClass</param-name>
-			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>xslt</servlet-name>
-		<url-pattern>*.xslt</url-pattern>
-	</servlet-mapping>
-
-	<!-- DOC servlet -->
+	<!-- DOC servlet : Rendering result view  -->
 	<servlet>
 		<servlet-name>doc</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
@@ -53,6 +38,14 @@
 		<servlet-name>doc</servlet-name>
 		<url-pattern>*.pdf</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.xslt</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.xml</url-pattern>
+	</servlet-mapping>
 
 	<!-- PROVISIONING servlet -->
 	<servlet>
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
deleted file mode 100644
index da4ad1919..000000000
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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 id="viewResolverXslt" class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">
-		<property name="viewClass">
-			<value>org.argeo.slc.web.mvc.XsltMarshallerView
-			</value>
-		</property>
-		<property name="prefix">
-			<value>WEB-INF/xslt/</value>
-		</property>
-		<property name="suffix">
-			<value>.xsl</value>
-		</property>
-		<property name="marshaller" ref="marshaller" />
-	</bean>
-
-
-	<bean name="/resultView.xslt" 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.GetResultController">
-		<constructor-arg ref="testResultDao" />
-		<property name="viewName" value="viewXml" />
-	</bean>
-
-	<bean name="/resultCollectionViewXml.xslt"
-		class="org.argeo.slc.web.mvc.result.GetResultCollectionController">
-		<constructor-arg ref="testResultCollectionDao" />
-		<property name="viewName" value="viewXml" />
-	</bean>
-
-	<bean
-		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-		<property name="interceptors">
-			<list>
-				<ref bean="osivInterceptor" />
-			</list>
-		</property>
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXmlView.xsl b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXmlView.xsl
new file mode 100644
index 000000000..87d63716f
--- /dev/null
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXmlView.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:slc="http://argeo.org/projects/slc/schemas"
+	exclude-result-prefixes="slc">
+
+	<xsl:template match="/">
+		<xsl:copy-of select="*"/>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXsltView.xsl b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXsltView.xsl
new file mode 100644
index 000000000..e9989bdbe
--- /dev/null
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXsltView.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:slc="http://argeo.org/projects/slc/schemas"
+	exclude-result-prefixes="slc">
+
+	<xsl:output method="html" omit-xml-declaration="yes" />
+	
+
+	<xsl:template match="/">
+		<html>
+			<head>
+				<title>Result</title>
+			</head>
+			<body style="font-family: sans-serif">
+				<h1>
+					Result
+					<xsl:value-of select="slc:tree-test-result/@uuid" />
+				</h1>
+				<xsl:for-each
+					select="slc:tree-test-result/slc:result-parts/slc:result-part">
+					<h2>
+						<xsl:value-of select="@path" />
+					</h2>
+					<table>
+						<xsl:for-each
+							select="slc:part-sub-list/slc:parts/slc:simple-result-part">
+							<tr>
+								<xsl:choose>
+									<xsl:when
+										test="slc:status = 'PASSED' ">
+										<td style="color:green">
+											<xsl:value-of
+												select="slc:message" />
+										</td>
+									</xsl:when>
+									<xsl:otherwise>
+										<td style="color:red">
+											<xsl:value-of
+												select="slc:message" />
+										</td>
+									</xsl:otherwise>
+								</xsl:choose>
+							</tr>
+						</xsl:for-each>
+					</table>
+				</xsl:for-each>
+			</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
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/ResultExcelView.java
similarity index 98%
rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java
rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/ResultExcelView.java
index b44107d37..0207962f2 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/ResultExcelView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.argeo.slc.web.mvc.result;
+package org.argeo.slc.web.mvc;
 
 import java.util.Map;
 
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/ResultPdfView.java
similarity index 93%
rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java
rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/ResultPdfView.java
index 6393e3bcf..c1a0ca1b9 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/ResultPdfView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.argeo.slc.web.mvc.result;
+package org.argeo.slc.web.mvc;
 
 import java.awt.Color;
 import java.util.Map;
@@ -22,6 +22,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.SlcTestUtils;
 import org.argeo.slc.core.test.tree.PartSubList;
@@ -37,6 +39,8 @@ import com.lowagie.text.Table;
 import com.lowagie.text.pdf.PdfWriter;
 
 public class ResultPdfView extends AbstractPdfView {
+	private static final Log log = LogFactory.getLog(ResultPdfView.class);
+
 	public final static String MODELKEY_RESULT = "result";
 
 	@Override
@@ -72,5 +76,4 @@ public class ResultPdfView extends AbstractPdfView {
 		}
 
 	}
-
 }
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/RenderingResultController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/RenderingResultController.java
index 0191e6ed7..307cf3167 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/RenderingResultController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/RenderingResultController.java
@@ -16,15 +16,17 @@
 
 package org.argeo.slc.web.mvc.controllers;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-import org.argeo.slc.web.mvc.result.ResultExcelView;
-import org.argeo.slc.web.mvc.result.ResultPdfView;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
 
 /**
  * Sends back the results, rendered or as collection.
@@ -32,41 +34,43 @@ import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 public class RenderingResultController {
+	private static final Log log = LogFactory
+			.getLog(RenderingResultController.class);
 
-	public final static String KEY_ANSWER = "__answer";
 	public final static String MODELKEY_RESULT = "result";
 
 	// IoC
-	private TreeTestResultDao testResultDao;
-	private ResultExcelView resultExcelView;
-	private ResultPdfView resultPdfView;
+	private TreeTestResultDao treeTestResultDao;
 
-	@RequestMapping("/resultView.pdf")
-	public void getPdfResultView(@RequestParam(value = "uuid") String uuid,
-			ModelAndView modelAndView) {
-		TreeTestResult result = testResultDao.getTestResult(uuid);
-		if (result == null)
-			throw new SlcException("No result found for uuid " + uuid);
-		modelAndView.getModelMap().addAttribute(MODELKEY_RESULT, result);
-		modelAndView.setView(resultPdfView);
-	}
+	@RequestMapping("/resultView.*")
+	public String getPdfResultView(@RequestParam("uuid") String uuid,
+			ModelMap model, HttpServletRequest request) {
 
-	@RequestMapping("/resultView.xls")
-	public void getXlsResultView(@RequestParam(value = "uuid") String uuid,
-			ModelAndView modelAndView) {
-		TreeTestResult result = testResultDao.getTestResult(uuid);
+		TreeTestResult result = treeTestResultDao.getTestResult(uuid);
 		if (result == null)
 			throw new SlcException("No result found for uuid " + uuid);
-		modelAndView.getModelMap().addAttribute(MODELKEY_RESULT, result);
-		modelAndView.setView(resultExcelView);
-	}
+		model.addAttribute(MODELKEY_RESULT, result);
 
-	public void setResultExcelView(ResultExcelView resultExcelView) {
-		this.resultExcelView = resultExcelView;
+		String docType = request.getRequestURI().substring(
+				request.getRequestURI().lastIndexOf(".") + 1);
+
+		if ("pdf".equals(docType))
+			return "resultPdfView";
+		if ("xls".equals(docType))
+			return "resultExcelView";
+		if ("xslt".equals(docType))
+			return "resultXsltView";
+		if ("xml".equals(docType))
+			return "resultXmlView";
+
+		throw new SlcException("No renderer found for files of extension "
+				+ docType);
 	}
 
-	public void setResultPdfView(ResultPdfView resultPdfView) {
-		this.resultPdfView = resultPdfView;
+	// IoC
+
+	public void setTreeTestResultDao(TreeTestResultDao treeTestResultDao) {
+		this.treeTestResultDao = treeTestResultDao;
 	}
 
 }
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java
deleted file mode 100644
index 8dc3c1771..000000000
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultCollectionController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.argeo.slc.web.mvc.result;
-
-import javax.servlet.http.HttpServletRequest;
-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;
-
-public class GetResultCollectionController extends AbstractServiceController {
-	private final TreeTestResultCollectionDao testResultCollectionDao;
-
-	public GetResultCollectionController(
-			TreeTestResultCollectionDao testResultCollectionDao) {
-		this.testResultCollectionDao = testResultCollectionDao;
-	}
-
-	@Override
-	protected void handleServiceRequest(HttpServletRequest request,
-			HttpServletResponse response, ModelAndView modelAndView)
-			throws Exception {
-
-		String id = request.getParameter("collectionId");
-
-		TreeTestResultCollection resultCollection = testResultCollectionDao
-				.getTestResultCollection(id);
-
-		modelAndView.addObject("resultCollection", resultCollection);
-	}
-}
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultController.java
deleted file mode 100644
index 03a9dd7ab..000000000
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/GetResultController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.argeo.slc.web.mvc.result;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.argeo.slc.SlcException;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-import org.argeo.slc.web.mvc.AbstractServiceController;
-import org.springframework.web.servlet.ModelAndView;
-
-/** Returns one single result. */
-public class GetResultController extends AbstractServiceController {
-	public final static String MODELKEY_RESULT = "result";
-
-	private final TreeTestResultDao testResultDao;
-
-	public GetResultController(TreeTestResultDao testResultDao) {
-		this.testResultDao = testResultDao;
-	}
-
-	@Override
-	protected void handleServiceRequest(HttpServletRequest request,
-			HttpServletResponse response, ModelAndView modelAndView)
-			throws Exception {
-
-		String uuid = request.getParameter("uuid");
-		TreeTestResult result = testResultDao.getTestResult(uuid);
-		if (result == null)
-			throw new SlcException("No result found for uuid " + uuid);
-		modelAndView.addObject(MODELKEY_RESULT, result);
-	}
-
-}
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionReferencesController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionReferencesController.java
deleted file mode 100644
index 73c2fb0bc..000000000
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionReferencesController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.argeo.slc.web.mvc.result;
-
-import java.util.SortedSet;
-
-import javax.servlet.http.HttpServletRequest;
-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.msg.ReferenceList;
-import org.argeo.slc.web.mvc.AbstractServiceController;
-import org.springframework.web.servlet.ModelAndView;
-
-public class ResultCollectionReferencesController extends
-		AbstractServiceController {
-	private final TreeTestResultCollectionDao testResultCollectionDao;
-
-	public ResultCollectionReferencesController(
-			TreeTestResultCollectionDao testResultCollectionDao) {
-		this.testResultCollectionDao = testResultCollectionDao;
-	}
-
-	protected void handleServiceRequest(HttpServletRequest request,
-			HttpServletResponse response, ModelAndView modelAndView)
-			throws Exception {
-		SortedSet<TreeTestResultCollection> results = testResultCollectionDao
-				.listCollections();
-
-		ReferenceList referenceList = new ReferenceList();
-		for (TreeTestResultCollection collection : results) {
-			referenceList.getReferences().add(collection.getId());
-		}
-
-		modelAndView.addObject("referenceList", referenceList);
-	}
-}
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java
deleted file mode 100644
index 234460d96..000000000
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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.mvc.ParameterizableViewController;
-
-import org.argeo.slc.dao.test.TestRunDescriptorDao;
-import org.argeo.slc.test.TestRunDescriptor;
-
-public class TestRunViewController extends ParameterizableViewController {
-	private final TestRunDescriptorDao testRunDescriptorDao;
-
-	public TestRunViewController(TestRunDescriptorDao testRunDescriptorDao) {
-		this.testRunDescriptorDao = testRunDescriptorDao;
-	}
-
-	@Override
-	protected ModelAndView handleRequestInternal(HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-
-		String uuid = request.getParameter("uuid");
-		TestRunDescriptor testRunDescriptor = testRunDescriptorDao
-				.getTestRunDescriptor(uuid);
-
-		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("testRunDescriptor", testRunDescriptor);
-		modelAndView.setViewName(getViewName());
-		return modelAndView;
-	}
-
-}
-- 
2.39.2