X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fxslt-servlet.xml;h=1d5e5be93d2bfbe1f90fad7487fba540d876ee1c;hb=c24f591082e6f01e6752037cec53b8a70792c2f3;hp=ddfd925ce332293b458b802d1bfced7a3d7268c8;hpb=2ad1acc6a405415f6456c5547ad6ec2a87438fec;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
index ddfd925ce..1d5e5be93 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
@@ -1,20 +1,41 @@
 <?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: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/server/spring/slc-xslt-servlet.xml" />
+	<import resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
 
-	<bean name="/resultView.xslt"
-		class="org.argeo.slc.web.mvc.result.GetResultController">
+	<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
+			</value>
+		</property>
+		<property name="prefix">
+			<value>WEB-INF/xslt/</value>
+		</property>
+		<property name="suffix">
+			<value>.xsl</value>
+		</property>
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+	</bean>
+
+
+	<bean name="/resultView.xslt" class="org.argeo.slc.web.mvc.result.GetResultController">
 		<constructor-arg ref="testResultDao" />
 		<property name="viewName" value="resultView" />
 	</bean>
 
-	<bean name="/resultViewXml.xslt"
-		class="org.argeo.slc.web.mvc.result.GetResultController">
+	<bean name="/resultViewXml.xslt" class="org.argeo.slc.web.mvc.result.GetResultController">
 		<constructor-arg ref="testResultDao" />
 		<property name="viewName" value="viewXml" />
 	</bean>