svn commit: r516085 - in /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart: builder/BindingBuilder.java util/RampartUtil.java

[ruchithf]

Author: ruchithf
Date: Thu Mar  8 08:02:19 2007
New Revision: 516085

URL: http://svn.apache.org/viewvc?view=rev&rev=516085
Log:
Handle AlwaysToRecipient properly in the signature case. 
We should only send the token from the initiator to the recipient, NOT from 
recipeint to initiator - Instead use thumbprint ref or SKI ref depending on 
wss11 or wss10 suport.


Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?view=diff&rev=516085&r1=516084&r2=516085
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 Thu Mar  8 08:02:19 2007
@@ -205,7 +205,8 @@
         sig.setWsConfig(rmd.getConfig());
         
         log.debug("Token inclusion: " + token.getInclusion());
-        if(token.getInclusion().equals(Constants.INCLUDE_NEVER)) {
+        if(token.getInclusion().equals(Constants.INCLUDE_NEVER) ||
+                (!rmd.isInitiator() && 
token.getInclusion().equals(Constants.INCLUDE_ALWAYS_TO_RECIPIENT))) {
             if(rpd.getWss11() != null) {
                 //Use thumbprint
                 sig.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?view=diff&rev=516085&r1=516084&r2=516085
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 Thu Mar  8 08:02:19 2007
@@ -464,7 +464,14 @@
     
     public static String addWsuIdToElement(OMElement elem) {
         String id;
-        OMAttribute idAttr = elem.getAttribute(new QName(WSConstants.WSU_NS, 
"Id"));
+        
+        //first try to get the Id attr
+        OMAttribute idAttr = elem.getAttribute(new QName("Id"));
+        if(idAttr == null) {
+            //then try the wsu:Id value
+            idAttr = elem.getAttribute(new QName(WSConstants.WSU_NS, "Id"));
+        }
+        
         if(idAttr != null) {
             id = idAttr.getAttributeValue();
         } else {