svn commit: r615808 - /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java

[na...@apache.org]

Author: nandana
Date: Mon Jan 28 01:37:21 2008
New Revision: 615808

URL: http://svn.apache.org/viewvc?rev=615808&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/InitiatorToken.java

Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java?rev=615808&r1=615807&r2=615808&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java Mon Jan 28 01:37:21 2008
@@ -21,11 +21,17 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.neethi.PolicyComponent;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.SP12Constants;
 
 public class InitiatorToken extends AbstractSecurityAssertion implements TokenWrapper {
     
     private Token initiatorToken;
+    
+    public InitiatorToken(int version) {
+        setVersion(version);
+    }
 
     /**
      * @return Returns the initiatorToken.
@@ -46,7 +52,12 @@
     }
     
     public QName getName() {
-        return Constants.INITIATOR_TOKEN;
+        if (version == SPConstants.SP_V12) {
+            return SP12Constants.INITIATOR_TOKEN;
+        } else {
+            return SP11Constants.INITIATOR_TOKEN;
+        }
+        
     }
 
     public PolicyComponent normalize() {
@@ -54,27 +65,27 @@
     }
 
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
-        String localName = Constants.INITIATOR_TOKEN.getLocalPart();
-        String namespaceURI = Constants.INITIATOR_TOKEN.getNamespaceURI();
+        String localName = getName().getLocalPart();
+        String namespaceURI = getName().getNamespaceURI();
 
         String prefix = writer.getPrefix(namespaceURI);
 
         if (prefix == null) {
-            prefix = Constants.INITIATOR_TOKEN.getPrefix();
+            prefix = getName().getPrefix();
             writer.setPrefix(prefix, namespaceURI);
         }
         
         // <sp:InitiatorToken>
         writer.writeStartElement(prefix, localName, namespaceURI);
         
-        String pPrefix = writer.getPrefix(Constants.POLICY.getNamespaceURI());
+        String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
         if (pPrefix == null) {
-            pPrefix = Constants.POLICY.getPrefix();
-            writer.setPrefix(pPrefix, Constants.POLICY.getNamespaceURI());
+            pPrefix = SPConstants.POLICY.getPrefix();
+            writer.setPrefix(pPrefix, SPConstants.POLICY.getNamespaceURI());
         }
         
         // <wsp:Policy>
-        writer.writeStartElement(pPrefix, Constants.POLICY.getLocalPart(), Constants.POLICY.getNamespaceURI());
+        writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
 
         Token token = getInitiatorToken();
         if (token == null) {