You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/08/20 13:16:35 UTC
svn commit: r1374972 [4/5] - in /webservices/wss4j/trunk:
streaming-ws-security/src/main/java/org/apache/ws/security/stax/wss/impl/saml/
streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/
streaming-ws-security/src/test/java/org/a...
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TestMessageTransformer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TestMessageTransformer.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TestMessageTransformer.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TestMessageTransformer.java Mon Aug 20 11:16:30 2012
@@ -24,6 +24,9 @@ import java.util.LinkedList;
import java.util.List;
import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+
+import org.apache.ws.security.common.util.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -40,7 +43,7 @@ public class TestMessageTransformer exte
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
.getLog(TestMessageTransformer.class);
- public static Element duplicateEncryptedDataInWsseHeader(Element saaj, boolean moveReferenceList) {
+ public static Element duplicateEncryptedDataInWsseHeader(Element saaj, boolean moveReferenceList) throws TransformerException {
if (moveReferenceList) {
moveReferenceList(saaj);
}
@@ -76,7 +79,7 @@ public class TestMessageTransformer exte
return newEncData;
}
- public static Element duplicateEncryptedDataInWsseWrapperHeader(Element saaj, boolean moveReferenceList) {
+ public static Element duplicateEncryptedDataInWsseWrapperHeader(Element saaj, boolean moveReferenceList) throws TransformerException {
if (moveReferenceList) {
moveReferenceList(saaj);
}
@@ -116,7 +119,7 @@ public class TestMessageTransformer exte
}
public static Element duplicateEncryptedDataInExternalWrapperElement(Element saaj,
- boolean moveReferenceList) {
+ boolean moveReferenceList) throws TransformerException {
if (moveReferenceList) {
moveReferenceList(saaj);
}
@@ -154,7 +157,7 @@ public class TestMessageTransformer exte
return newEncData;
}
- public static Element addEncryptedDataWithEmbeddedEncryptedKeyInWsseHeader(Element saaj) {
+ public static Element addEncryptedDataWithEmbeddedEncryptedKeyInWsseHeader(Element saaj) throws TransformerException {
moveReferenceList(saaj);
Element body = getFirstChildElement(saaj, new QName("http://schemas.xmlsoap.org/soap/envelope/",
"Body"), true);
@@ -224,10 +227,10 @@ public class TestMessageTransformer exte
ref.getParentNode().appendChild(newRef);
}
- private static void print(Document doc) {
+ private static void print(Document doc) throws TransformerException {
if (LOG.isDebugEnabled()) {
LOG.debug("After transformation....");
- String outputString = org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ String outputString = XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java Mon Aug 20 11:16:30 2012
@@ -25,6 +25,7 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.util.XmlSchemaDateFormat;
@@ -59,7 +60,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(createdDoc);
+ XMLUtils.PrettyDocumentToString(createdDoc);
LOG.debug(outputString);
}
@@ -97,7 +98,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(createdDoc);
+ XMLUtils.PrettyDocumentToString(createdDoc);
LOG.debug(outputString);
}
@@ -131,7 +132,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(createdDoc);
+ XMLUtils.PrettyDocumentToString(createdDoc);
LOG.debug(outputString);
}
@@ -160,7 +161,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(createdDoc);
+ XMLUtils.PrettyDocumentToString(createdDoc);
LOG.debug(outputString);
}
@@ -210,7 +211,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -258,7 +259,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -315,7 +316,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -349,7 +350,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(createdDoc);
+ XMLUtils.PrettyDocumentToString(createdDoc);
LOG.debug(outputString);
}
@@ -402,7 +403,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -447,7 +448,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -495,7 +496,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -547,7 +548,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -591,7 +592,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -642,7 +643,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
@@ -702,7 +703,7 @@ public class TimestampTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
//
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java Mon Aug 20 11:16:30 2012
@@ -29,6 +29,7 @@ import org.apache.ws.security.common.Use
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.token.SecurityTokenReference;
import org.apache.ws.security.message.token.UsernameToken;
import org.apache.ws.security.util.Base64;
@@ -85,7 +86,7 @@ public class UTDerivedKeyTest extends or
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -146,7 +147,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -190,7 +191,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -241,7 +242,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -292,7 +293,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -342,7 +343,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -392,7 +393,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -448,7 +449,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
@@ -494,7 +495,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
@@ -542,7 +543,7 @@ public class UTDerivedKeyTest extends or
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") == -1);
@@ -591,7 +592,7 @@ public class UTDerivedKeyTest extends or
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -641,7 +642,7 @@ public class UTDerivedKeyTest extends or
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -698,7 +699,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -761,7 +762,7 @@ public class UTDerivedKeyTest extends or
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java Mon Aug 20 11:16:30 2012
@@ -29,6 +29,7 @@ import org.apache.ws.security.common.Use
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -82,7 +83,7 @@ public class UTSignatureTest extends org
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -126,7 +127,7 @@ public class UTSignatureTest extends org
builder.prependToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
@@ -169,7 +170,7 @@ public class UTSignatureTest extends org
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
@@ -216,7 +217,7 @@ public class UTSignatureTest extends org
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("wsse:Username") != -1);
assertTrue(outputString.indexOf("wsse:Password") == -1);
assertTrue(outputString.indexOf("wsse11:Salt") != -1);
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java Mon Aug 20 11:16:30 2012
@@ -25,6 +25,7 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
@@ -79,7 +80,7 @@ public class UTWseSignatureTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Text:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Text....");
@@ -120,7 +121,7 @@ public class UTWseSignatureTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("Message using a 32 byte key length:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -168,7 +169,7 @@ public class UTWseSignatureTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("Username Token Signature via WSHandler");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -224,7 +225,7 @@ public class UTWseSignatureTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Digest....");
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java Mon Aug 20 11:16:30 2012
@@ -29,6 +29,7 @@ import org.apache.ws.security.common.Use
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSPasswordCallback;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.token.UsernameToken;
@@ -121,7 +122,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Digest....");
@@ -171,7 +172,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Digest....");
@@ -198,7 +199,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Digest....");
@@ -229,7 +230,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Digest....");
@@ -258,7 +259,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Text:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Text....");
@@ -298,7 +299,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Text:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
}
@@ -319,7 +320,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Text:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After adding UsernameToken PW Text....");
@@ -345,7 +346,7 @@ public class UsernameTokenTest extends o
Document doc = SOAPUtil.toSOAPPart(SOAPUTMSG);
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -372,7 +373,7 @@ public class UsernameTokenTest extends o
Document doc = SOAPUtil.toSOAPPart(SOAPUTNOUSERMSG);
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
try {
@@ -399,7 +400,7 @@ public class UsernameTokenTest extends o
Document signedDoc = builder.build(doc, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -426,7 +427,7 @@ public class UsernameTokenTest extends o
Document signedDoc = builder.build(doc, secHeader);
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
secEngine.processSecurityHeader(doc, null, this, null);
@@ -441,7 +442,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Empty password message: ");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -466,7 +467,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Text:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
try {
@@ -496,7 +497,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW custom type:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -543,7 +544,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(utDoc);
+ XMLUtils.PrettyDocumentToString(utDoc);
LOG.debug(outputString);
}
@@ -586,7 +587,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(utDoc);
+ XMLUtils.PrettyDocumentToString(utDoc);
LOG.debug(outputString);
}
@@ -615,7 +616,7 @@ public class UsernameTokenTest extends o
secHeader.insertSecurityHeader(doc);
Document signedDoc = builder.build(doc, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
assertTrue(outputString.indexOf("EncodingType") != -1);
}
@@ -642,7 +643,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Username Token via WSHandler");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
}
@@ -669,7 +670,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Username Token via WSHandler");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
}
@@ -697,7 +698,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
LOG.debug("Username Token with an empty password via WSHandler");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
}
@@ -727,7 +728,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(utDoc);
+ XMLUtils.PrettyDocumentToString(utDoc);
LOG.debug(outputString);
}
@@ -769,7 +770,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(utDoc);
+ XMLUtils.PrettyDocumentToString(utDoc);
LOG.debug(outputString);
}
@@ -811,7 +812,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(utDoc);
+ XMLUtils.PrettyDocumentToString(utDoc);
LOG.debug(outputString);
}
@@ -854,7 +855,7 @@ public class UsernameTokenTest extends o
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(utDoc);
+ XMLUtils.PrettyDocumentToString(utDoc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java Mon Aug 20 11:16:30 2012
@@ -29,6 +29,7 @@ import org.apache.ws.security.common.SOA
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecSignature;
@@ -85,7 +86,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -126,7 +127,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -167,7 +168,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -192,7 +193,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -226,7 +227,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -279,7 +280,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
}
@@ -320,7 +321,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
}
@@ -358,7 +359,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
}
@@ -399,7 +400,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
}
@@ -419,7 +420,7 @@ public class BSTKerberosTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
return results;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java Mon Aug 20 11:16:30 2012
@@ -28,6 +28,7 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -68,7 +69,7 @@ public class BinarySecurityTokenTest ext
if (LOG.isDebugEnabled()) {
LOG.debug("BST output");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -111,7 +112,7 @@ public class BinarySecurityTokenTest ext
if (LOG.isDebugEnabled()) {
LOG.debug("PKIPath output");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -147,7 +148,7 @@ public class BinarySecurityTokenTest ext
if (LOG.isDebugEnabled()) {
LOG.debug("Custom Token output");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/KerberosTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/KerberosTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/KerberosTest.java Mon Aug 20 11:16:30 2012
@@ -25,6 +25,7 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSignature;
@@ -80,7 +81,7 @@ public class KerberosTest extends org.ju
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -185,7 +186,7 @@ public class KerberosTest extends org.ju
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -247,7 +248,7 @@ public class KerberosTest extends org.ju
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -304,7 +305,7 @@ public class KerberosTest extends org.ju
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -361,7 +362,7 @@ public class KerberosTest extends org.ju
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -420,7 +421,7 @@ public class KerberosTest extends org.ju
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java Mon Aug 20 11:16:30 2012
@@ -22,7 +22,7 @@ package org.apache.ws.security.message.t
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.util.DOM2Writer;
+import org.apache.ws.security.common.util.DOM2Writer;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java Mon Aug 20 11:16:30 2012
@@ -24,6 +24,7 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.XMLUtils;
import org.w3c.dom.Document;
import javax.security.auth.callback.CallbackHandler;
@@ -76,7 +77,7 @@ public class WCFUsernameTokenTest extend
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
try {
@@ -99,7 +100,7 @@ public class WCFUsernameTokenTest extend
if (LOG.isDebugEnabled()) {
LOG.debug("Message with UserNameToken PW Digest:");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
WSSConfig wssConfig = secEngine.getWssConfig();
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/PrincipalTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/PrincipalTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/PrincipalTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/PrincipalTest.java Mon Aug 20 11:16:30 2012
@@ -33,14 +33,15 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
import org.apache.ws.security.message.WSSecUsernameToken;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.X509Security;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.validate.Credential;
import org.apache.ws.security.validate.Validator;
@@ -76,7 +77,7 @@ public class PrincipalTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
List<WSSecurityEngineResult> results = verify(signedDoc, null);
@@ -107,7 +108,7 @@ public class PrincipalTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
List<WSSecurityEngineResult> results =
@@ -142,7 +143,7 @@ public class PrincipalTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -183,7 +184,7 @@ public class PrincipalTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -225,7 +226,7 @@ public class PrincipalTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -266,7 +267,7 @@ public class PrincipalTest extends org.j
if (LOG.isDebugEnabled()) {
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlConditionsTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlConditionsTest.java Mon Aug 20 11:16:30 2012
@@ -30,11 +30,12 @@ import org.apache.ws.security.common.SAM
import org.apache.ws.security.common.SAML2CallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.bean.ConditionsBean;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.bean.ConditionsBean;
import org.apache.ws.security.util.WSSecurityUtil;
import org.joda.time.DateTime;
import org.w3c.dom.Document;
@@ -85,7 +86,7 @@ public class SamlConditionsTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -130,7 +131,7 @@ public class SamlConditionsTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -173,7 +174,7 @@ public class SamlConditionsTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -216,7 +217,7 @@ public class SamlConditionsTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -234,7 +235,7 @@ public class SamlConditionsTest extends
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, null, null);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java Mon Aug 20 11:16:30 2012
@@ -33,15 +33,16 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.crypto.Merlin;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLCallback;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.bean.SubjectBean;
+import org.apache.ws.security.common.saml.builder.SAML1Constants;
+import org.apache.ws.security.common.saml.builder.SAML2Constants;
import org.apache.ws.security.common.util.Loader;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLCallback;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.bean.SubjectBean;
-import org.apache.ws.security.saml.ext.builder.SAML1Constants;
-import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.w3c.dom.Document;
import javax.security.auth.callback.Callback;
@@ -126,7 +127,7 @@ public class SamlNegativeTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -179,7 +180,7 @@ public class SamlNegativeTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("Signed (modified) SAML message (key holder):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -225,7 +226,7 @@ public class SamlNegativeTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("Signed (modified) SAML message (key holder):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -261,7 +262,7 @@ public class SamlNegativeTest extends or
Document signedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (key holder):");
LOG.debug(outputString);
@@ -301,7 +302,7 @@ public class SamlNegativeTest extends or
Document signedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (unsigned key holder):");
LOG.debug(outputString);
@@ -348,7 +349,7 @@ public class SamlNegativeTest extends or
wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("Untrusted signed SAML 2 Authn Assertion (key holder):");
LOG.debug(outputString);
@@ -374,7 +375,7 @@ public class SamlNegativeTest extends or
doc, null, callbackHandler, sigCrypto, userCrypto
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java Mon Aug 20 11:16:30 2012
@@ -32,13 +32,14 @@ import org.apache.ws.security.common.SOA
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.Merlin;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.builder.SAML1Constants;
+import org.apache.ws.security.common.saml.builder.SAML2Constants;
import org.apache.ws.security.common.util.Loader;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.builder.SAML1Constants;
-import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -113,7 +114,7 @@ public class SamlReferenceTest extends o
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML message Key Identifier (sender vouches):");
LOG.debug(outputString);
@@ -177,7 +178,7 @@ public class SamlReferenceTest extends o
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML message Direct Reference (sender vouches):");
LOG.debug(outputString);
@@ -241,7 +242,7 @@ public class SamlReferenceTest extends o
wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML message Key Identifier (holder-of-key):");
LOG.debug(outputString);
@@ -305,7 +306,7 @@ public class SamlReferenceTest extends o
wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML message Direct Reference (holder-of-key):");
LOG.debug(outputString);
@@ -374,7 +375,7 @@ public class SamlReferenceTest extends o
secHeaderElement.appendChild(assertionNode);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.PrettyDocumentToString(encryptedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message:");
LOG.debug(outputString);
@@ -432,7 +433,7 @@ public class SamlReferenceTest extends o
builder.appendToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted SAML 1.1 message Key Identifier (holder-of-key):");
LOG.debug(outputString);
@@ -508,7 +509,7 @@ public class SamlReferenceTest extends o
builder.appendToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted SAML 1.1 message Direct Reference (holder-of-key):");
LOG.debug(outputString);
@@ -567,7 +568,7 @@ public class SamlReferenceTest extends o
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML2 message Key Identifier (sender vouches):");
LOG.debug(outputString);
@@ -630,7 +631,7 @@ public class SamlReferenceTest extends o
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML2 message Direct Reference (sender vouches):");
LOG.debug(outputString);
@@ -694,7 +695,7 @@ public class SamlReferenceTest extends o
wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML2 message Key Identifier (holder-of-key):");
LOG.debug(outputString);
@@ -758,7 +759,7 @@ public class SamlReferenceTest extends o
wsSign.build(doc, userCrypto, assertion, null, null, null, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML2 message Direct Reference (holder-of-key):");
LOG.debug(outputString);
@@ -833,7 +834,7 @@ public class SamlReferenceTest extends o
builder.appendToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted SAML 2 message Key Identifier (holder-of-key):");
LOG.debug(outputString);
@@ -909,7 +910,7 @@ public class SamlReferenceTest extends o
builder.appendToHeader(secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted SAML 2 message Direct Reference (holder-of-key):");
LOG.debug(outputString);
@@ -952,7 +953,7 @@ public class SamlReferenceTest extends o
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, callbackHandler, verifyCrypto, decCrypto);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenDerivedTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenDerivedTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenDerivedTest.java Mon Aug 20 11:16:30 2012
@@ -32,12 +32,13 @@ import org.apache.ws.security.common.cry
import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.builder.SAML1Constants;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecDKSign;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.token.SecurityTokenReference;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -101,7 +102,7 @@ public class SamlTokenDerivedTest extend
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion Derived (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -200,7 +201,7 @@ public class SamlTokenDerivedTest extend
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java Mon Aug 20 11:16:30 2012
@@ -29,12 +29,13 @@ import org.apache.ws.security.common.SAM
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.builder.SAML1Constants;
+import org.apache.ws.security.common.saml.builder.SAML2Constants;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.builder.SAML1Constants;
-import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -83,7 +84,7 @@ public class SamlTokenHOKTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (holder-of-key):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -117,7 +118,7 @@ public class SamlTokenHOKTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (holder-of-key):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -157,7 +158,7 @@ public class SamlTokenHOKTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Attr Assertion (holder-of-key):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -165,7 +166,7 @@ public class SamlTokenHOKTest extends or
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, new KeystoreCallbackHandler(), crypto, decCrypto);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
WSSecurityEngineResult actionResult =
@@ -202,7 +203,7 @@ public class SamlTokenHOKTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (holder-of-key):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -242,7 +243,7 @@ public class SamlTokenHOKTest extends or
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Attr Assertion (holder-of-key):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -250,7 +251,7 @@ public class SamlTokenHOKTest extends or
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, new KeystoreCallbackHandler(), crypto, decCrypto);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
WSSecurityEngineResult actionResult =
@@ -271,7 +272,7 @@ public class SamlTokenHOKTest extends or
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, null, crypto);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java Mon Aug 20 11:16:30 2012
@@ -31,13 +31,14 @@ import org.apache.ws.security.common.SAM
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.crypto.Crypto;
import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.builder.SAML1Constants;
+import org.apache.ws.security.common.saml.builder.SAML2Constants;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.builder.SAML1Constants;
-import org.apache.ws.security.saml.ext.builder.SAML2Constants;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -92,7 +93,7 @@ public class SamlTokenSVTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -147,7 +148,7 @@ public class SamlTokenSVTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -207,7 +208,7 @@ public class SamlTokenSVTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Attr Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -266,7 +267,7 @@ public class SamlTokenSVTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -326,7 +327,7 @@ public class SamlTokenSVTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Attr Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -383,7 +384,7 @@ public class SamlTokenSVTest extends org
if (LOG.isDebugEnabled()) {
LOG.debug("Signed SAML message (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.PrettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -450,7 +451,7 @@ public class SamlTokenSVTest extends org
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java?rev=1374972&r1=1374971&r2=1374972&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java Mon Aug 20 11:16:30 2012
@@ -30,14 +30,15 @@ import org.apache.ws.security.common.SAM
import org.apache.ws.security.common.SAMLElementCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.saml.AssertionWrapper;
+import org.apache.ws.security.common.saml.SAMLParms;
+import org.apache.ws.security.common.saml.bean.SubjectConfirmationDataBean;
+import org.apache.ws.security.common.saml.builder.SAML1Constants;
+import org.apache.ws.security.common.util.XMLUtils;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSAMLToken;
-import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.saml.ext.SAMLParms;
-import org.apache.ws.security.saml.ext.bean.SubjectConfirmationDataBean;
-import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.util.WSSecurityUtil;
import org.joda.time.DateTime;
@@ -94,7 +95,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -128,7 +129,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -166,7 +167,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches - from an Element):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -204,7 +205,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Attr Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -242,7 +243,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authz Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -279,7 +280,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -316,7 +317,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Attr Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -354,7 +355,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authz Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -393,7 +394,7 @@ public class SamlTokenTest extends org.j
true
);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Unsigned SAML 1.1 authentication assertion via an Action:");
LOG.debug(outputString);
@@ -435,7 +436,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -473,7 +474,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -509,7 +510,7 @@ public class SamlTokenTest extends org.j
Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
LOG.debug(outputString);
@@ -549,7 +550,7 @@ public class SamlTokenTest extends org.j
Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
LOG.debug(outputString);
@@ -589,7 +590,7 @@ public class SamlTokenTest extends org.j
Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authn Assertion (sender vouches):");
LOG.debug(outputString);
@@ -630,7 +631,7 @@ public class SamlTokenTest extends org.j
Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
LOG.debug(outputString);
@@ -671,7 +672,7 @@ public class SamlTokenTest extends org.j
Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 1.1 Authz Assertion (sender vouches):");
LOG.debug(outputString);
@@ -729,7 +730,7 @@ public class SamlTokenTest extends org.j
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Attr Assertion (sender vouches):");
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
LOG.debug(outputString);
}
@@ -772,7 +773,7 @@ public class SamlTokenTest extends org.j
Document unsignedDoc = wsSign.build(doc, assertion, secHeader);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(unsignedDoc);
+ XMLUtils.PrettyDocumentToString(unsignedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("SAML 2 Authn Assertion (sender vouches):");
LOG.debug(outputString);
@@ -799,7 +800,7 @@ public class SamlTokenTest extends org.j
List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, null, null);
String outputString =
- org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false);
return results;
}