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 ae5bfea03cc5e5e4081b14a8b2d9593da3fb07d4..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
@@ -3,24 +3,39 @@
        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 name="/resultView.xls" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="resultExcelView" />
-       </bean>
-
-       <bean name="resultExcelView" class="org.argeo.slc.web.mvc.result.ResultExcelView">
-       </bean>
 
-       <bean name="/resultView.pdf" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="resultPdfView" />
+       <bean class="org.argeo.slc.web.mvc.controllers.RenderingResultController">
+               <property name="treeTestResultDao" ref="testResultDao" />
        </bean>
 
-       <bean name="resultPdfView" class="org.argeo.slc.web.mvc.result.ResultPdfView">
+       <!--
+               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 class="org.springframework.web.servlet.view.BeanNameViewResolver" />
+
+       <!--
+               .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
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
+               class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
                <property name="interceptors">
                        <list>
                                <ref bean="osivInterceptor" />
@@ -28,10 +43,4 @@
                </property>
        </bean>
 
-
-       <bean id="viewResolverXls"
-               class="org.springframework.web.servlet.view.BeanNameViewResolver">
-       </bean>
-
-
 </beans>
\ No newline at end of file