You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by we...@apache.org on 2007/04/28 09:33:51 UTC
svn commit: r533312 - /webservices/wss4j/trunk/test/wssec/
Author: werner
Date: Sat Apr 28 00:33:47 2007
New Revision: 533312
URL: http://svn.apache.org/viewvc?view=rev&rev=533312
Log:
Change test cases to use the toAxisMessage() function instead
of toSOAPMessage(). Required for Java 6
Modified:
webservices/wss4j/trunk/test/wssec/TestBase64.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew10.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew7.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew8.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew9.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSOAP12.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java
Modified: webservices/wss4j/trunk/test/wssec/TestBase64.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestBase64.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestBase64.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestBase64.java Sat Apr 28 00:33:47 2007
@@ -109,7 +109,6 @@
public void testDecode() {
byte[] out = null;
- byte[] outBinary = null;
try {
out = Base64.decode(thisIsATestEnc);
} catch (WSSecurityException ex) {
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java Sat Apr 28 00:33:47 2007
@@ -31,7 +31,6 @@
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoBase;
import org.apache.ws.security.components.crypto.CryptoFactory;
import org.apache.ws.security.message.WSSecSignature;
import org.apache.ws.security.message.WSSecHeader;
@@ -133,7 +132,7 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew10.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew10.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew10.java Sat Apr 28 00:33:47 2007
@@ -72,7 +72,7 @@
Message message;
- private byte[] sharedSecret = "SriLankaSriLankaSriLanka".getBytes();
+ // private byte[] sharedSecret = "SriLankaSriLankaSriLanka".getBytes();
/**
* TestWSSecurity constructor <p/>
@@ -139,7 +139,6 @@
public void testEMBED_SECURITY_TOKEN_REF() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt wsEncrypt = new WSSecEncrypt();
// Get the message as document
@@ -188,12 +187,12 @@
/*
* convert the resulting document into a message first. The
- * toSOAPMessage() mehtod performs the necessary c14n call to properly
+ * toAxisMessage() mehtod performs the necessary c14n call to properly
* set up the signed document and convert it into a SOAP message. After
* that we extract it as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(encDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(encDoc);
if (log.isDebugEnabled()) {
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope()
@@ -210,10 +209,10 @@
* @throws Exception
* Thrown when there is a problem in verification
*/
- private void verifyEMBED_SECURITY_TOKEN_REF(Document doc) throws Exception {
- secEngine.processSecurityHeader(doc, "", this, null);
- log.info("Success ......");
- }
+// private void verifyEMBED_SECURITY_TOKEN_REF(Document doc) throws Exception {
+// secEngine.processSecurityHeader(doc, "", this, null);
+// log.info("Success ......");
+// }
/*
* (non-Javadoc)
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java Sat Apr 28 00:33:47 2007
@@ -126,7 +126,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509SignatureDirectSTR() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss4jcert", "security");
// builder.setUserInfo("john", "keypass");
@@ -162,13 +161,13 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with STR DirectReference key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java Sat Apr 28 00:33:47 2007
@@ -124,7 +124,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509SignatureDSA_SKI() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss4jcertDSA", "security");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
@@ -140,13 +139,13 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with DSA_SKI key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -167,7 +166,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509SignatureDSA_Autodetect() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss4jcertDSA", "security");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
@@ -182,13 +180,13 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with DSA_Autodetect:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -209,7 +207,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509SignatureRSA_Autodetect() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss4jcert", "security");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
@@ -224,13 +221,13 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with RSA Autodetect:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java Sat Apr 28 00:33:47 2007
@@ -126,7 +126,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testUsernameTokenSigning() throws Exception {
- SOAPEnvelope envelope = null;
Document doc = unsignedEnvelope.getAsDocument();
WSSecHeader secHeader = new WSSecHeader();
@@ -148,7 +147,7 @@
log.info("Before adding UsernameToken PW Text....");
builder.prependToHeader(secHeader);
Document signedDoc = doc;
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Message with UserNameToken PW Text:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java Sat Apr 28 00:33:47 2007
@@ -121,7 +121,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509SignatureThumb() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
@@ -135,13 +134,13 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with ThumbprintSHA1 key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -159,7 +158,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testDoubleX509SignatureThumb() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
// builder.setUserInfo("john", "keypass");
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java Sat Apr 28 00:33:47 2007
@@ -151,7 +151,6 @@
*/
public void testEncryptionDecryptionRSA15() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss4jcert");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -199,14 +198,14 @@
/*
* convert the resulting document into a message first. The
- * toSOAPMessage() method performs the necessary c14n call to properly
+ * toAxisMessage() method performs the necessary c14n call to properly
* set up the signed document and convert it into a SOAP message. Check
* that the contents can't be read (checking if we can find a specific
* substring). After that we extract it as a document again for further
* processing.
*/
- Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-15 keytransport, 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope()
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java Sat Apr 28 00:33:47 2007
@@ -134,7 +134,6 @@
*/
public void testEncryptionDecryptionRSA15() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss4jcert");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -147,14 +146,14 @@
log.info("After Encryption Triple DES....");
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* method performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. Check that the contents can't
* be read (cheching if we can find a specific substring). After that we extract it
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-15 keytransport, 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -206,7 +205,6 @@
*/
public void testEncryptionDecryptionOAEP() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss4jcert");
builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java Sat Apr 28 00:33:47 2007
@@ -120,7 +120,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509Signature() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
log.info("Before Signing....");
@@ -130,13 +129,13 @@
Document signedDoc = builder.build(doc, CryptoFactory.getInstance(), secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
log.info("After Signing....");
verify(signedDoc);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java Sat Apr 28 00:33:47 2007
@@ -121,7 +121,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testUsernameTokenDigest() throws Exception {
- SOAPEnvelope envelope = null;
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
log.info("Before adding UsernameToken PW Digest....");
@@ -131,13 +130,13 @@
Document signedDoc = builder.build(doc, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* method performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Message with UserNameToken PW Digest:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -154,7 +153,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testUsernameTokenText() throws Exception {
- SOAPEnvelope envelope = null;
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_TEXT);
builder.setUserInfo("wernerd", "verySecret");
@@ -163,7 +161,7 @@
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
Document signedDoc = builder.build(doc, secHeader);
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Message with UserNameToken PW Text:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java Sat Apr 28 00:33:47 2007
@@ -133,7 +133,6 @@
*/
public void testEncryptionSigning() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
@@ -149,13 +148,12 @@
secHeader);
/*
* convert the resulting document into a message first. The
- * toSOAPMessage() mehtod performs the necessary c14n call to properly
+ * toAxisMessage() mehtod performs the necessary c14n call to properly
* set up the signed document and convert it into a SOAP message. After
* that we extract it as a document again for further processing.
*/
- Message encryptedMsg = (Message) SOAPUtil
- .toSOAPMessage(encryptedSignedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedSignedDoc);
String s = encryptedMsg.getSOAPPartAsString();
((SOAPPart) message.getSOAPPart()).setCurrentMessage(s,
SOAPPart.FORM_STRING);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew7.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew7.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew7.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew7.java Sat Apr 28 00:33:47 2007
@@ -131,7 +131,6 @@
*/
public void testEncryptionEncryption() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
log.info("Before Encryption....");
@@ -145,13 +144,12 @@
/*
* convert the resulting document into a message first. The
- * toSOAPMessage() mehtod performs the necessary c14n call to properly
+ * toAxisMessage() mehtod performs the necessary c14n call to properly
* set up the signed document and convert it into a SOAP message. After
* that we extract it as a document again for further processing.
*/
- Message encryptedMsg = (Message) SOAPUtil
- .toSOAPMessage(encryptedEncryptedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedEncryptedDoc);
encryptedEncryptedDoc = encryptedMsg.getSOAPEnvelope().getAsDocument();
log.info("After Encryption....");
verify(encryptedEncryptedDoc);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew8.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew8.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew8.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew8.java Sat Apr 28 00:33:47 2007
@@ -134,7 +134,6 @@
*/
public void testSigningEncryptionIS3DES() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
@@ -154,13 +153,13 @@
Document signedDoc = sign.build(doc, crypto, secHeader);
Document encryptedSignedDoc = encrypt.build(signedDoc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisPMessage()
* method performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedSignedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedSignedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed and encrypted message with IssuerSerial key identifier (both), 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew9.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew9.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew9.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew9.java Sat Apr 28 00:33:47 2007
@@ -150,7 +150,6 @@
*/
public void testSigningEncryptionEmbedded() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
@@ -167,13 +166,13 @@
Document signedDoc = sign.build(doc, crypto, secHeader);
Document encryptedSignedDoc = encrypt.build(signedDoc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedSignedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedSignedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-OAEP keytransport, 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java Sat Apr 28 00:33:47 2007
@@ -152,7 +152,7 @@
encrKeyBuilder.prependBSTElementToHeader(secHeader);
- Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message: 3DES + DerivedKeys");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope()
@@ -192,7 +192,7 @@
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
- Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
+ Message encryptedMsg = SOAPUtil.toAxisMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message: 3DES + DerivedKeys");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope()
@@ -223,12 +223,12 @@
WSSecDKSign sigBuilder = new WSSecDKSign();
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
- Document signedDoc = sigBuilder.build(doc, secHeader);
+ /* Document signedDoc = */ sigBuilder.build(doc, secHeader);
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
- Message signedMessage = (Message) SOAPUtil.toSOAPMessage(doc);
+ Message signedMessage = SOAPUtil.toAxisMessage(doc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message: 3DES + DerivedKeys");
XMLUtils.PrettyElementToWriter(signedMessage.getSOAPEnvelope()
@@ -272,8 +272,7 @@
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
- Message signedMessage = (Message) SOAPUtil
- .toSOAPMessage(signedEncryptedDoc);
+ Message signedMessage = SOAPUtil.toAxisMessage(signedEncryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message: 3DES + DerivedKeys");
@@ -318,8 +317,7 @@
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
- Message signedMessage = (Message) SOAPUtil
- .toSOAPMessage(encryptedSignedDoc);
+ Message signedMessage = SOAPUtil.toAxisMessage(encryptedSignedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message: 3DES + DerivedKeys");
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSOAP12.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSOAP12.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSOAP12.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSOAP12.java Sat Apr 28 00:33:47 2007
@@ -119,7 +119,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testX509Signature() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
// builder.setUserInfo("john", "keypass");
@@ -132,13 +131,13 @@
Document signedDoc = builder.build(doc, crypto, secHeader);
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* mehtod performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message SOAP 1.2:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -155,7 +154,6 @@
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
public void testDoubleX509Signature() throws Exception {
- SOAPEnvelope envelope = null;
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
// builder.setUserInfo("john", "keypass");
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java Sat Apr 28 00:33:47 2007
@@ -135,7 +135,6 @@
*/
public void testSAMLUnsignedSenderVouches() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
SAMLIssuer saml = SAMLIssuerFactory.getInstance("saml.properties");
SAMLAssertion assertion = saml.newAssertion();
@@ -149,19 +148,19 @@
log.info("After SAMLUnsignedSenderVouches....");
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* method performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. Check that the contents can't
* be read (cheching if we can find a specific substring). After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Unsigned SAML message (sender vouches):");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
}
- String encryptedString = signedMsg.getSOAPPartAsString();
+ // String encryptedString = signedMsg.getSOAPPartAsString();
signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
verify(signedDoc);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java Sat Apr 28 00:33:47 2007
@@ -159,19 +159,19 @@
log.info("After SAMLSignedSenderVouches....");
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* method performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. Check that the contents can't
* be read (cheching if we can find a specific substring). After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed SAML message (sender vouches):");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
}
- String encryptedString = signedMsg.getSOAPPartAsString();
+ // String encryptedString = signedMsg.getSOAPPartAsString();
signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
verify(signedDoc);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java?view=diff&rev=533312&r1=533311&r2=533312
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java Sat Apr 28 00:33:47 2007
@@ -139,7 +139,6 @@
*/
public void testSAMLSignedKeyHolder() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- SOAPEnvelope envelope = null;
Document doc = unsignedEnvelope.getAsDocument();
@@ -167,19 +166,19 @@
log.info("After SAMLSignedKeyHolder....");
/*
- * convert the resulting document into a message first. The toSOAPMessage()
+ * convert the resulting document into a message first. The toAxisMessage()
* method performs the necessary c14n call to properly set up the signed
* document and convert it into a SOAP message. Check that the contents can't
* be read (cheching if we can find a specific substring). After that we extract it
* as a document again for further processing.
*/
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed SAML message (key holder):");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
}
- String encryptedString = signedMsg.getSOAPPartAsString();
+ // String encryptedString = signedMsg.getSOAPPartAsString();
signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
verify(signedDoc);
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org