some new comments in xml mapping files.

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

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
index 197ccb25ec1376871fb77fc111b62a400fab9bb8..73d854d7c96ba34d7ef3112d2b06e970dc537aef 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
@@ -7,12 +7,31 @@
                http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-       <context:component-scan
-               base-package="org.argeo.slc.web.mvc, org.argeo.slc.web.mvc.process" />
+       <!--<context:component-scan base-package="org.argeo.slc.web.mvc.controllers" />
+
+       --><!-- Server Handling -->
+       <bean class="org.argeo.slc.web.mvc.controllers.ServerController">
+               <property name="dynamicRuntime" ref="dynamicRuntime" />
+       </bean>
+
+       <!-- Agent Handling -->
+       <bean class="org.argeo.slc.web.mvc.controllers.AgentController">
+               <property name="slcAgentDescriptorDao" ref="slcAgentDescriptorDao" />
+       </bean>
+
+       <!--  Events  -->
+       <bean class="org.argeo.slc.web.mvc.controllers.EventController">
+               <property name="eventListenerRegister" ref="eventListenerRegister" />
+               <property name="eventListener" ref="eventListener" />
+       </bean>
+
+       <bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
+               scope="session">
+               <aop:scoped-proxy />
+       </bean>
 
        <!--  Execution  -->
-       <bean name="/*Execution*.service, /*Modules*.service"
-               class="org.argeo.slc.web.mvc.process.ExecutionServiceController">
+       <bean class="org.argeo.slc.web.mvc.controllers.ProcessController">
                <property name="agentFactory" ref="agentFactory" />
                <property name="slcExecutionDao" ref="slcExecutionDao" />
                <property name="slcExecutionService" ref="slcExecutionService" />
@@ -21,10 +40,12 @@
                <property name="attachmentsStorage" ref="attachmentsStorage" />
        </bean>
 
-       <!--  Events  -->
-       <bean name="/*Event*.service" class="org.argeo.slc.web.mvc.EventController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
-               <property name="eventListener" ref="eventListener" />
+       <!--  Results Handling -->
+       <bean class="org.argeo.slc.web.mvc.controllers.ResultController">
+               <property name="treeTestResultDao" ref="testResultDao" />
+               <property name="treeTestResultCollectionDao" ref="testResultCollectionDao" />
+               <property name="testManagerService" ref="testManagerService" />
+               <property name="attachmentsStorage" ref="attachmentsStorage" />
        </bean>
 
        <!-- Provisioning -->
@@ -33,32 +54,9 @@
                <property name="modularDistributions" ref="modularDistributions" />
        </bean>
 
-       <bean name="/installModule.service" class="org.argeo.slc.web.mvc.management.InstallModule">
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
-       </bean>
-
-       <bean name="/uninstallModule.service" class="org.argeo.slc.web.mvc.management.UninstallModule">
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
-       </bean>
-
-       <!--  All that remains -->
-       <bean name="/*.service" class="org.argeo.slc.web.mvc.ServiceController">
-               <constructor-arg ref="testResultDao" />
-               <constructor-arg ref="testResultCollectionDao" />
-               <constructor-arg ref="testManagerService" />
-               <constructor-arg ref="slcAgentDescriptorDao" />
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
-               <property name="attachmentsStorage" ref="attachmentsStorage" />
-       </bean>
-
-       <bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
-               scope="session">
-               <aop:scoped-proxy />
-       </bean>
-
        <!-- MVC -->
-       <bean id="handlerMapping"
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
+       <bean
+               class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
                <property name="interceptors">
                        <list>
                                <ref bean="osivInterceptor" />