Author: ruchithf
Date: Sun Apr 16 06:11:46 2006
New Revision: 394484
URL: http://svn.apache.org/viewcvs?rev=394484&view=rev
Log:
Create the wsu:Id value when a SecurityContextToken is created... one can
externally set it as well
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityContextToken.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java?rev=394484&r1=394483&r2=394484&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSecurityContextToken.java
Sun Apr 16 06:11:46 2006
@@ -65,11 +65,9 @@
}
// The wsu:Id of the wsc:SecurityContextToken
- if (this.sctId == null) {
- this.sctId = "sctid-" + this.sct.getElement().hashCode();
+ if (this.sctId != null) {
+ this.sct.setID(this.sctId);
}
- this.sct.setID(this.sctId);
-
}
public void prependSCTElementToHeader(Document doc, WSSecHeader secHeader)
@@ -126,7 +124,11 @@
* @return Returns the sctId.
*/
public String getSctId() {
- return sctId;
+ if(this.sct != null) {
+ return this.sct.getID();
+ } else {
+ return this.sctId;
+ }
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityContextToken.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityContextToken.java?rev=394484&r1=394483&r2=394484&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityContextToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityContextToken.java
Sun Apr 16 06:11:46 2006
@@ -52,8 +52,10 @@
this.element.appendChild(this.elementIdentifier);
String uuid = UUIDGenerator.getUUID();
-
+
this.elementIdentifier.appendChild(doc.createTextNode(uuid));
+
+ this.setID("sctId-" + this.element.hashCode());
}
/**
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java?rev=394484&r1=394483&r2=394484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java Sun Apr 16
06:11:46 2006
@@ -237,9 +237,10 @@
sctBuilder.prependSCTElementToHeader(doc, secHeader);
- String out = org.apache.ws.security.util.XMLUtils
- .PrettyDocumentToString(doc);
- System.out.println(out);
+// String out = org.apache.ws.security.util.XMLUtils
+// .PrettyDocumentToString(doc);
+
+// System.out.println(out);
verify(doc);
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
