svn commit: r553726 - in /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart: RampartMessageData.java policy/builders/RampartConfigBuilder.java policy/model/RampartConfig.java

[muthulee]

Author: muthulee
Date: Thu Jul  5 21:31:14 2007
New Revision: 553726

URL: http://svn.apache.org/viewvc?view=rev&rev=553726
Log:
Patch applied. Thanks Nencho. This will fix Rampart-42

Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?view=diff&rev=553726&r1=553725&r2=553726
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 Thu Jul  5 21:31:14 2007
@@ -230,6 +230,7 @@
                     rc.setUser(rampartConfig.getUser());
                     rc.setEncryptionUser(rampartConfig.getEncryptionUser());
                     rc.setPwCbClass(rampartConfig.getPwCbClass());
+                    rc.setSSLConfig(rampartConfig.getSSLConfig());
                     
                     this.servicePolicy.addAssertion(rc);
                     

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java?view=diff&rev=553726&r1=553725&r2=553726
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
 Thu Jul  5 21:31:14 2007
@@ -15,14 +15,15 @@
  */
 package org.apache.rampart.policy.builders;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axiom.om.OMElement;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.AssertionBuilderFactory;
 import org.apache.neethi.builders.AssertionBuilder;
 import org.apache.rampart.policy.model.CryptoConfig;
 import org.apache.rampart.policy.model.RampartConfig;
-
-import javax.xml.namespace.QName;
+import org.apache.rampart.policy.model.SSLConfig;
 
 public class RampartConfigBuilder implements AssertionBuilder {
 
@@ -50,7 +51,20 @@
         if (childElement != null) {
             rampartConfig.setPwCbClass(childElement.getText().trim());
         }
-
+        
+                      
+        // handle ssl config   
+               childElement = element.getFirstChildWithName(new QName(
+                RampartConfig.NS, RampartConfig.SSL_CONFIG));
+        if (childElement != null) {                                    
+               SSLConfig sslConfig = (SSLConfig)new SSLConfigBuilder().
+                                         build(childElement, 
+                                                 factory);
+            rampartConfig.setSSLConfig(sslConfig);
+            
+        }
+        
+                      
         childElement = element.getFirstChildWithName(new QName(
                 RampartConfig.NS, RampartConfig.SIG_CRYPTO_LN));
         if (childElement != null) {

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java?view=diff&rev=553726&r1=553725&r2=553726
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
 Thu Jul  5 21:31:14 2007
@@ -101,6 +101,20 @@
     private String optimizeParts;
 
     private String tokenStoreClass;
+    
+    private SSLConfig sslConfig;
+    
+    public final static String SSL_CONFIG = "sslConfig";
+    
+    
+    public SSLConfig getSSLConfig() {
+        return sslConfig;
+    }
+
+    public void setSSLConfig(SSLConfig sslConfig) {
+        this.sslConfig = sslConfig;
+    }
+    
 
     /**
      * @return Returns the tokenStoreClass.