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=7f2c521be0cab22f415a6a7dc1bf86dd75764b34;hb=e705b3804cd22f56dec2ca69db3de83a53ab010a;hp=723587138bdda8b0f1a46d44a6018ba0d31b3f74;hpb=7152051a2d1fa624104ad673efd1f214447be8bf;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 723587138..7f2c521be 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,49 +1,85 @@
-<?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">
-
-	<bean name="slcExecutionRequestEp"
-		class="org.argeo.slc.ws.process.SlcExecutionRequestEp">
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
-	</bean>
-
-	<bean id="marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
-		<property name="mappingLocation"
-			value="classpath:org/argeo/slc/castor/process/mapping.xml" />
-	</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>
-			</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>
+<?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.5.xsd" default-lazy-init="true">
+
+	<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 name="resultPartRequestEp"
+		class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">
+		<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>
+				<prop
+					key="{http://argeo.org/projects/slc/schemas}result-part-request">
+					resultPartRequestEp
+				</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" />
 </beans>
\ No newline at end of file