You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sh...@apache.org on 2010/12/22 12:38:46 UTC

svn commit: r1051853 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy: builders/RampartConfigBuilder.java model/OptimizePartsConfig.java

Author: shankar
Date: Wed Dec 22 11:38:46 2010
New Revision: 1051853

URL: http://svn.apache.org/viewvc?rev=1051853&view=rev
Log:
Applying patch from RAMPART-181

Modified:
    axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
    axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java

Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java?rev=1051853&r1=1051852&r2=1051853&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java Wed Dec 22 11:38:46 2010
@@ -103,6 +103,13 @@ public class RampartConfigBuilder implem
         }
         
         childElement = element.getFirstChildWithName(new QName(
+                RampartConfig.NS, RampartConfig.DEC_CRYPTO_LN));
+        if (childElement != null) {
+            rampartConfig.setDecCryptoConfig((CryptoConfig) factory
+                    .build(childElement.getFirstElement()));
+        }
+        
+        childElement = element.getFirstChildWithName(new QName(
                 RampartConfig.NS, RampartConfig.STS_CRYPTO_LN));
         if (childElement != null) {
             rampartConfig.setStsCryptoConfig((CryptoConfig) factory
@@ -133,6 +140,12 @@ public class RampartConfigBuilder implem
             rampartConfig.setNonceLifeTime(childElement.getText().trim());
         }
         
+        childElement = element.getFirstChildWithName(new QName(
+                RampartConfig.NS, RampartConfig.TOKEN_STORE_CLASS_LN));
+        if (childElement != null) {
+            rampartConfig.setTokenStoreClass(childElement.getText().trim());
+        }
+        
 		childElement = element.getFirstChildWithName(new QName(
                 RampartConfig.NS, RampartConfig.OPTIMISE_PARTS));
         if (childElement != null) {

Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java?rev=1051853&r1=1051852&r2=1051853&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java Wed Dec 22 11:38:46 2010
@@ -100,6 +100,7 @@ public class OptimizePartsConfig impleme
         	  while(ite.hasNext()){
         		  String strPrefix = (String)ite.next();
         		  String strURI = (String) namespaces.get(strPrefix);
+        		  writer.writeStartElement(RampartConfig.NS, NAMESPACE_LN);
         		  writer.writeAttribute(URI_ATTR , strURI);
         		  writer.writeAttribute(PREFIX_ATTR, strPrefix);
         		  writer.writeEndElement();