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

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
index 1d5e5be93..da4ad1919 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
@@ -3,18 +3,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
 	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">
 
-	<import resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
-
-	<bean
-		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-		<property name="interceptors">
-			<list>
-				<ref bean="osivInterceptor" />
-			</list>
-		</property>
-	</bean>
-
-
 	<bean id="viewResolverXslt" class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">
 		<property name="viewClass">
 			<value>org.argeo.slc.web.mvc.XsltMarshallerView
@@ -26,7 +14,7 @@
 		<property name="suffix">
 			<value>.xsl</value>
 		</property>
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="marshaller" ref="marshaller" />
 	</bean>
 
 
@@ -46,5 +34,13 @@
 		<property name="viewName" value="viewXml" />
 	</bean>
 
+	<bean
+		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
+		<property name="interceptors">
+			<list>
+				<ref bean="osivInterceptor" />
+			</list>
+		</property>
+	</bean>
 
 </beans>
\ No newline at end of file