Start v0.12.1 dev cycle

[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 1e335c88679ffefdef639a4d6732b03fa6e392b0..c381a31e3e903b76a358f85985a135acd8c4b1f7 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
@@ -5,8 +5,6 @@
        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">
 
-       <import resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
-
        <bean name="/isServerReady.service" class="org.argeo.slc.web.mvc.management.IsServerReady">
        </bean>
 
@@ -58,11 +56,19 @@
                <constructor-arg ref="slcExecutionDao" />
        </bean>
 
+       <bean name="/getSlcExecution.service" class="org.argeo.slc.web.mvc.process.GetSlcExecution">
+               <property name="slcExecutionDao" ref="slcExecutionDao" />
+               <property name="unmarshaller" ref="unmarshaller" />
+               <property name="attachmentsStorage" ref="attachmentsStorage" />
+       </bean>
+
        <bean name="/newSlcExecution.service"
                class="org.argeo.slc.web.mvc.process.NewSlcExecutionController">
                <property name="agentFactory" ref="agentFactory" />
-               <property name="unmarshaller" ref="slcDefault.castor.marshaller" />
+               <property name="unmarshaller" ref="unmarshaller" />
+               <property name="marshaller" ref="marshaller" />
                <property name="slcExecutionService" ref="slcExecutionService" />
+               <property name="attachmentsStorage" ref="attachmentsStorage" />
        </bean>
 
        <bean name="/getExecutionDescriptor.service" class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">
@@ -105,6 +111,20 @@
                <property name="dynamicRuntime" ref="dynamicRuntime" />
        </bean>
 
+       <!-- Provisioning -->
+       <bean name="/listModularDistributions.service"
+               class="org.argeo.slc.web.mvc.provisioning.ListModularDistributions">
+               <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>
+
        <!-- MVC -->
        <bean id="handlerMapping"
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
@@ -116,7 +136,7 @@
        </bean>
 
        <bean id="viewResolver" class="org.argeo.slc.web.mvc.MarshallerViewResolver">
-               <constructor-arg ref="slcDefault.castor.marshaller" />
+               <constructor-arg ref="marshaller" />
        </bean>
 
 </beans>
\ No newline at end of file