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

[nandana]

Author: nandana
Date: Mon Jan 28 01:36:24 2008
New Revision: 615805

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

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java?rev=615805&r1=615804&r2=615805&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java
 Mon Jan 28 01:36:24 2008
@@ -21,7 +21,9 @@
 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;
 
 /**
  * 
@@ -29,6 +31,10 @@
  */
 public class HttpsToken extends Token {
 
+    public HttpsToken(int version){
+        setVersion(version);
+    }
+    
     private boolean requireClientCertificate = false;
 
     public boolean isRequireClientCertificate() {
@@ -40,7 +46,11 @@
     }
 
     public QName getName() {
-        return Constants.HTTPS_TOKEN;
+        if (version == SPConstants.SP_V12) {
+            return SP12Constants.HTTPS_TOKEN;
+        } else {
+            return SP11Constants.HTTPS_TOKEN;
+        }
     }
 
     public PolicyComponent normalize() {
@@ -49,12 +59,12 @@
 
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
 
-        String localname = Constants.HTTPS_TOKEN.getLocalPart();
-        String namespaceURI = Constants.HTTPS_TOKEN.getNamespaceURI();
+        String localname = getName().getLocalPart();
+        String namespaceURI = getName().getNamespaceURI();
 
         String prefix = writer.getPrefix(namespaceURI);
         if (prefix == null) {
-            prefix = Constants.HTTPS_TOKEN.getPrefix();
+            prefix = getName().getPrefix();
             writer.setPrefix(prefix, namespaceURI);
         }
 
@@ -63,8 +73,7 @@
 
         // RequireClientCertificate=".."
         writer
-                .writeAttribute(Constants.REQUIRE_CLIENT_CERTIFICATE
-                        .getLocalPart(), Boolean
+                
.writeAttribute(SPConstants.REQUIRE_CLIENT_CERTIFICATE.getLocalPart(), Boolean
                         .toString(isRequireClientCertificate()));
 
         writer.writeEndElement();