Remove default agent logger

[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 42f0ec533b4471364e6ed99698a8ea7ad8322e99..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
@@ -1,89 +1,26 @@
 <?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"
+       xmlns:context="http://www.springframework.org/schema/context"
        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">
+               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
+               http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-       <bean name="/isServerReady.service" class="org.argeo.slc.web.mvc.management.IsServerReady">
-       </bean>
-
-       <bean name="/getResult.service" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-       </bean>
-
-       <bean name="/addResultToCollection.service"
-               class="org.argeo.slc.web.mvc.result.AddResultToCollectionController">
-               <constructor-arg ref="testManagerService" />
-       </bean>
-
-       <bean name="/removeResultFromCollection.service"
-               class="org.argeo.slc.web.mvc.result.RemoveResultFromCollectionController">
-               <constructor-arg ref="testResultCollectionDao" />
-               <constructor-arg ref="testManagerService" />
-       </bean>
-
-       <bean name="/listCollectionRefs.service"
-               class="org.argeo.slc.web.mvc.result.ResultCollectionReferencesController">
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
-
-       <bean name="/listResultAttributes.service"
-               class="org.argeo.slc.web.mvc.result.ListResultAttributesController">
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
+       <!--<context:component-scan base-package="org.argeo.slc.web.mvc.controllers" />
 
-       <bean name="/listResults.service" class="org.argeo.slc.web.mvc.result.ListResultsController">
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
-
-       <bean name="/copyCollectionToCollection.service"
-               class="org.argeo.slc.web.mvc.result.CopyCollectionToCollectionController">
-               <constructor-arg ref="testResultCollectionDao" />
-               <constructor-arg ref="testManagerService" />
-       </bean>
-
-       <bean name="/listAgents.service" class="org.argeo.slc.web.mvc.runtime.ListAgentsController">
-               <constructor-arg ref="slcAgentDescriptorDao" />
-       </bean>
-
-       <bean name="/cleanAgents.service" class="org.argeo.slc.web.mvc.runtime.CleanAgentsController">
-               <constructor-arg ref="slcAgentDescriptorDao" />
-       </bean>
-
-       <bean name="/listSlcExecutions.service"
-               class="org.argeo.slc.web.mvc.process.ListSlcExecutionsController">
-               <constructor-arg ref="slcExecutionDao" />
-       </bean>
-
-       <bean name="/newSlcExecution.service"
-               class="org.argeo.slc.web.mvc.process.NewSlcExecutionController">
-               <property name="agentFactory" ref="agentFactory" />
-               <property name="unmarshaller" ref="unmarshaller" />
-               <property name="slcExecutionService" ref="slcExecutionService" />
-       </bean>
-
-       <bean name="/getExecutionDescriptor.service" class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">
-               <property name="agentFactory" ref="agentFactory" />
-       </bean>
-
-       <bean name="/listModulesDescriptors.service"
-               class="org.argeo.slc.web.mvc.execution.ListModulesDescriptors">
-               <property name="agentFactory" ref="agentFactory" />
-       </bean>
-
-       <!-- Events -->
-       <bean name="/addEventListener.service"
-               class="org.argeo.slc.web.mvc.event.AddEventListenerController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
+       --><!-- Server Handling -->
+       <bean class="org.argeo.slc.web.mvc.controllers.ServerController">
+               <property name="dynamicRuntime" ref="dynamicRuntime" />
        </bean>
 
-       <bean name="/removeEventListener.service"
-               class="org.argeo.slc.web.mvc.event.RemoveEventListenerController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
+       <!-- Agent Handling -->
+       <bean class="org.argeo.slc.web.mvc.controllers.AgentController">
+               <property name="slcAgentDescriptorDao" ref="slcAgentDescriptorDao" />
        </bean>
 
-       <bean name="/pollEvent.service" class="org.argeo.slc.web.mvc.event.PollEventController">
+       <!--  Events  -->
+       <bean class="org.argeo.slc.web.mvc.controllers.EventController">
                <property name="eventListenerRegister" ref="eventListenerRegister" />
                <property name="eventListener" ref="eventListener" />
        </bean>
@@ -93,14 +30,22 @@
                <aop:scoped-proxy />
        </bean>
 
-       <!-- Attachements -->
-       <bean name="/getAttachment.service" class="org.argeo.slc.web.mvc.attachment.GetAttachmentHandler">
+       <!--  Execution  -->
+       <bean class="org.argeo.slc.web.mvc.controllers.ProcessController">
+               <property name="agentFactory" ref="agentFactory" />
+               <property name="slcExecutionDao" ref="slcExecutionDao" />
+               <property name="slcExecutionService" ref="slcExecutionService" />
+               <property name="marshaller" ref="marshaller" />
+               <property name="unmarshaller" ref="unmarshaller" />
                <property name="attachmentsStorage" ref="attachmentsStorage" />
        </bean>
 
-       <!-- Management -->
-       <bean name="/shutdownRuntime.service" class="org.argeo.slc.web.mvc.management.ShutdownRuntime">
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
+       <!--  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 -->
@@ -109,10 +54,9 @@
                <property name="modularDistributions" ref="modularDistributions" />
        </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" />
@@ -120,8 +64,14 @@
                </property>
        </bean>
 
-       <bean id="viewResolver" class="org.argeo.slc.web.mvc.MarshallerViewResolver">
-               <constructor-arg ref="marshaller" />
+       <bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
+               <property name="serializer">
+                       <bean class="org.argeo.server.MarshallerServerSerializer">
+                               <property name="marshaller" ref="marshaller" />
+                       </bean>
+               </property>
        </bean>
 
+       <bean class="org.argeo.server.mvc.DefaultHandlerExceptionResolver" />
+
 </beans>
\ No newline at end of file