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

[nandana]

Author: nandana
Date: Mon Jan 28 01:48:43 2008
New Revision: 615833

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

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java?rev=615833&r1=615832&r2=615833&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
 Mon Jan 28 01:48:43 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;
 
 /**
  * Model bean to capture Trust10 assertion info
@@ -34,6 +36,10 @@
     private boolean requireServerEntropy;
     private boolean mustSupportIssuedTokens;
     
+    public Trust10(int version){
+        setVersion(version);
+    }
+    
     /**
      * @return Returns the mustSupportClientChallenge.
      */
@@ -108,7 +114,7 @@
      * @see org.apache.neethi.Assertion#getName()
      */
     public QName getName() {
-        return Constants.TRUST_10;
+            return SP11Constants.TRUST_10;
     }
 
     /* (non-Javadoc)
@@ -125,12 +131,12 @@
 
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
         
-        String localname = Constants.TRUST_10.getLocalPart();
-        String namespaceURI = Constants.TRUST_10.getNamespaceURI();
+        String localname = getName().getLocalPart();
+        String namespaceURI = getName().getNamespaceURI();
         
         String prefix = writer.getPrefix(namespaceURI);
         if (prefix == null) {
-            prefix = Constants.TRUST_10.getPrefix();
+            prefix = getName().getPrefix();
             writer.setPrefix(prefix, namespaceURI);
         }
         
@@ -139,42 +145,42 @@
         // xmlns:sp=".."
         writer.writeNamespace(prefix, namespaceURI);
         
-        String wspPrefix = 
writer.getPrefix(Constants.POLICY.getNamespaceURI());
+        String wspPrefix = 
writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
         if (wspPrefix == null) {
-            writer.setPrefix(wspPrefix, Constants.POLICY.getNamespaceURI());
+            writer.setPrefix(wspPrefix, SPConstants.POLICY.getNamespaceURI());
         }
         
         // <wsp:Policy>
-        writer.writeStartElement(Constants.POLICY.getPrefix(), 
Constants.POLICY.getLocalPart(), Constants.POLICY.getNamespaceURI());
+        writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
         
         if (isMustSupportClientChallenge()) {
             // <sp:MustSupportClientChallenge />
-            writer.writeStartElement(prefix, 
Constants.MUST_SUPPORT_CLIENT_CHALLENGE.getLocalPart(), namespaceURI);
+            writer.writeStartElement(prefix, 
SPConstants.MUST_SUPPORT_CLIENT_CHALLENGE, namespaceURI);
             writer.writeEndElement();
         }
         
         if (isMustSupportServerChallenge()) {
             // <sp:MustSupportServerChallenge />
-            writer.writeStartElement(prefix, 
Constants.MUST_SUPPORT_SERVER_CHALLENGE.getLocalPart(), namespaceURI);
+            writer.writeStartElement(prefix, 
SPConstants.MUST_SUPPORT_SERVER_CHALLENGE, namespaceURI);
             writer.writeEndElement();
         }
         
         if (isRequireClientEntropy()) {
             // <sp:RequireClientEntropy />
-            writer.writeStartElement(prefix, 
Constants.REQUIRE_CLIENT_ENTROPY.getLocalPart(), namespaceURI);
+            writer.writeStartElement(prefix, 
SPConstants.REQUIRE_CLIENT_ENTROPY, namespaceURI);
             writer.writeEndElement();
         }
         
         
         if (isRequireServerEntropy()) {
             // <sp:RequireServerEntropy />
-            writer.writeStartElement(prefix, 
Constants.REQUIRE_SERVER_ENTROPY.getLocalPart(), namespaceURI);
+            writer.writeStartElement(prefix, 
SPConstants.REQUIRE_SERVER_ENTROPY, namespaceURI);
             writer.writeEndElement();
         }
         
         if (isMustSupportIssuedTokens()) {
             // <sp:MustSupportIssuedTokens />
-            writer.writeStartElement(prefix, 
Constants.MUST_SUPPORT_ISSUED_TOKENS.getLocalPart(), namespaceURI);
+            writer.writeStartElement(prefix, 
SPConstants.MUST_SUPPORT_ISSUED_TOKENS, namespaceURI);
             writer.writeEndElement();
         }