Remove component scanning

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.webapp.war / WEB-INF / doc-servlet.xml

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 5528640f3095731538e0d2521c3e331522120954..0576d0ccf87207546f29afd54f0598cbd0109228 100644 (file)
--- 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