X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fserver%2Fspring%2Fslc-web-servlet.xml;h=63db273bd4a83c33320749dec96faecbf4a6bf6e;hb=4e448631b2b951187784070e6ad7bee87ea31e01;hp=27a40e1e48b9defb9daf60dc4d1152774f257115;hpb=a54af36199de94b66e445521a603b8cd6a114767;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
index 27a40e1e4..63db273bd 100644
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
@@ -1,95 +1,96 @@
-<?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">
-
-	<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" />
-			</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>
-
-
+<?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">
+
+	<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