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

[nandana]

Author: nandana
Date: Mon Jan 28 01:45:49 2008
New Revision: 615825

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

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=615825&r1=615824&r2=615825&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
 Mon Jan 28 01:45:49 2008
@@ -25,7 +25,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.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
 
 public class SignedEncryptedElements extends AbstractSecurityAssertion {
 
@@ -41,8 +43,9 @@
      */
     private boolean signedElemets;
 
-    public SignedEncryptedElements(boolean signedElements) {
+    public SignedEncryptedElements(boolean signedElements, int version) {
         this.signedElemets = signedElements;
+        setVersion(version);
     }
 
     /**
@@ -113,8 +116,7 @@
         }
 
         if (xPathVersion != null) {
-            writer.writeAttribute(prefix, namespaceURI,
-                    Constants.ATTR_XPATH_VERSION.getLocalPart(), xPathVersion);
+            writer.writeAttribute(prefix, namespaceURI, 
SPConstants.XPATH_VERSION, xPathVersion);
         }
 
         String xpathExpression;
@@ -123,8 +125,7 @@
                 .hasNext();) {
             xpathExpression = (String) iterator.next();
             // <sp:XPath ..>
-            writer.writeStartElement(prefix, Constants.XPATH_.getLocalPart(),
-                    namespaceURI);
+            writer.writeStartElement(prefix, SPConstants.XPATH_EXPR, 
namespaceURI);
             writer.writeCharacters(xpathExpression);
             writer.writeEndElement();
         }
@@ -135,10 +136,19 @@
 
     public QName getName() {
         if (signedElemets) {
-            return Constants.SIGNED_ELEMENTS;
+            if (version == SPConstants.SP_V12) {
+                return SP12Constants.SIGNED_ELEMENTS;
+            } else {
+                return SP11Constants.SIGNED_ELEMENTS;
+            }
+            
+        } 
+        
+        if (version == SPConstants.SP_V12) {
+            return SP12Constants.ENCRYPTED_ELEMENTS;
+        } else {
+            return SP11Constants.ENCRYPTED_ELEMENTS;
         }
-
-        return Constants.ENCRYPTED_ELEMENTS;
     }
 
     public PolicyComponent normalize() {