Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java Fri Jun 19 10:47:06 2015 @@ -60,9 +60,9 @@ public class NoSoapPrefixSignatureTest e Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); + WSSecHeader secHeader = new WSSecHeader(doc); secHeader.setActor("bob"); - secHeader.insertSecurityHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java Fri Jun 19 10:47:06 2015 @@ -88,8 +88,8 @@ public class PasswordEncryptorTest exten builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -138,8 +138,8 @@ public class PasswordEncryptorTest exten builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP); 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); String outputString = Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java Fri Jun 19 10:47:06 2015 @@ -58,8 +58,8 @@ public class PasswordTypeTest extends or 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()) { @@ -110,8 +110,8 @@ public class PasswordTypeTest extends or builder.setPasswordType(WSConstants.PASSWORD_TEXT); 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()) { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java Fri Jun 19 10:47:06 2015 @@ -72,8 +72,8 @@ public class ReplayTest extends org.juni public void testReplayedTimestamp() 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(300); @@ -123,8 +123,8 @@ public class ReplayTest extends org.juni public void testEhCacheReplayedTimestamp() 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(300); @@ -173,8 +173,8 @@ public class ReplayTest extends org.juni public void testReplayedTimestampBelowSignature() 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(300); @@ -219,8 +219,8 @@ public class ReplayTest extends org.juni public void testEhCacheReplayedTimestampBelowSignature() 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(300); @@ -264,8 +264,8 @@ public class ReplayTest extends org.juni public void testReplayedTimestampNoExpires() 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(0); @@ -315,8 +315,8 @@ public class ReplayTest extends org.juni public void testEhCacheReplayedTimestampNoExpires() 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(0); @@ -367,8 +367,8 @@ public class ReplayTest extends org.juni 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()) { @@ -401,8 +401,8 @@ public class ReplayTest extends org.juni 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()) { @@ -453,8 +453,8 @@ public class ReplayTest extends org.juni 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); @@ -504,8 +504,8 @@ public class ReplayTest extends org.juni 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/message/RequireSignedEncryptedDataElementsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java Fri Jun 19 10:47:06 2015 @@ -293,8 +293,8 @@ public class RequireSignedEncryptedDataE LOG.info("Before Encryption...."); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document encryptedDoc = encrypt.build(doc, crypto, secHeader); @@ -324,8 +324,8 @@ public class RequireSignedEncryptedDataE LOG.info("Before Encryption...."); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java Fri Jun 19 10:47:06 2015 @@ -69,8 +69,8 @@ public class SKISignatureTest extends or LOG.info("Before SigningDSA_SKIDirect...."); 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, crypto, secHeader); @@ -112,8 +112,8 @@ public class SKISignatureTest extends or LOG.info("Before SigningDSA_Autodetect...."); 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, crypto, secHeader); @@ -146,8 +146,8 @@ public class SKISignatureTest extends or LOG.info("Before SigningRSA_Autodetect...."); 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, crypto, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java Fri Jun 19 10:47:06 2015 @@ -89,8 +89,8 @@ public class STRSignatureTest extends or LOG.info("Before Signing STR DirectReference...."); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, crypto, secHeader); @@ -116,8 +116,8 @@ public class STRSignatureTest extends or Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement()); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); // // Set up to sign body and use STRTransform to sign @@ -195,8 +195,8 @@ public class STRSignatureTest extends or LOG.info("Before Signing STR IS...."); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, crypto, secHeader); @@ -247,8 +247,8 @@ public class STRSignatureTest extends or LOG.info("Before Signing STR SKI...."); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = builder.build(doc, crypto, secHeader); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java Fri Jun 19 10:47:06 2015 @@ -59,8 +59,8 @@ public class SecurityContextTokenTest ex public void testBuild() { try { 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.prepare(doc, crypto); @@ -97,8 +97,8 @@ public class SecurityContextTokenTest ex public void testSCTDKTEncrypt() { try { 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.prepare(doc, crypto); @@ -146,8 +146,8 @@ public class SecurityContextTokenTest ex public void testSCTKDKTSign() { try { 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(ConversationConstants.VERSION_05_12); @@ -196,8 +196,8 @@ public class SecurityContextTokenTest ex public void testSCTKDKTSignAbsolute() { try { 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.prepare(doc, crypto); @@ -234,8 +234,8 @@ public class SecurityContextTokenTest ex public void testSCTKDKTSignEncrypt() { try { 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.prepare(doc, crypto); @@ -277,8 +277,8 @@ public class SecurityContextTokenTest ex public void testSCTKDKTEncryptSign() { try { 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.prepare(doc, crypto); @@ -325,8 +325,8 @@ public class SecurityContextTokenTest ex public void testSCTSign() { try { 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.prepare(doc, crypto); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java Fri Jun 19 10:47:06 2015 @@ -75,8 +75,8 @@ public class SignatureAlgorithmSuiteTest builder.setSignatureAlgorithm(WSConstants.RSA_SHA1); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -110,8 +110,8 @@ public class SignatureAlgorithmSuiteTest builder.setSignatureAlgorithm(WSConstants.DSA); 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, dsaCrypto, secHeader); if (LOG.isDebugEnabled()) { @@ -148,8 +148,8 @@ public class SignatureAlgorithmSuiteTest builder.setSignatureAlgorithm(SignatureMethod.HMAC_SHA1); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -211,8 +211,8 @@ public class SignatureAlgorithmSuiteTest builder.setSigCanonicalization(WSConstants.C14N_EXCL_WITH_COMMENTS); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -244,8 +244,8 @@ public class SignatureAlgorithmSuiteTest builder.setDigestAlgo(WSConstants.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 = builder.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java Fri Jun 19 10:47:06 2015 @@ -92,8 +92,8 @@ public class SignatureCRLTest extends or Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -124,8 +124,8 @@ public class SignatureCRLTest extends or Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -159,8 +159,8 @@ public class SignatureCRLTest extends or Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java Fri Jun 19 10:47:06 2015 @@ -69,8 +69,8 @@ public class SignatureCertConstraintsTes 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -104,8 +104,8 @@ public class SignatureCertConstraintsTes builder.setUseSingleCertificate(false); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Fri Jun 19 10:47:06 2015 @@ -99,8 +99,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -137,8 +137,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, clientCrypto, secHeader); if (LOG.isDebugEnabled()) { @@ -175,8 +175,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -213,8 +213,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -245,8 +245,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, CryptoFactory.getInstance("wss40badca.properties"), secHeader); @@ -324,8 +324,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, clientCrypto, secHeader); if (LOG.isDebugEnabled()) { @@ -363,8 +363,8 @@ public class SignatureCertTest extends o Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, clientCrypto, secHeader); if (LOG.isDebugEnabled()) { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java Fri Jun 19 10:47:06 2015 @@ -95,8 +95,8 @@ public class SignatureEncryptionTest ext LOG.info("Before Encryption...."); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document encryptedDoc = encrypt.build(doc, crypto, secHeader); @@ -137,8 +137,8 @@ public class SignatureEncryptionTest ext LOG.info("Before Encryption...."); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart part = new WSEncryptionPart( @@ -223,8 +223,8 @@ public class SignatureEncryptionTest ext LOG.info("Before Encryption...."); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); Document encryptedSignedDoc = encrypt.build(signedDoc, crypto, secHeader); @@ -254,8 +254,8 @@ public class SignatureEncryptionTest ext ""); encrypt.getParts().add(encP); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); Document encryptedSignedDoc = encrypt.build(signedDoc, crypto, secHeader); @@ -291,8 +291,8 @@ public class SignatureEncryptionTest ext LOG.info("Before Sign/Encryption...."); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document signedDoc = sign.build(doc, crypto, secHeader); Document encryptedSignedDoc = encrypt.build(signedDoc, crypto, secHeader); @@ -318,8 +318,8 @@ public class SignatureEncryptionTest ext Document doc = SOAPUtil.toSOAPPart(SOAPMSG); LOG.info("Before Sign/Encryption...."); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecEncryptedKey encrKey = new WSSecEncryptedKey(); encrKey.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java Fri Jun 19 10:47:06 2015 @@ -65,8 +65,8 @@ public class SignatureKeyValueTest exten builder.setUserInfo("wss40", "security"); builder.setKeyIdentifierType(WSConstants.KEY_VALUE); 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, crypto, secHeader); String outputString = @@ -107,8 +107,8 @@ public class SignatureKeyValueTest exten builder.setUserInfo("wss86", "security"); builder.setKeyIdentifierType(WSConstants.KEY_VALUE); 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("wss86.properties"), secHeader); @@ -142,8 +142,8 @@ public class SignatureKeyValueTest exten builder.setUserInfo("wss40DSA", "security"); builder.setKeyIdentifierType(WSConstants.KEY_VALUE); 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, crypto, secHeader); String outputString = Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java Fri Jun 19 10:47:06 2015 @@ -104,8 +104,8 @@ public class SignaturePartsTest extends Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -162,8 +162,8 @@ public class SignaturePartsTest extends Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -200,8 +200,8 @@ public class SignaturePartsTest extends Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -238,8 +238,8 @@ public class SignaturePartsTest extends Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -297,8 +297,8 @@ public class SignaturePartsTest extends wsSign.setUserInfo("wss40", "security"); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart("STRTransform", "", "Element"); @@ -355,8 +355,8 @@ public class SignaturePartsTest extends Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -384,8 +384,8 @@ public class SignaturePartsTest extends Document doc = SOAPUtil.toSOAPPart(SOAPMSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -415,8 +415,8 @@ public class SignaturePartsTest extends SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement()); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( @@ -485,8 +485,8 @@ public class SignaturePartsTest extends SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement()); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); // Give wrong names to make sure it's picking up the element WSEncryptionPart encP = @@ -532,8 +532,8 @@ public class SignaturePartsTest extends sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSEncryptionPart encP = new WSEncryptionPart( Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java Fri Jun 19 10:47:06 2015 @@ -86,8 +86,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); LOG.info("Before Signing IS...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -116,8 +116,8 @@ public class SignatureTest extends org.j builder.setIncludeSignatureToken(true); LOG.info("Before Signing IS...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -150,8 +150,8 @@ public class SignatureTest extends org.j WSSecSignature builder = new WSSecSignature(); 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 signedDoc = builder.build(doc, crypto, secHeader); Document signedDoc1 = builder.build(signedDoc, crypto, secHeader); verify(signedDoc1); @@ -169,8 +169,8 @@ public class SignatureTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); LOG.info("Before Signing...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -196,8 +196,8 @@ public class SignatureTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); LOG.info("Before Signing...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -237,8 +237,8 @@ public class SignatureTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); LOG.info("Before Signing...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -264,8 +264,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); LOG.info("Before Signing...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -300,8 +300,8 @@ public class SignatureTest extends org.j builder.setUseSingleCertificate(false); LOG.info("Before Signing...."); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Crypto pkiCrypto = CryptoFactory.getInstance("wss40.properties"); Document signedDoc = builder.build(doc, pkiCrypto, secHeader); @@ -329,8 +329,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER); LOG.info("Before Signing...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -368,8 +368,8 @@ public class SignatureTest extends org.j LOG.info("Before Signing ThumbprintSHA1...."); 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, crypto, secHeader); @@ -401,8 +401,8 @@ public class SignatureTest extends org.j LOG.info("Before Signing ThumbprintSHA1...."); 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, crypto, secHeader); @@ -439,8 +439,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER); 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, crypto, secHeader); Document signedDoc1 = builder.build(signedDoc, crypto, secHeader); @@ -461,8 +461,8 @@ public class SignatureTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); LOG.info("Before Signing...."); 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(300); @@ -508,8 +508,8 @@ public class SignatureTest extends org.j builder.setDigestAlgo("http://www.w3.org/2001/04/xmlenc#sha256";); LOG.info("Before Signing IS...."); 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, crypto, secHeader); if (LOG.isDebugEnabled()) { @@ -581,8 +581,8 @@ public class SignatureTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); LOG.info("Before Signing...."); 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, crypto, secHeader); // Add a comment node as the first node element @@ -609,8 +609,8 @@ public class SignatureTest extends org.j @org.junit.Test public void testSignedTimestamp() 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(300); @@ -656,8 +656,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - Element secHeaderElement = secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + Element secHeaderElement = secHeader.insertSecurityHeader(); Node textNode = doc.createTextNode("This is a text node"); secHeaderElement.appendChild(textNode); Document signedDoc = builder.build(doc, crypto, secHeader); @@ -682,8 +682,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); LOG.info("Before Signing IS...."); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); SecurityTokenReference secRef = new SecurityTokenReference(doc); Reference ref = new Reference(doc); @@ -715,8 +715,8 @@ public class SignatureTest extends org.j builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); LOG.info("Before Signing IS...."); 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, passwordCrypto, secHeader); if (LOG.isDebugEnabled()) { @@ -901,8 +901,8 @@ public class SignatureTest extends org.j builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security"); LOG.info("Before Signing...."); 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, crypto, secHeader); // Add a comment node Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java Fri Jun 19 10:47:06 2015 @@ -67,8 +67,8 @@ public class SignedBSTTest extends org.j @org.junit.Test public void testSignedBST() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); // Get a certificate, convert it into a BinarySecurityToken and add it to the security header CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java Fri Jun 19 10:47:06 2015 @@ -94,8 +94,8 @@ public class SymmetricSignatureTest exte public void testSymmetricSignatureSHA1() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - 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); @@ -127,8 +127,8 @@ public class SymmetricSignatureTest exte public void testSymmetricSignatureDR() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecEncryptedKey encrKey = new WSSecEncryptedKey(); encrKey.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); @@ -168,8 +168,8 @@ public class SymmetricSignatureTest exte Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); LOG.info("Before Sign/Encryption...."); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecEncryptedKey encrKey = new WSSecEncryptedKey(); encrKey.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java Fri Jun 19 10:47:06 2015 @@ -65,8 +65,8 @@ public class TimestampTest extends org.j public void testValidTimestamp() 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(300); @@ -103,8 +103,8 @@ public class TimestampTest extends org.j public void testValidTimestampNoExpires() 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(0); @@ -133,8 +133,8 @@ public class TimestampTest extends org.j public void testInvalidTimestampNoExpires() 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(0); @@ -180,8 +180,8 @@ public class TimestampTest 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); @@ -210,8 +210,8 @@ public class TimestampTest extends org.j public void testOldTimestamp() 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(); Document createdDoc = timestamp.build(doc, secHeader); @@ -246,8 +246,8 @@ public class TimestampTest extends org.j public void testNearFutureCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -294,8 +294,8 @@ public class TimestampTest extends org.j public void testFutureCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -340,8 +340,8 @@ public class TimestampTest extends org.j public void testExpiresBeforeCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -394,8 +394,8 @@ public class TimestampTest extends org.j public void testMultipleTimestamps() 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(300); @@ -432,8 +432,8 @@ public class TimestampTest extends org.j public void testMultipleCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -478,8 +478,8 @@ public class TimestampTest extends org.j public void testNoCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -528,8 +528,8 @@ public class TimestampTest extends org.j public void testMultipleExpires() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -585,8 +585,8 @@ public class TimestampTest extends org.j public void testExpiresInFrontOfCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -640,8 +640,8 @@ public class TimestampTest extends org.j public void testCreatedSeconds() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -685,8 +685,8 @@ public class TimestampTest extends org.j public void testCreatedValueType() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -738,8 +738,8 @@ public class TimestampTest extends org.j public void testCustomElement() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element timestampElement = doc.createElementNS( @@ -797,8 +797,8 @@ public class TimestampTest extends org.j public void testSpoofedTimestamp() 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(300); @@ -837,8 +837,8 @@ public class TimestampTest extends org.j public void testTimestampNoMilliseconds() 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.setPrecisionInMilliSeconds(false); @@ -868,8 +868,8 @@ public class TimestampTest extends org.j Locale.setDefault(new Locale("th", "TH")); 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(300); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java Fri Jun 19 10:47:06 2015 @@ -73,8 +73,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testUsernameTokenUnit() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); UsernameToken usernameToken = new UsernameToken(true, doc, null); usernameToken.setName("bob"); @@ -132,8 +132,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeyEncryption() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); @@ -183,8 +183,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeyEncryptionWithEncodedPassword() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setPasswordsAreEncoded(true); @@ -234,8 +234,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeyChangedEncryption() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); @@ -287,8 +287,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeyBadUserEncryption() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("colm", "security"); @@ -337,8 +337,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeySignature() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); @@ -386,8 +386,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeySignatureWithEncodedPassword() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setPasswordsAreEncoded(true); @@ -445,8 +445,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeyChangedSignature() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); @@ -496,8 +496,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testDerivedKeyBadUserSignature() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("colm", "security"); @@ -542,8 +542,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testNoSaltEncryption() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); UsernameToken usernameToken = new UsernameToken(true, doc, null); usernameToken.setName("bob"); @@ -593,8 +593,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testNoIterationEncryption() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); UsernameToken usernameToken = new UsernameToken(true, doc, null); usernameToken.setName("bob"); @@ -642,8 +642,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testLowIterationEncryption() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); UsernameToken usernameToken = new UsernameToken(true, doc, null); usernameToken.setName("bob"); @@ -704,8 +704,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testBadValueType() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); @@ -767,8 +767,8 @@ public class UTDerivedKeyTest extends or @org.junit.Test public void testKeyIdentifier() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java Fri Jun 19 10:47:06 2015 @@ -70,8 +70,8 @@ public class UTSignatureTest extends org @org.junit.Test public void testSignature() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("bob", "security"); @@ -121,8 +121,8 @@ public class UTSignatureTest extends org @org.junit.Test public void testBadUserSignature() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); WSSecUsernameToken builder = new WSSecUsernameToken(); builder.setUserInfo("colm", "security"); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java Fri Jun 19 10:47:06 2015 @@ -126,8 +126,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "verySecret"); LOG.info("Before adding UsernameToken PW Digest...."); 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()) { @@ -177,8 +177,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", Base64.encode(MessageDigest.getInstance("SHA-1").digest("verySecret".getBytes("UTF-8")))); LOG.info("Before adding UsernameToken PW Digest...."); 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()) { @@ -206,8 +206,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("badusername", "verySecret"); LOG.info("Before adding UsernameToken PW Digest...."); 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()) { @@ -237,8 +237,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "verySecre"); LOG.info("Before adding UsernameToken PW Digest...."); 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()) { @@ -266,8 +266,8 @@ public class UsernameTokenTest extends o 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()) { @@ -297,8 +297,8 @@ public class UsernameTokenTest extends o @org.junit.Test public void testNearFutureCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element usernameTokenElement = doc.createElementNS( @@ -362,8 +362,8 @@ public class UsernameTokenTest extends o @org.junit.Test public void testFutureCreated() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Element usernameTokenElement = doc.createElementNS( @@ -422,8 +422,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "verySecret"); LOG.info("Before adding UsernameToken PW Text...."); 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()) { LOG.debug("Message with UserNameToken PW Text:"); @@ -463,8 +463,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", passwdDigest); LOG.info("Before adding UsernameToken PW Text...."); 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()) { LOG.debug("Message with UserNameToken PW Text:"); @@ -484,8 +484,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "verySecre"); LOG.info("Before adding UsernameToken PW Text...."); 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()) { LOG.debug("Message with UserNameToken PW Text:"); @@ -565,8 +565,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("nopassuser", null); LOG.info("Before adding UsernameToken with no password...."); 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()) { String outputString = @@ -592,8 +592,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("emptyuser", ""); LOG.info("Before adding UsernameToken with an empty password...."); 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()) { String outputString = @@ -632,8 +632,8 @@ public class UsernameTokenTest extends o 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()) { @@ -663,8 +663,8 @@ public class UsernameTokenTest extends o 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()) { @@ -699,8 +699,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "BAD_PASSWORD"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document utDoc = builder.build(doc, secHeader); // @@ -742,8 +742,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "BAD_PASSWORD"); Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); - WSSecHeader secHeader = new WSSecHeader(); - secHeader.insertSecurityHeader(doc); + WSSecHeader secHeader = new WSSecHeader(doc); + secHeader.insertSecurityHeader(); Document utDoc = builder.build(doc, secHeader); // @@ -782,8 +782,8 @@ public class UsernameTokenTest extends o builder.setUserInfo("wernerd", "verySecret"); LOG.info("Before adding UsernameToken PW Digest...."); 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); String outputString = XMLUtils.PrettyDocumentToString(signedDoc); @@ -892,8 +892,8 @@ public class UsernameTokenTest extends o 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 utDoc = builder.build(doc, secHeader); // @@ -935,8 +935,8 @@ public class UsernameTokenTest extends o 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 utDoc = builder.build(doc, secHeader); // @@ -978,8 +978,8 @@ public class UsernameTokenTest extends o 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 utDoc = builder.build(doc, secHeader); // @@ -1021,8 +1021,8 @@ public class UsernameTokenTest extends o 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 utDoc = builder.build(doc, secHeader); // @@ -1093,8 +1093,8 @@ public class UsernameTokenTest extends o 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(); WSTimeSource spoofedTimeSource = new WSTimeSource() {
