svn commit: r1070864 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: RampartConstants.java policy/builders/CryptoConfigBuilder.java policy/model/CryptoConfig

2011-02-15 Thread thilinamb 
Author: thilinamb
Date: Tue Feb 15 12:23:02 2011
New Revision: 1070864

URL: http://svn.apache.org/viewvc?rev=1070864&view=rev
Log:
Enabling crypto caching by default when Merlin is used as the Crypto 
implementation. Old parameters used to enable crypto caching are still valid. 
If someone wants to disable crypto caching, it can be done by setting the value 
of attribute 'enableCryptoCaching' to false. (This new attribute needs to 
included to the documentation)

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/CryptoConfigBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java?rev=1070864&r1=1070863&r2=1070864&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
 Tue Feb 15 12:23:02 2011
@@ -5,5 +5,6 @@ public class RampartConstants {
public static final String TIME_LOG = "org.apache.rampart.TIME";
public static final String MESSAGE_LOG = "org.apache.rampart.MESSAGE";
public static final String SEC_FAULT = "SECURITY_VALIDATION_FAILURE";
-
+public static final String MERLIN_CRYPTO_IMPL = 
"org.apache.ws.security.components.crypto.Merlin";
+public static final String MERLIN_CRYPTO_IMPL_CACHE_KEY = 
"org.apache.ws.security.crypto.merlin.file";
 }

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/CryptoConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/CryptoConfigBuilder.java?rev=1070864&r1=1070863&r2=1070864&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/CryptoConfigBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/CryptoConfigBuilder.java
 Tue Feb 15 12:23:02 2011
@@ -47,6 +47,12 @@ public class CryptoConfigBuilder impleme
 if(cacheRefreshIntAttr != null){
 
cryptoCofig.setCacheRefreshInterval(cacheRefreshIntAttr.getAttributeValue().trim());
 }
+
+OMAttribute enableCryptoCacheAttr = element.getAttribute(new 
QName(CryptoConfig.CACHE_ENABLED));
+if(enableCryptoCacheAttr != null){
+
cryptoCofig.setCacheEnabled(Boolean.parseBoolean(enableCryptoCacheAttr.
+getAttributeValue().trim().toLowerCase()));
+}
 
 Properties properties = new Properties();
 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java?rev=1070864&r1=1070863&r2=1070864&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
 Tue Feb 15 12:23:02 2011
@@ -47,6 +47,11 @@ public class CryptoConfig implements Ass
 public final static String PROPERTY_NAME_ATTR = "name";
 public final static String CRYPTO_KEY_ATTR = "cryptoKey";
 public final static String CACHE_REFRESH_INTVL = "cacheRefreshInterval";
+public static final String CACHE_ENABLED = "enableCryptoCaching";
+
+private Properties prop;
+
+private boolean cacheEnabled = true;
 
 private String provider;
 private String cryptoKey;
@@ -68,17 +73,18 @@ public class CryptoConfig implements Ass
 this.cacheRefreshInterval = cacheRefreshInterval;
 }
 
-private Properties prop;
-
 public Properties getProp() {
 return prop;
 }
+
 public void setProp(Properties prop) {
 this.prop = prop;
 }
+
 public String getProvider() {
 return provider;
 }
+
 public void setProvider(String provider) {
 this.provider

svn commit: r1070872 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml

2011-02-15 Thread thilinamb 
Author: thilinamb
Date: Tue Feb 15 12:53:55 2011
New Revision: 1070872

URL: http://svn.apache.org/viewvc?rev=1070872&view=rev
Log:
Updating the RampartConfig documentation to cover the disable caching option.

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml?rev=1070872&r1=1070871&r2=1070872&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
 Tue Feb 15 12:53:55 2011
@@ -125,6 +125,20 @@ configuration properties used by the imp
 
   
   
+  Crypto caching is enabled by default when Merlin is used as the 
crypto provider. So Rampart will cache the crypto objects
+  with an infinite cache refresh interval. This crypto refresh interval 
can be overridden by setting the cacheRefreshInterval parameter
+  as described above. If it is required to disable crypto caching when 
Merlin is used, set the 'enableCryptoCaching' parameter
+  value to 'false'. Please refer to the following example.
+  
+  http://www.w3.org/1999/xhtml"; xml:space="preserve">
+
+
+JKS
+service.jks
+servicePW
+
+
+  
   
   References1.
   http://ws.apache.org/wss4j";>Apache WSS4J -Home