Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java?rev=698575&r1=698574&r2=698575&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java Wed Sep 24 
06:59:05 2008
@@ -34,7 +34,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.security.WSPasswordCallback;
 import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.message.WSSAddSAMLToken;
+import org.apache.ws.security.message.WSSecHeader;
+import org.apache.ws.security.message.WSSecSAMLToken;
 import org.w3c.dom.Document;
 
 import org.opensaml.SAMLAssertion;
@@ -138,12 +139,14 @@
 
         SAMLAssertion assertion = saml.newAssertion();
 
-        WSSAddSAMLToken wsSign = new WSSAddSAMLToken();
+        WSSecSAMLToken wsSign = new WSSecSAMLToken();
 
         Document doc = unsignedEnvelope.getAsDocument();
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
         log.info("Before SAMLUnsignedSenderVouches....");
         
-        Document signedDoc = wsSign.build(doc, assertion);
+        Document signedDoc = wsSign.build(doc, assertion, secHeader);
         log.info("After SAMLUnsignedSenderVouches....");
 
         /*

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java?rev=698575&r1=698574&r2=698575&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java Wed Sep 24 
06:59:05 2008
@@ -177,7 +177,7 @@
     /**
      * Test for a X509 V1 certificate used for encryption/decryption.
      * This time a KeyIdentifier is used. This test should fail as the
-     * X.509 1.1 specification states that a KeyIdentifer should only
+     * X.509 1.1 specification states that a KeyIdentifier should only
      * reference a V3 certificate.
      */
     public void testX509v1KeyIdentifier() throws Exception {

Modified: webservices/wss4j/trunk/xdocs/axis.xml
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/xdocs/axis.xml?rev=698575&r1=698574&r2=698575&view=diff
==============================================================================
--- webservices/wss4j/trunk/xdocs/axis.xml (original)
+++ webservices/wss4j/trunk/xdocs/axis.xml Wed Sep 24 06:59:05 2008
@@ -201,7 +201,7 @@
 // set the password given a username<br></br>
     </span>               
     <span style="color: rgb(0, 0, 153);">if
-("wss4j".equals(pc.getIdentifer())) {</span><br style="color: rgb(0, 0, 
153);"></br>
+("wss4j".equals(pc.getIdentifier())) {</span><br style="color: rgb(0, 0, 
153);"></br>
     <span style="color: rgb(0, 0, 153);">                   
 pc.setPassword("security");</span><br style="color: rgb(0, 0, 153);"></br>
     <span style="color: rgb(0, 0, 153);">               
@@ -310,7 +310,7 @@
     <span style="color: rgb(0, 0, 153);">               
 // set the password given a username</span><br style="color: rgb(0, 0, 
153);"></br>
     <span style="color: rgb(0, 0, 153);">               
-if ("wss4j".equals(pc.getIdentifer())) {</span><br style="color: rgb(0, 0, 
153);"></br>
+if ("wss4j".equals(pc.getIdentifier())) {</span><br style="color: rgb(0, 0, 
153);"></br>
     <span style="color: rgb(0, 0, 153);">                   
 pc.setPassword("security");</span><br style="color: rgb(0, 0, 153);"></br>
     <span style="color: rgb(0, 0, 153);">               



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to