ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1689452 - /webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
Date Mon, 06 Jul 2015 16:37:24 GMT
Author: coheigea
Date: Mon Jul  6 16:37:24 2015
New Revision: 1689452

URL: http://svn.apache.org/r1689452
Log:
Fixing backmerge

Modified:
    webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java

Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java?rev=1689452&r1=1689451&r2=1689452&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
(original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
Mon Jul  6 16:37:24 2015
@@ -438,8 +438,8 @@ public class XOPAttachmentTest extends o
     @org.junit.Test
     public void testSignedEncryptedSOAPBody() throws Exception {
         Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
-        WSSecHeader secHeader = new WSSecHeader(doc);
-        secHeader.insertSecurityHeader();
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
         
         AttachmentCallbackHandler outboundAttachmentCallback = new AttachmentCallbackHandler();
         
@@ -449,7 +449,6 @@ public class XOPAttachmentTest extends o
         
         builder.setAttachmentCallbackHandler(outboundAttachmentCallback);
         builder.setStoreBytesInAttachment(true);
-        builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/",
"Content"));
         builder.build(doc, crypto, secHeader);
         
         WSSecEncrypt encrypt = new WSSecEncrypt();
@@ -458,7 +457,6 @@ public class XOPAttachmentTest extends o
 
         encrypt.setAttachmentCallbackHandler(outboundAttachmentCallback);
         encrypt.setStoreBytesInAttachment(true);
-        encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/",
"Content"));
 
         Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
         
@@ -498,8 +496,8 @@ public class XOPAttachmentTest extends o
     @org.junit.Test
     public void testEncryptedSignedSOAPBody() throws Exception {
         Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
-        WSSecHeader secHeader = new WSSecHeader(doc);
-        secHeader.insertSecurityHeader();
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
         
         AttachmentCallbackHandler outboundAttachmentCallback = new AttachmentCallbackHandler();
         
@@ -509,7 +507,6 @@ public class XOPAttachmentTest extends o
 
         encrypt.setAttachmentCallbackHandler(outboundAttachmentCallback);
         encrypt.setStoreBytesInAttachment(true);
-        encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/",
"Content"));
 
         encrypt.build(doc, crypto, secHeader);
         
@@ -519,7 +516,6 @@ public class XOPAttachmentTest extends o
         
         builder.setAttachmentCallbackHandler(outboundAttachmentCallback);
         builder.setStoreBytesInAttachment(true);
-        builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/",
"Content"));
         Document signedDoc = builder.build(doc, crypto, secHeader);
         
         List<Attachment> signedAttachments = outboundAttachmentCallback.getResponseAttachments();



Mime
View raw message