svn commit: r633771 - /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java

[na...@apache.org]

Author: nandana
Date: Tue Mar  4 21:20:46 2008
New Revision: 633771

URL: http://svn.apache.org/viewvc?rev=633771&view=rev
Log:
Fixed an error extracting the address element

Modified:
    webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java

Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java?rev=633771&r1=633770&r2=633771&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java Tue Mar  4 21:20:46 2008
@@ -17,6 +17,7 @@
 
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.AssertionBuilderFactory;
 import org.apache.neethi.Policy;
@@ -44,8 +45,30 @@
         }
         // Extract Issuer
         OMElement issuerElem = element.getFirstChildWithName(SP12Constants.ISSUER);
-        if (issuerElem != null && issuerElem.getFirstElement() != null) {
-            issuedToken.setIssuerEpr(issuerElem.getFirstElement());
+       
+        if(issuerElem != null) {
+            OMElement issuerEpr = issuerElem.getFirstChildWithName(new QName(AddressingConstants.Final.WSA_NAMESPACE,"Address"));
+            
+            //try the other addressing namespace
+            if (issuerEpr == null) {
+                issuerEpr = issuerElem.getFirstChildWithName(new QName(AddressingConstants.Submission.WSA_NAMESPACE,"Address"));
+            }
+            
+            issuedToken.setIssuerEpr(issuerEpr);
+        }
+        
+        //TODO check why this returns an Address element
+        //iter = issuerElem.getChildrenWithLocalName("Metadata");
+        
+        if (issuerElem != null ) {
+            OMElement issuerMex = issuerElem.getFirstChildWithName(new QName(AddressingConstants.Final.WSA_NAMESPACE,"Metadata"));
+            
+          //try the other addressing namespace
+            if (issuerMex == null) {
+                issuerMex = issuerElem.getFirstChildWithName(new QName(AddressingConstants.Submission.WSA_NAMESPACE,"Metadata"));
+            }
+                        
+            issuedToken.setIssuerMex(issuerMex);
         }
 
         // Extract RSTTemplate