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=755973f0728b9a8c0e52bebc4ffa819ec1fec735;hb=56371c31d47fc2ddc5507e34c6846e4930a60c8d;hp=8c3977ccdcfdc2538435e69c30c110f8252b3e42;hpb=d07d365ea50eb5385baef04d235bfda8f92086cb;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 8c3977ccd..755973f07 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,85 +1,8 @@
 <?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"
+	default-lazy-init="true">
 
-	<bean name="slcExecutionRequestEp"
-		class="org.argeo.slc.ws.process.SlcExecutionRequestEp">
-		<constructor-arg ref="slcExecutionDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
-	</bean>
-
-	<bean name="slcExecutionStepsRequestEp"
-		class="org.argeo.slc.ws.process.SlcExecutionStepsRequestEp">
-		<constructor-arg ref="slcExecutionDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
-	</bean>
-
-	<bean name="treeTestResultRequestEp"
-		class="org.argeo.slc.ws.test.tree.TreeTestResultRequestEp">
-		<constructor-arg ref="testResultDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
-	</bean>
-
-	<bean id="marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
-		<property name="mappingLocations">
-			<list>
-				<value>
-					classpath:org/argeo/slc/castor/process/mapping.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/test/tree/mapping.xml
-				</value>
-			</list>
-		</property>
-	</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}tree-test-result-request">
-					treeTestResultRequestEp
-				</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="schema" />
-		<property name="portTypeName" value="Slc" />
-		<property name="locationUri"
-			value="http://localhost:8080/argeo-slc-ws/slcService/" />
-		<property name="targetNamespace"
-			value="http://argeo.org/projects/slc/definitions" />
-		<property name="requestSuffix" value="-request" />
-	</bean>
-
-	<bean id="schema"
-		class="org.springframework.xml.xsd.SimpleXsdSchema">
-		<property name="xsd"
-			value="classpath:/org/argeo/slc/xml/slc.xsd" />
-	</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