svn commit: r547955 - /webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java

[ru...@apache.org]

Author: ruchithf
Date: Sat Jun 16 11:08:42 2007
New Revision: 547955

URL: http://svn.apache.org/viewvc?view=rev&rev=547955
Log:
The EPR contained in the AppliesTo can take different forms. We should hold on to the 
EndpointReference element in such cases.


Modified:
    webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java

Modified: webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java?view=diff&rev=547955&r1=547954&r2=547955
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java Sat Jun 16 11:08:42 2007
@@ -55,6 +55,8 @@
     private String keyType;
 
     private String appliesToAddress;
+    
+    private OMElement appliesToEpr;
 
     private Principal principal;
 
@@ -176,6 +178,8 @@
 
         if (appliesToElem != null) {
             OMElement eprElem = appliesToElem.getFirstElement();
+            this.appliesToEpr = eprElem;
+            
             // If there were no addressing headers
             // The find the addressing version using the EPR element
             if (this.addressingNs == null) {
@@ -184,6 +188,9 @@
             }
 
             if (eprElem != null) {
+                
+                //Of the epr is a web service then try to get the addr
+                
                 OMElement addrElem = eprElem
                         .getFirstChildWithName(new QName(
                                 this.addressingNs,
@@ -191,9 +198,7 @@
                 if (addrElem != null && addrElem.getText() != null
                     && !"".equals(addrElem.getText().trim())) {
                     this.appliesToAddress = addrElem.getText().trim();
-                } else {
-                    throw new TrustException("invalidAppliesToElem");
-                }
+                } 
             } else {
                 throw new TrustException("invalidAppliesToElem");
             }
@@ -450,6 +455,10 @@
 	public OMElement getClaimElem() {
 		return claimElem;
 	}
+
+    public OMElement getAppliesToEpr() {
+        return appliesToEpr;
+    }
 
 
 }