Various changes (currently broken, apparently Castor is hanging)

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / WEB-INF / slc-ws-servlet.xml

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 ef04896fc7559878ee5537238dfd2139621d142a..1277f5e5e85e169a524a67e87b1ee005aad649cb 100644 (file)
--- 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
@@ -3,29 +3,39 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
 \r
+       <import\r
+               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
+       <import\r
+               resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />\r
+\r
        <bean name="slcExecutionRequestEp"\r
                class="org.argeo.slc.ws.process.SlcExecutionRequestEp">\r
                <constructor-arg ref="slcExecutionDao" />\r
-               <property name="marshaller" ref="marshaller" />\r
-               <property name="unmarshaller" ref="marshaller" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
        </bean>\r
 \r
        <bean name="slcExecutionStepsRequestEp"\r
                class="org.argeo.slc.ws.process.SlcExecutionStepsRequestEp">\r
                <constructor-arg ref="slcExecutionDao" />\r
-               <property name="marshaller" ref="marshaller" />\r
-               <property name="unmarshaller" ref="marshaller" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
        </bean>\r
 \r
-       <bean id="marshaller"\r
-               class="org.springframework.oxm.castor.CastorMarshaller">\r
-               <property name="mappingLocation"\r
-                       value="classpath:org/argeo/slc/castor/process/mapping.xml" />\r
+       <bean name="createTreeTestResultRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
        </bean>\r
 \r
        <bean id="endPointMapping"\r
                class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">\r
                <property name="mappings">\r
+\r
                        <props>\r
                                <prop\r
                                        key="{http://argeo.org/projects/slc/schemas}slc-execution-request">\r
@@ -35,8 +45,13 @@
                                        key="{http://argeo.org/projects/slc/schemas}slc-execution-steps-request">\r
                                        slcExecutionStepsRequestEp\r
                                </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">\r
+                                       createTreeTestResultRequestEp\r
+                               </prop>\r
                        </props>\r
                </property>\r
+\r
                <property name="interceptors">\r
                        <bean\r
                                class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor" />\r
@@ -45,20 +60,14 @@
 \r
        <bean id="slcDefinition"\r
                class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">\r
-               <property name="schema" ref="schema" />\r
+               <property name="schema" ref="slcDefault.xml.xsdSchema" />\r
                <property name="portTypeName" value="Slc" />\r
                <property name="locationUri"\r
-                       value="http://localhost:8080/argeo-slc-ws/slcService/" />\r
+                       value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />\r
                <property name="targetNamespace"\r
                        value="http://argeo.org/projects/slc/definitions" />\r
                <property name="requestSuffix" value="-request" />\r
        </bean>\r
 \r
-       <bean id="schema"\r
-               class="org.springframework.xml.xsd.SimpleXsdSchema">\r
-               <property name="xsd"\r
-                       value="classpath:/org/argeo/slc/xml/slc.xsd" />\r
-       </bean>\r
-\r
        <bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />\r
 </beans>
\ No newline at end of file