X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fslc-ws-servlet.xml;h=18dce9a8a2cc03460055c40607abf1db654e1227;hb=645316f920e5d09ace0df69f633a73345a4c1f1c;hp=1277f5e5e85e169a524a67e87b1ee005aad649cb;hpb=d79bfe9bf22c3cd6f446f3c7668a20c20386ea61;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
index 1277f5e5e..18dce9a8a 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
@@ -1,73 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<import
-		resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
-	<import
-		resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />
-
-	<bean name="slcExecutionRequestEp"
-		class="org.argeo.slc.ws.process.SlcExecutionRequestEp">
-		<constructor-arg ref="slcExecutionDao" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-		<property name="unmarshaller"
-			ref="slcDefault.castor.marshaller" />
-	</bean>
-
-	<bean name="slcExecutionStepsRequestEp"
-		class="org.argeo.slc.ws.process.SlcExecutionStepsRequestEp">
-		<constructor-arg ref="slcExecutionDao" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-		<property name="unmarshaller"
-			ref="slcDefault.castor.marshaller" />
-	</bean>
-
-	<bean name="createTreeTestResultRequestEp"
-		class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">
-		<constructor-arg ref="testResultDao" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-		<property name="unmarshaller"
-			ref="slcDefault.castor.marshaller" />
-	</bean>
-
-	<bean id="endPointMapping"
-		class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
-		<property name="mappings">
-
-			<props>
-				<prop
-					key="{http://argeo.org/projects/slc/schemas}slc-execution-request">
-					slcExecutionRequestEp
-				</prop>
-				<prop
-					key="{http://argeo.org/projects/slc/schemas}slc-execution-steps-request">
-					slcExecutionStepsRequestEp
-				</prop>
-				<prop
-					key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">
-					createTreeTestResultRequestEp
-				</prop>
-			</props>
-		</property>
-
-		<property name="interceptors">
-			<bean
-				class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor" />
-		</property>
-	</bean>
-
-	<bean id="slcDefinition"
-		class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
-		<property name="schema" ref="slcDefault.xml.xsdSchema" />
-		<property name="portTypeName" value="Slc" />
-		<property name="locationUri"
-			value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />
-		<property name="targetNamespace"
-			value="http://argeo.org/projects/slc/definitions" />
-		<property name="requestSuffix" value="-request" />
-	</bean>
-
-	<bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />
+	<import resource="classpath:/org/argeo/slc/server/spring/slc-ws-servlet.xml"/>
 </beans>
\ No newline at end of file