X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fslc-service-servlet.xml;h=b4143a3ca2f88935dfbe33d797d55c0472eeab3f;hb=ff9d53c89ae7c9e7617d3297d2f82508a6c0acbb;hp=1e335c88679ffefdef639a4d6732b03fa6e392b0;hpb=25faa15e49f30510b365ba75646128b7e5a74586;p=gpl%2Fargeo-slc.git

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 1e335c886..b4143a3ca 100644
--- 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,10 +56,16 @@
 		<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" />
+	</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" />
 	</bean>
 
@@ -105,6 +109,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 +134,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