svn commit: r593306 - in /webservices/rampart/trunk/java/modules: rampart-core/src/main/java/org/apache/rampart/builder/ rampart-core/src/main/java/org/apache/rampart/util/ rampart-trust/src/main/java/org/apache/rahas/client/

[ruchithf]

Author: ruchithf
Date: Thu Nov  8 12:59:09 2007
New Revision: 593306

URL: http://svn.apache.org/viewvc?rev=593306&view=rev
Log:
- Updated STSClient to be able to set a custom addression version
- Updated rampart to be able to override the addressing version of RST when 
making sec conv requests
- Updated to use the latest wss4j and makeing usre we use only standard 
namespaces


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
    
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.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?rev=593306&r1=593305&r2=593306&view=diff
==============================================================================
--- 
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 Nov  8 12:59:09 2007
@@ -553,7 +553,7 @@
                 // be used in the wsse:Reference in ds:KeyInfo
                 if(policyToken instanceof X509Token) {
                        if (rmd.isInitiator()) {
-                           
sig.setCustomTokenValueType(WSConstants.ENC_KEY_VALUE_TYPE_NS
+                           sig.setCustomTokenValueType(WSConstants.WSS_SAML_NS
                                                  + 
WSConstants.ENC_KEY_VALUE_TYPE);
                            
sig.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
                        } else {

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?rev=593306&r1=593305&r2=593306&view=diff
==============================================================================
--- 
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 Nov  8 12:59:09 2007
@@ -25,6 +25,7 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.Parameter;
 import org.apache.commons.logging.Log;
@@ -490,6 +491,12 @@
                 String servceEprAddress = rmd.getMsgContext()
                         .getOptions().getTo().getAddress();
         
+                //If addressing version can be found set it
+                Object addrVersionNs = 
msgContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+                if(addrVersionNs != null) {
+                    client.setAddressingNs((String)addrVersionNs);
+                }
+                
                 //Make the request
                 org.apache.rahas.Token rst = 
                     client.requestSecurityToken(servicePolicy, 

Modified: 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=593306&r1=593305&r2=593306&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
 Thu Nov  8 12:59:09 2007
@@ -84,7 +84,7 @@
 
     private byte[] requestorEntropy;
 
-    private String addressingNs = AddressingConstants.Final.WSA_NAMESPACE;
+    private String addressingNs;
 
     private int keySize;
     
@@ -119,7 +119,10 @@
             ServiceClient client = getServiceClient(rstQn, issuerAddress);
             
             client.getServiceContext().setProperty(RAMPART_POLICY, 
issuerPolicy);
-            client.getOptions().setSoapVersionURI(this.soapVersion); 
+            client.getOptions().setSoapVersionURI(this.soapVersion);
+            if(this.addressingNs != null) {
+                
client.getOptions().setProperty(AddressingConstants.WS_ADDRESSING_VERSION, 
this.addressingNs);
+            }
             client.engageModule("addressing");
             client.engageModule("rampart");