Author: nandana
Date: Mon Jan 28 01:45:05 2008
New Revision: 615822
URL: http://svn.apache.org/viewvc?rev=615822&view=rev
Log:
rampart-policy related changes to support WS Security Policy 1.2
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecurityContextToken.java
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecurityContextToken.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecurityContextToken.java?rev=615822&r1=615821&r2=615822&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecurityContextToken.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecurityContextToken.java
Mon Jan 28 01:45:05 2008
@@ -17,7 +17,9 @@
package org.apache.ws.secpolicy.model;
import org.apache.neethi.PolicyComponent;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -32,6 +34,10 @@
boolean sc10SecurityContextToken;
+ public SecurityContextToken(int version) {
+ setVersion(version);
+ }
+
/**
* @return Returns the requireExternalUriRef.
*/
@@ -64,7 +70,11 @@
* @see org.apache.neethi.Assertion#getName()
*/
public QName getName() {
- return Constants.SECURITY_CONTEXT_TOKEN;
+ if ( version == SPConstants.SP_V12) {
+ return SP12Constants.SECURITY_CONTEXT_TOKEN;
+ } else {
+ return SP11Constants.SECURITY_CONTEXT_TOKEN;
+ }
}
/* (non-Javadoc)