svn commit: r657730 - /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java

[nandana]

Author: nandana
Date: Sun May 18 22:48:15 2008
New Revision: 657730

URL: http://svn.apache.org/viewvc?rev=657730&view=rev
Log:
RAMPART-145 using the attached and unattached references according to policy

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

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=657730&r1=657729&r2=657730&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
 Sun May 18 22:48:15 2008
@@ -355,10 +355,14 @@
               //Do Signature with derived keys
               WSSecDKSign dkSign = new WSSecDKSign();
               
-              OMElement ref = tok.getAttachedReference();
-              if(ref == null) {
+              // Setting the AttachedReference or the UnattachedReference 
according to the flag
+              OMElement ref;
+              if (tokenIncluded == true) {
+                  ref = tok.getAttachedReference();
+              } else {
                   ref = tok.getUnattachedReference();
               }
+              
               if(ref != null) {
                   dkSign.setExternalKey(tok.getSecret(), (Element) 
                           doc.importNode((Element) ref, true));
@@ -495,10 +499,14 @@
               //Do Signature with derived keys
               WSSecDKSign dkSign = new WSSecDKSign();
               
-              OMElement ref = tok.getAttachedReference();
-              if(ref == null) {
+              // Setting the AttachedReference or the UnattachedReference 
according to the flag
+              OMElement ref;
+              if (tokenIncluded == true) {
+                  ref = tok.getAttachedReference();
+              } else {
                   ref = tok.getUnattachedReference();
               }
+              
               if(ref != null) {
                   dkSign.setExternalKey(tok.getSecret(), (Element) 
                           doc.importNode((Element) ref, true));