#146: fix generation of WSA Actions

oehf · Jun 13, 2017 · 5184861 · 5184861
1 parent 8200044
commit 5184861
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/iti86/Iti86PortType.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/iti86/Iti86PortType.java
@@ -26,6 +26,7 @@
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.Action;
 
 /**
  * @since 3.3
@@ -41,6 +42,7 @@
 public interface Iti86PortType {
 
     @WebMethod(operationName = "DocumentRepository_RemoveDocuments")
+    @Action(input = "urn:ihe:iti:2017:RemoveDocuments", output = "urn:ihe:iti:2017:RemoveDocumentsResponse")
     @WebResult(name = "RegistryResponse", targetNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0", partName = "body")
     public RegistryResponseType documentRepositoryRemoveDocuments(
         @WebParam(partName = "body", name = "RemoveDocumentsRequest", targetNamespace = "urn:ihe:iti:rmd:2017")

diff --git a/commons/ihe/xds/src/main/resources/wsdl/iti86.wsdl b/commons/ihe/xds/src/main/resources/wsdl/iti86.wsdl
@@ -21,7 +21,7 @@
     xmlns:rmd="urn:ihe:iti:rmd:2017"
     xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0"
 	xmlns:wsoap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:wsam="http://www.w3.org/2006/05/addressing/metadata/"
+	xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
 	targetNamespace="urn:ihe:iti:rmd:2017"
 	name="DocumentRepository">
 

diff --git a/...ihe/xds/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/xds/iti86/TestIti86.groovy b/...ihe/xds/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/xds/iti86/TestIti86.groovy
@@ -19,6 +19,7 @@ import org.apache.cxf.transport.servlet.CXFServlet
 import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.Test
+import org.openehealth.ipf.commons.ihe.core.payload.PayloadLoggerBase
 import org.openehealth.ipf.commons.ihe.xds.core.SampleData
 import org.openehealth.ipf.commons.ihe.xds.core.requests.RemoveDocuments
 import org.openehealth.ipf.commons.ihe.xds.core.responses.Response
@@ -36,7 +37,7 @@ class TestIti86 extends StandardTestContainer {
 
     def static CONTEXT_DESCRIPTOR = 'iti-86.xml'
 
-    def SERVICE2 = "rmd-iti86://localhost:${port}/rmd-iti86-service2"
+    def SERVICE2 = "rmd-iti86://localhost:${port}/rmd-iti86-service2?inInterceptors=#inLogger&outInterceptors=#outLogger"
     def SERVICE2_ADDR = "http://localhost:${port}/rmd-iti86-service2"
 
     RemoveDocuments request
@@ -47,6 +48,8 @@ class TestIti86 extends StandardTestContainer {
 
     @BeforeClass
     static void classSetUp() throws Exception {
+        System.setProperty(PayloadLoggerBase.PROPERTY_CONSOLE, 'true')
+        System.setProperty(PayloadLoggerBase.PROPERTY_DISABLED, 'true')
         startServer(new CXFServlet(), CONTEXT_DESCRIPTOR)
     }
 

diff --git a/platform-camel/ihe/xds/src/test/resources/iti-86.xml b/platform-camel/ihe/xds/src/test/resources/iti-86.xml
@@ -34,5 +34,13 @@ http://camel.apache.org/schema/spring/camel-spring.xsd">
         class="org.openehealth.ipf.platform.camel.ihe.xds.iti86.Iti86TestRouteBuilder">
     </bean>
 
+    <bean id="inLogger" class="org.openehealth.ipf.commons.ihe.ws.cxf.payload.InPayloadLoggerInterceptor">
+        <constructor-arg value="dummy" />
+    </bean>
+
+    <bean id="outLogger" class="org.openehealth.ipf.commons.ihe.ws.cxf.payload.OutPayloadLoggerInterceptor">
+        <constructor-arg value="dummy" />
+    </bean>
+
 </beans>