X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fslc-ws-servlet.xml;h=00c110d14f5afe21c28619262ddd6d0ecee3942a;hb=df7e5322827500a646cd4a68c7f0618bdb0e511c;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..00c110d14 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,41 +1,52 @@
 <?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">
+
+	<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="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
+		<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="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="unmarshaller"
+			ref="slcDefault.castor.marshaller" />
 	</bean>
 
-	<bean name="treeTestResultRequestEp"
-		class="org.argeo.slc.ws.test.tree.TreeTestResultRequestEp">
+	<bean name="createTreeTestResultRequestEp"
+		class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">
 		<constructor-arg ref="testResultDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="unmarshaller"
+			ref="slcDefault.castor.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 name="closeTreeTestResultRequestEp"
+		class="org.argeo.slc.ws.test.tree.CloseTreeTestResultRequestEp">
+		<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"
@@ -52,8 +63,16 @@
 					slcExecutionStepsRequestEp
 				</prop>
 				<prop
-					key="{http://argeo.org/projects/slc/schemas}tree-test-result-request">
-					treeTestResultRequestEp
+					key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">
+					createTreeTestResultRequestEp
+				</prop>
+				<prop
+					key="{http://argeo.org/projects/slc/schemas}close-tree-test-result-request">
+					closeTreeTestResultRequestEp
+				</prop>
+				<prop
+					key="{http://argeo.org/projects/slc/schemas}result-part-request">
+					resultPartRequestEp
 				</prop>
 			</props>
 		</property>
@@ -66,20 +85,14 @@
 
 	<bean id="slcDefinition"
 		class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
-		<property name="schema" ref="schema" />
+		<property name="schema" ref="slcDefault.xml.xsdSchema" />
 		<property name="portTypeName" value="Slc" />
 		<property name="locationUri"
-			value="http://localhost:8080/argeo-slc-ws/slcService/" />
+			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 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" />
 </beans>
\ No newline at end of file