X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fslc-web-servlet.xml;h=95886aeb09ca24f93f75326e1a0623ac1f42ee41;hb=9c78770dc46f490d553e2e7d388166bacce67928;hp=6b5b425d62fbb3cef0c1c3dac5ee521d629ef0ba;hpb=38087bceeb3d6bd73fb6942c9d7bfd6a7d0abca5;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
index 6b5b425d6..95886aeb0 100644
--- 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
@@ -2,7 +2,7 @@
 <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.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"
+	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">
 
 	<bean name="/home.web"
@@ -16,9 +16,66 @@
 		<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" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="resultInterceptor"
+		class="org.argeo.slc.web.mvc.result.ResultInterceptor">
+		<constructor-arg ref="testResultCollectionDao" />
 	</bean>
 
 	<bean id="viewResolver"