Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java Fri Jun 19 10:47:06 2015 @@ -88,8 +88,8 @@ public class XOPAttachmentTest extends o encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/";, "Content")); encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java Fri Jun 19 10:47:06 2015 @@ -82,8 +82,8 @@ public class BSTKerberosTest extends org public void testCreateBinarySecurityToken() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -110,8 +110,8 @@ public class BSTKerberosTest extends org public void testSignBST() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -146,8 +146,8 @@ public class BSTKerberosTest extends org public void testSignBSTTimestamp() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -185,8 +185,8 @@ public class BSTKerberosTest extends org public void testProcessToken() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -219,8 +219,8 @@ public class BSTKerberosTest extends org public void testProcessTokenCustomValidator() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -256,8 +256,8 @@ public class BSTKerberosTest extends org public void testKerberosSignatureDRCreation() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -295,8 +295,8 @@ public class BSTKerberosTest extends org public void testKerberosSignatureKICreation() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -336,8 +336,8 @@ public class BSTKerberosTest extends org public void testKerberosEncryptionDRCreation() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); @@ -374,8 +374,8 @@ public class BSTKerberosTest extends org public void testKerberosEncryptionKICreation() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setValueType(AP_REQ); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java Fri Jun 19 10:47:06 2015 @@ -65,8 +65,8 @@ public class BinarySecurityTokenTest ext public void testX509() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); X509Security bst = new X509Security(doc); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); @@ -106,8 +106,8 @@ public class BinarySecurityTokenTest ext public void testPKIPath() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); PKIPathSecurity bst = new PKIPathSecurity(doc); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); @@ -143,8 +143,8 @@ public class BinarySecurityTokenTest ext public void testCustomToken() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); BinarySecurity bst = new BinarySecurity(doc); bst.setToken("12435677".getBytes()); @@ -172,8 +172,8 @@ public class BinarySecurityTokenTest ext bst = new BinarySecurity(doc); bst.setToken("12435677".getBytes()); bst.setValueType("http://custom_value_Type";); - secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(), bst.getElement()); WSHandlerResult results = Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java Fri Jun 19 10:47:06 2015 @@ -73,8 +73,8 @@ public class FaultCodeTest extends org.j builder.setUserInfo("wss40", "security"); builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document encryptedDoc = builder.build(doc, crypto, secHeader); try { @@ -116,8 +116,8 @@ public class FaultCodeTest extends org.j builder.setTimeToLive(-1); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document timestampedDoc = builder.build(doc, secHeader); try { @@ -143,8 +143,8 @@ public class FaultCodeTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document timestampedDoc = builder.build(doc, secHeader); try { @@ -170,8 +170,8 @@ public class FaultCodeTest extends org.j builder.setUserInfo(null, "security"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); builder.build(doc, secHeader); try { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java Fri Jun 19 10:47:06 2015 @@ -79,8 +79,8 @@ public class PrincipalTest extends org.j WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("wernerd", "verySecret"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, secHeader); if (LOG.isDebugEnabled()) { @@ -111,8 +111,8 @@ public class PrincipalTest extends org.j WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("wernerd", "verySecret"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, secHeader); if (LOG.isDebugEnabled()) { @@ -146,8 +146,8 @@ public class PrincipalTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -189,8 +189,8 @@ public class PrincipalTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -233,8 +233,8 @@ public class PrincipalTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -269,8 +269,8 @@ public class PrincipalTest extends org.j public void testBinarySecurityToken() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); X509Security bst = new X509Security(doc); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java Fri Jun 19 10:47:06 2015 @@ -84,8 +84,8 @@ public class EncryptedKeyDataRefTest ext builder.setUserInfo("wss40"); builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); LOG.info("Before Encryption Triple DES...."); /* Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java Fri Jun 19 10:47:06 2015 @@ -84,8 +84,8 @@ public class ReferenceListDataRefTest ex builder.setUserInfo("wss40"); builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); LOG.info("Before Encryption Triple DES...."); /* Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java Fri Jun 19 10:47:06 2015 @@ -77,8 +77,8 @@ public class SamlAlgorithmSuiteTest exte WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -121,8 +121,8 @@ public class SamlAlgorithmSuiteTest exte WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -164,8 +164,8 @@ public class SamlAlgorithmSuiteTest exte WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java Fri Jun 19 10:47:06 2015 @@ -165,8 +165,8 @@ public class SamlAuthnTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java Fri Jun 19 10:47:06 2015 @@ -152,8 +152,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -190,8 +190,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -231,8 +231,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -264,8 +264,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -345,8 +345,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -389,8 +389,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -432,8 +432,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -472,8 +472,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -532,8 +532,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -600,8 +600,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -645,8 +645,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -690,8 +690,8 @@ public class SamlConditionsTest extends WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java Fri Jun 19 10:47:06 2015 @@ -117,8 +117,8 @@ public class SamlNegativeTest extends or wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build( @@ -170,8 +170,8 @@ public class SamlNegativeTest extends or WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -222,8 +222,8 @@ public class SamlNegativeTest extends or WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); // @@ -267,8 +267,8 @@ public class SamlNegativeTest extends or samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -310,8 +310,8 @@ public class SamlNegativeTest extends or // saml.setSignAssertion(true); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -358,8 +358,8 @@ public class SamlNegativeTest extends or wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java Fri Jun 19 10:47:06 2015 @@ -110,8 +110,8 @@ public class SamlReferenceTest extends o SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSignatureSAML wsSign = new WSSecSignatureSAML(); wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); @@ -173,8 +173,8 @@ public class SamlReferenceTest extends o SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSignatureSAML wsSign = new WSSecSignatureSAML(); wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); @@ -244,8 +244,8 @@ public class SamlReferenceTest extends o wsSign.setSignatureAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -309,8 +309,8 @@ public class SamlReferenceTest extends o wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -357,8 +357,8 @@ public class SamlReferenceTest extends o @org.junit.Test public void testAssertionBelowSTR() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler(); callbackHandler.setStatement(SAML1CallbackHandler.Statement.ATTR); @@ -426,9 +426,9 @@ public class SamlReferenceTest extends o samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); Node assertionNode = samlAssertion.toDOM(doc); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionNode); // Encrypt the SOAP body @@ -502,9 +502,9 @@ public class SamlReferenceTest extends o samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); Node assertionNode = samlAssertion.toDOM(doc); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionNode); // Encrypt the SOAP body @@ -573,8 +573,8 @@ public class SamlReferenceTest extends o SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSignatureSAML wsSign = new WSSecSignatureSAML(); wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); @@ -635,8 +635,8 @@ public class SamlReferenceTest extends o SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSignatureSAML wsSign = new WSSecSignatureSAML(); wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); @@ -706,8 +706,8 @@ public class SamlReferenceTest extends o wsSign.setSignatureAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -771,8 +771,8 @@ public class SamlReferenceTest extends o wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -829,9 +829,9 @@ public class SamlReferenceTest extends o samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); Node assertionNode = samlAssertion.toDOM(doc); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionNode); // Encrypt the SOAP body @@ -905,9 +905,9 @@ public class SamlReferenceTest extends o samlAssertion.signAssertion("wss40_server", "security", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); Node assertionNode = samlAssertion.toDOM(doc); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionNode); // Encrypt the SOAP body Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java Fri Jun 19 10:47:06 2015 @@ -92,8 +92,8 @@ public class SamlTokenCustomSignatureTes Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); Element assertionElement = samlAssertion.toDOM(doc); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionElement); // Sign @@ -133,8 +133,8 @@ public class SamlTokenCustomSignatureTes Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); Element assertionElement = samlAssertion.toDOM(doc); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionElement); // Sign @@ -171,8 +171,8 @@ public class SamlTokenCustomSignatureTes Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); Element assertionElement = samlAssertion.toDOM(doc); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionElement); WSSecSignature sign = new WSSecSignature(); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java Fri Jun 19 10:47:06 2015 @@ -93,8 +93,8 @@ public class SamlTokenDerivedTest extend SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); SecurityTokenReference secRefSaml = createSamlSTR(doc, samlAssertion, WSSConfig.getNewInstance()); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java Fri Jun 19 10:47:06 2015 @@ -84,8 +84,8 @@ public class SamlTokenHOKTest extends or WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -125,8 +125,8 @@ public class SamlTokenHOKTest extends or WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -176,8 +176,8 @@ public class SamlTokenHOKTest extends or WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -217,8 +217,8 @@ public class SamlTokenHOKTest extends or WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java Fri Jun 19 10:47:06 2015 @@ -88,8 +88,8 @@ public class SamlTokenSVTest extends org wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build( @@ -148,8 +148,8 @@ public class SamlTokenSVTest extends org wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build( @@ -208,8 +208,8 @@ public class SamlTokenSVTest extends org wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build( @@ -268,8 +268,8 @@ public class SamlTokenSVTest extends org wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build( @@ -331,8 +331,8 @@ public class SamlTokenSVTest extends org Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build( Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Fri Jun 19 10:47:06 2015 @@ -333,8 +333,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -374,8 +374,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -415,8 +415,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -457,8 +457,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -498,8 +498,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -540,8 +540,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -601,8 +601,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -681,8 +681,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -721,8 +721,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); wsSign.prepare(doc, samlAssertion); @@ -785,8 +785,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); wsSign.prepare(doc, samlAssertion); @@ -909,8 +909,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -937,8 +937,8 @@ public class SamlTokenTest extends org.j wsSign = new WSSecSAMLToken(); doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); try { @@ -963,8 +963,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -1005,8 +1005,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -1059,8 +1059,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -1100,8 +1100,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); @@ -1194,8 +1194,8 @@ public class SamlTokenTest extends org.j WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document unsignedDoc = wsSign.build(doc, samlAssertion, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java Fri Jun 19 10:47:06 2015 @@ -114,8 +114,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -186,8 +186,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setSecretKey(ephemeralKey); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -247,8 +247,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -310,8 +310,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setSecretKey(ephemeralKey); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -374,8 +374,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -435,8 +435,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -496,8 +496,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); @@ -562,8 +562,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, crypto, samlAssertion, null, null, null, secHeader); @@ -638,8 +638,8 @@ public class SignedSamlTokenHOKTest exte wsSign.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER); wsSign.setSecretKey(ephemeralKey); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java Fri Jun 19 10:47:06 2015 @@ -74,8 +74,8 @@ public class ValidatorTest extends org.j public void testExpiredTimestamp() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecTimestamp timestamp = new WSSecTimestamp(); timestamp.setTimeToLive(-1); @@ -112,8 +112,8 @@ public class ValidatorTest extends org.j Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Crypto crypto = CryptoFactory.getInstance("wss40.properties"); Document signedDoc = sign.build(doc, crypto, secHeader); @@ -155,8 +155,8 @@ public class ValidatorTest extends org.j builder.setUserInfo("wernerd", "verySecre"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, secHeader); if (LOG.isDebugEnabled()) { @@ -188,8 +188,8 @@ public class ValidatorTest extends org.j public void testTransformedBST() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); X509Security bst = new X509Security(doc); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); @@ -239,8 +239,8 @@ public class ValidatorTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, CryptoFactory.getInstance(), secHeader); if (LOG.isDebugEnabled()) { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java Fri Jun 19 10:47:06 2015 @@ -565,8 +565,8 @@ public class AttachmentTest extends Abst encrypt.setUserInfo("receiver", "default"); encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/";, "Content")); encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content")); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java Fri Jun 19 10:47:06 2015 @@ -127,8 +127,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); Crypto crypto = CryptoFactory.getInstance("transmitter-crypto.properties"); @@ -328,8 +328,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); @@ -456,8 +456,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); //EncryptedKey WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey(); @@ -592,8 +592,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); SecurityTokenReference secToken = new SecurityTokenReference(doc); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); @@ -723,8 +723,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); SecurityTokenReference secToken = new SecurityTokenReference(doc); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); @@ -853,8 +853,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Crypto crypto = CryptoFactory.getInstance("transmitter-crypto.properties"); @@ -976,8 +976,8 @@ public class DerivedKeyTokenTest extends ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Crypto crypto = CryptoFactory.getInstance("transmitter-crypto.properties"); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Fri Jun 19 10:47:06 2015 @@ -1560,8 +1560,8 @@ public class EncDecryptionTest extends A Document doc = documentBuilderFactory.newDocumentBuilder().parse(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecEncrypt builder = new WSSecEncrypt(); builder.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER); @@ -2532,8 +2532,8 @@ public class EncDecryptionTest extends A Document doc = documentBuilderFactory.newDocumentBuilder().parse(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element securityHeaderElement = secHeader.getSecurityHeader(); securityHeaderElement.appendChild(doc.getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/";, "definitions").item(0)); @@ -2576,8 +2576,8 @@ public class EncDecryptionTest extends A Document doc = documentBuilderFactory.newDocumentBuilder().parse(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element securityHeaderElement = secHeader.getSecurityHeader(); securityHeaderElement.appendChild(doc.getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/";, "definitions").item(0)); @@ -2619,8 +2619,8 @@ public class EncDecryptionTest extends A Document doc = documentBuilderFactory.newDocumentBuilder().parse(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element securityHeaderElement = secHeader.getSecurityHeader(); securityHeaderElement.appendChild(doc.getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/";, "definitions").item(0)); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java Fri Jun 19 10:47:06 2015 @@ -138,8 +138,8 @@ public class SecurityContextTokenTest ex ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); @@ -348,8 +348,8 @@ public class SecurityContextTokenTest ex ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); @@ -531,8 +531,8 @@ public class SecurityContextTokenTest ex ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); @@ -578,8 +578,8 @@ public class SecurityContextTokenTest ex ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); @@ -801,8 +801,8 @@ public class SecurityContextTokenTest ex ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); @@ -1025,8 +1025,8 @@ public class SecurityContextTokenTest ex ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSecurityContextToken sctBuilder = new WSSecSecurityContextToken(); sctBuilder.setWscVersion(version); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java Fri Jun 19 10:47:06 2015 @@ -388,8 +388,8 @@ public class SignatureEncryptionTest ext Document doc = documentBuilderFactory.newDocumentBuilder().parse(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSignature sign = new WSSecSignature(); sign.setUserInfo("transmitter", "default"); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java Fri Jun 19 10:47:06 2015 @@ -1160,8 +1160,8 @@ public class SignatureTest extends Abstr InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); Document doc = documentBuilderFactory.newDocumentBuilder().parse(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecSignature sign = new WSSecSignature(); sign.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java Fri Jun 19 10:47:06 2015 @@ -115,8 +115,8 @@ public class XOPAttachmentTest extends A encrypt.setUserInfo("receiver", "default"); encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/";, "Content")); encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content")); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java Fri Jun 19 10:47:06 2015 @@ -485,8 +485,8 @@ public class SAMLTokenHOKTest extends Ab WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document securedDocument = wsSign.build(doc, samlAssertion, secHeader); @@ -985,8 +985,8 @@ public class SAMLTokenHOKTest extends Ab WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document securedDocument = wsSign.build(doc, samlAssertion, secHeader); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java Fri Jun 19 10:47:06 2015 @@ -361,9 +361,9 @@ public class SAMLTokenReferenceTest exte samlAssertion.signAssertion("samlissuer", "default", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); Node assertionNode = samlAssertion.toDOM(doc); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionNode); // Encrypt the SOAP body @@ -446,9 +446,9 @@ public class SAMLTokenReferenceTest exte samlAssertion.signAssertion("samlissuer", "default", issuerCrypto, false); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); Node assertionNode = samlAssertion.toDOM(doc); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); secHeader.getSecurityHeader().appendChild(assertionNode); // Encrypt the SOAP body @@ -809,8 +809,8 @@ public class SAMLTokenReferenceTest exte wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Crypto userCrypto = CryptoFactory.getInstance("transmitter-crypto.properties"); Document securedDocument = wsSign.build(doc, userCrypto, samlAssertion, null, null, null, secHeader); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Fri Jun 19 10:47:06 2015 @@ -887,8 +887,8 @@ public class SAMLTokenTest extends Abstr WSSecSAMLToken wsSign = new WSSecSAMLToken(); Document doc = SOAPUtil.toSOAPPart(sourceDocument); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); wsSign.prepare(doc, samlAssertion); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java Fri Jun 19 10:47:06 2015 @@ -80,8 +80,8 @@ public class SamlTokenDerivedTest extend SamlAssertionWrapper samlAssertion = new SamlAssertionWrapper(samlCallback); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); SecurityTokenReference secRefSaml = createSamlSTR(doc, samlAssertion, WSSConfig.getNewInstance());
