Improve SlcExecution notifications

[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 38fb28ee6c87cefbaab2753fc20982d3e2c82e68..e09d30ad78926cb4bfbe5b904cb7229cd24e1477 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
@@ -1,61 +1,103 @@
-<?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">
-
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       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.5.xsd"\r
+       default-lazy-init="true">\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 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 name="closeTreeTestResultRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.CloseTreeTestResultRequestEp">\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="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>
+       <bean name="resultPartRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
+               <constructor-arg ref="testResultDao" />\r
+               <constructor-arg ref="testRunDescriptorDao" />\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
                                        slcExecutionRequestEp\r
                                </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}slc-execution-status-request">\r
+                                       slcExecutionRequestEp\r
+                               </prop>\r
                                <prop\r
                                        key="{http://argeo.org/projects/slc/schemas}slc-execution-steps-request">\r
                                        slcExecutionStepsRequestEp\r
                                </prop>\r
-                       </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>
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">\r
+                                       createTreeTestResultRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}close-tree-test-result-request">\r
+                                       closeTreeTestResultRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}result-part-request">\r
+                                       resultPartRequestEp\r
+                               </prop>\r
+                       </props>\r
+               </property>\r
+\r
+               <property name="interceptors">\r
+                       <bean\r
+                               class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor" />\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="slcDefinition"\r
+               class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">\r
+               <property name="schema" ref="slcDefault.xml.xsdSchema" />\r
+               <property name="portTypeName" value="Slc" />\r
+               <property name="locationUri"\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 class="org.argeo.slc.ws.CustomSoapExceptionResolver" />\r
 </beans>
\ No newline at end of file