X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fdoc-servlet.xml;h=0576d0ccf87207546f29afd54f0598cbd0109228;hb=96efcbec27e3313d13c244437f31418d8bb2d3b9;hp=5528640f3095731538e0d2521c3e331522120954;hpb=41a706c58c65015800bbc66a4f86f16195bb886f;p=gpl%2Fargeo-slc.git

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..0576d0ccf 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,23 +5,36 @@
 
 
 	<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="handlerMapping"
+	<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
 		class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
 		<property name="interceptors">
 			<list>
@@ -30,8 +43,4 @@
 		</property>
 	</bean>
 
-	<bean id="viewResolverXls"
-		class="org.springframework.web.servlet.view.BeanNameViewResolver">
-	</bean>
-
 </beans>
\ No newline at end of file