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

[na...@apache.org]

Author: nandana
Date: Mon Jan 28 01:45:21 2008
New Revision: 615823

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

Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java?rev=615823&r1=615822&r2=615823&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java Mon Jan 28 01:45:21 2008
@@ -20,11 +20,17 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-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 SignatureToken extends AbstractSecurityAssertion implements TokenWrapper {
 
     private Token signatureToken;
+    
+    public SignatureToken(int version){
+        setVersion(version);
+    }
 
     /**
      * @return Returns the signatureToken.
@@ -45,19 +51,23 @@
     }
 
     public QName getName() {
-        return Constants.SIGNATURE_TOKEN;
+        if ( version == SPConstants.SP_V12 ) {
+            return SP12Constants.SIGNATURE_TOKEN;
+        } else {
+            return SP11Constants.SIGNATURE_TOKEN;
+        }    
     }
 
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
         
-        String localname = Constants.SIGNATURE_TOKEN.getLocalPart();
-        String namespaceURI = Constants.SIGNATURE_TOKEN.getNamespaceURI();
+        String localname = getName().getLocalPart();
+        String namespaceURI = getName().getNamespaceURI();
         
         String prefix;
         String writerPrefix = writer.getPrefix(namespaceURI);
         
         if (writerPrefix == null) {
-            prefix = Constants.SIGNATURE_TOKEN.getPrefix();
+            prefix = getName().getPrefix();
             writer.setPrefix(prefix, namespaceURI);
             
         } else {
@@ -73,14 +83,14 @@
         }
         
         
-        String wspNamespaceURI = Constants.POLICY.getNamespaceURI();
+        String wspNamespaceURI = SPConstants.POLICY.getNamespaceURI();
         
         String wspPrefix;
         
         String wspWriterPrefix = writer.getPrefix(wspNamespaceURI);
         
         if (wspWriterPrefix == null) {
-            wspPrefix = Constants.POLICY.getPrefix();
+            wspPrefix = SPConstants.POLICY.getPrefix();
             writer.setPrefix(wspPrefix, wspNamespaceURI);
             
         } else {
@@ -88,7 +98,7 @@
         }
         
         // <wsp:Policy>
-        writer.writeStartElement(wspPrefix, Constants.POLICY.getLocalPart(), wspNamespaceURI);
+        writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(), wspNamespaceURI);
         
         if (wspWriterPrefix == null) {
             // xmlns:wsp=".."