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

[na...@apache.org]

Author: nandana
Date: Mon Jan 28 01:41:01 2008
New Revision: 615816

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

Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java?rev=615816&r1=615815&r2=615816&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java Mon Jan 28 01:41:01 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.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
 
 public class ProtectionToken extends AbstractSecurityAssertion implements TokenWrapper {
     
     private Token protectionToken;
+    
+    public ProtectionToken(int version) {
+        setVersion(version);
+    }
 
     /**
      * @return Returns the protectionToken.
@@ -46,7 +52,11 @@
     }
     
     public QName getName() {
-        return Constants.PROTECTION_TOKEN;
+        if ( version == SPConstants.SP_V12) {
+            return SP12Constants.PROTECTION_TOKEN;
+        } else {
+            return SP11Constants.PROTECTION_TOKEN;
+        }     
     }
 
     public PolicyComponent normalize() {
@@ -58,14 +68,14 @@
     }
 
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
-        String localname = Constants.PROTECTION_TOKEN.getLocalPart();
-        String namespaceURI = Constants.PROTECTION_TOKEN.getNamespaceURI();
+        String localname = getName().getLocalPart();
+        String namespaceURI = getName().getNamespaceURI();
         
         String prefix;
         
         String writerPrefix = writer.getPrefix(namespaceURI);
         if (writerPrefix == null) {
-            prefix = Constants.PROTECTION_TOKEN.getPrefix();
+            prefix = getName().getPrefix();
             writer.setPrefix(prefix, namespaceURI);
             
         } else {
@@ -80,15 +90,15 @@
             writer.writeNamespace(prefix, namespaceURI);
         }
         
-        String policyLocalName = Constants.POLICY.getLocalPart();
-        String policyNamespaceURI = Constants.POLICY.getNamespaceURI();
+        String policyLocalName = SPConstants.POLICY.getLocalPart();
+        String policyNamespaceURI = SPConstants.POLICY.getNamespaceURI();
         
         String wspPrefix;
         
         String wspWriterPrefix = writer.getPrefix(policyNamespaceURI);
         
         if (wspWriterPrefix == null) {
-            wspPrefix = Constants.PROTECTION_TOKEN.getPrefix();
+            wspPrefix = SPConstants.POLICY.getPrefix();
             writer.setPrefix(wspPrefix, policyNamespaceURI);
         } else {
             wspPrefix = wspWriterPrefix;