svn commit: r752370 - in /webservices/rampart/trunk/java: ./ modules/rampart-core/src/main/java/org/apache/rampart/builder/ modules/rampart-trust/src/main/java/org/apache/rahas/ modules/rampart-trust/src/main/java/org/apache/rahas/impl/

[nandana]

Author: nandana
Date: Wed Mar 11 04:46:49 2009
New Revision: 752370

URL: http://svn.apache.org/viewvc?rev=752370&view=rev
Log:
Applying patch for RAMPART-219, thanks Clom

Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
    
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
    webservices/rampart/trunk/java/pom.xml

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=752370&r1=752369&r2=752370&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
 Wed Mar 11 04:46:49 2009
@@ -401,7 +401,11 @@
             try {
                 WSSecSignature sig = new WSSecSignature();
                 sig.setWsConfig(rmd.getConfig());
-                sig.setCustomTokenId(tok.getId().substring(1));
+                String tokId = tok.getId();
+                if (tokId.charAt(0) == '#') {
+                   tokId = tokId.substring(1);
+                }
+                sig.setCustomTokenId(tokId);
                 sig.setCustomTokenValueType(WSConstants.WSS_SAML_NS +
                         WSConstants.SAML_ASSERTION_ID);
                 sig.setSecretKey(tok.getSecret());

Modified: 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java?rev=752370&r1=752369&r2=752370&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
 Wed Mar 11 04:46:49 2009
@@ -217,7 +217,11 @@
         if (child.getQName().equals(new QName(WSConstants.SIG_NS, "KeyInfo"))) 
{
             return child.getText();
         } else if(child.getQName().equals(Reference.TOKEN)) {
-            return child.getAttributeValue(new QName("URI")).substring(1);
+            String uri = child.getAttributeValue(new QName("URI"));
+            if (uri.charAt(0) == '#') {
+               uri = uri.substring(1);
+            }
+            return uri;
         } else {
             return null;
         }

Modified: 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java?rev=752370&r1=752369&r2=752370&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
 Wed Mar 11 04:46:49 2009
@@ -105,7 +105,11 @@
                 OMAttribute uri = referenceEle.getAttribute(new QName(
                         RahasConstants.CancelBindingLocalNames.URI));
                 if (uri != null) {
-                    tokenId = uri.getAttributeValue().substring(1);
+
+                    tokenId = uri.getAttributeValue();
+                    if (tokenId.charAt(0) == '#') {
+                        tokenId = tokenId.substring(1);
+                    }
                 } else {
                     throw new TrustException("cannotDetermineTokenId");
                 }

Modified: webservices/rampart/trunk/java/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/pom.xml?rev=752370&r1=752369&r2=752370&view=diff
==============================================================================
--- webservices/rampart/trunk/java/pom.xml (original)
+++ webservices/rampart/trunk/java/pom.xml Wed Mar 11 04:46:49 2009
@@ -394,7 +394,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>opensaml</groupId>
+            <groupId>org.opensaml</groupId>
             <artifactId>opensaml</artifactId>
             <version>1.1</version>
         </dependency>