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=9365eaac349b98ac4d90533074d73b43621c065e;hb=1d1bc92e4aef2b8b889d7482f91b7ed905f0fb47;hp=1e335c88679ffefdef639a4d6732b03fa6e392b0;hpb=a1d6d94ee6dd016448e1d38336ddebd0acac583e;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..9365eaac3 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>
 
@@ -61,7 +59,7 @@
 	<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="slcExecutionService" ref="slcExecutionService" />
 	</bean>
 
@@ -116,7 +114,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