svn commit: r1681923 - in /webservices/axiom/trunk: systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/ testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/

[ve...@apache.org]

Author: veithen
Date: Wed May 27 07:35:54 2015
New Revision: 1681923

URL: http://svn.apache.org/r1681923
Log:
Switch the secure echo scenario to SOAP action based dispatching because Spring-WS seems to have some problems with empty SOAP actions when security is used with SOAP 1.2.

Modified:
    webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
    webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/EchoEndpoint.java
    webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java

Modified: webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java?rev=1681923&r1=1681922&r2=1681923&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java (original)
+++ webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java Wed May 27 07:35:54 2015
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
 import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
 import org.apache.axiom.ts.springws.SpringWSTestSuiteBuilder;
 import org.apache.axiom.ts.springws.scenario.jaxb2.JAXB2Test;
-import org.apache.axiom.ts.springws.scenario.secureecho.SecureEchoTest;
 
 public class SpringWSTest extends TestCase {
     public static TestSuite suite() {
@@ -35,9 +34,6 @@ public class SpringWSTest extends TestCa
         // TODO: AXIOM-463
         builder.exclude(JAXB2Test.class);
         
-        // TODO: investigate
-        builder.exclude(SecureEchoTest.class);
-        
         return builder.build();
     }
 }

Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/EchoEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/EchoEndpoint.java?rev=1681923&r1=1681922&r2=1681923&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/EchoEndpoint.java (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/EchoEndpoint.java Wed May 27 07:35:54 2015
@@ -19,14 +19,14 @@
 package org.apache.axiom.ts.springws.scenario.secureecho;
 
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
-import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
+import org.springframework.ws.soap.server.endpoint.annotation.SoapAction;
 import org.w3c.dom.Element;
 
 @Endpoint
 public class EchoEndpoint {
-    @PayloadRoot(namespace="urn:test", localPart="Echo")
+    @SoapAction("http://www.example.com/echo")
     @ResponsePayload
     public Element echo(@RequestPayload Element request) {
         return request;

Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java?rev=1681923&r1=1681922&r2=1681923&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java Wed May 27 07:35:54 2015
@@ -27,6 +27,7 @@ import org.apache.axiom.ts.soap.SOAPSpec
 import org.apache.axiom.ts.springws.scenario.ScenarioConfig;
 import org.apache.axiom.ts.springws.scenario.ScenarioTestCase;
 import org.springframework.ws.client.core.WebServiceTemplate;
+import org.springframework.ws.soap.client.core.SoapActionCallback;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -43,7 +44,9 @@ public class SecureEchoTest extends Scen
         request.setTextContent("Hello");
         Document responseDocument = documentBuilder.newDocument();
         context.getBean(WebServiceTemplate.class).sendSourceAndReceiveToResult(
-                new DOMSource(request), new DOMResult(responseDocument));
+                new DOMSource(request),
+                new SoapActionCallback("http://www.example.com/echo"),
+                new DOMResult(responseDocument));
         Element response = responseDocument.getDocumentElement();
         assertEquals("urn:test", response.getNamespaceURI());
         assertEquals("Echo", response.getLocalName());