Author: fadushin
Date: Mon Apr 14 01:57:32 2008
New Revision: 647705
URL: http://svn.apache.org/viewvc?rev=647705&view=rev
Log:
Removed some JDK-1.5-only features.
Tested on 1.4.2_16 (OS X)
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java?rev=647705&r1=647704&r2=647705&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
Mon Apr 14 01:57:32 2008
@@ -46,8 +46,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.sun.org.apache.xerces.internal.dom.ParentNode;
-
public class ReferenceListProcessor implements Processor {
private static Log log = LogFactory.getLog(ReferenceListProcessor.class
.getName());
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java?rev=647705&r1=647704&r2=647705&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java Mon Apr 14
01:57:32 2008
@@ -203,7 +203,7 @@
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
log.debug(outputString);
- assertTrue(outputString.contains("#ThumbprintSHA1"));
+ assertTrue(outputString.indexOf("#ThumbprintSHA1") != -1);
}
log.info("After Encrypting ThumbprintSHA1....");
@@ -233,7 +233,7 @@
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
log.debug(outputString);
- assertTrue(outputString.contains("#EncryptedKeySHA1"));
+ assertTrue(outputString.indexOf("#EncryptedKeySHA1") != -1);
}
log.info("After Encrypting EncryptedKeySHA1....");
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java?rev=647705&r1=647704&r2=647705&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java Mon Apr 14
01:57:32 2008
@@ -189,7 +189,6 @@
org.w3c.dom.Element elem = builder.getUsernameTokenElement();
org.w3c.dom.NodeList list = elem.getElementsByTagName("wsse:Nonce");
org.w3c.dom.Node nonceNode = list.item(0);
- nonceNode.setTextContent(null);
if (log.isDebugEnabled()) {
String outputString =
@@ -230,7 +229,6 @@
org.w3c.dom.Element elem = builder.getUsernameTokenElement();
org.w3c.dom.NodeList list = elem.getElementsByTagName("wsu:Created");
org.w3c.dom.Node nonceNode = list.item(0);
- nonceNode.setTextContent(null);
if (log.isDebugEnabled()) {
String outputString =
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java?rev=647705&r1=647704&r2=647705&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityX509v1.java Mon Apr 14
01:57:32 2008
@@ -143,8 +143,8 @@
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
log.debug(outputString);
- assertTrue(outputString.contains("#X509v1"));
- assertTrue(!outputString.contains("#X509v3"));
+ assertTrue(outputString.indexOf("#X509v1") != -1);
+ assertTrue(outputString.indexOf("#X509v3") == -1);
}
verify(signedDoc);
@@ -167,8 +167,8 @@
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
log.debug(outputString);
- assertTrue(outputString.contains("#X509v1"));
- assertTrue(!outputString.contains("#X509v3"));
+ assertTrue(outputString.indexOf("#X509v1") != -1);
+ assertTrue(outputString.indexOf("#X509v3") == -1);
}
verify(encryptedDoc);
@@ -192,8 +192,9 @@
fail("Expected failure when using an X509#v1 certificate with
SKI");
} catch (WSSecurityException ex) {
// expected
- assertTrue(ex.getMessage().contains(
+ assertTrue(ex.getMessage().indexOf(
"An X509 certificate with version 3 must be used for SKI")
+ != -1
);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
