svn commit: r751646 - in /synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/security/secret/SecretManager.java utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java

[indika]

Author: indika
Date: Mon Mar  9 10:32:17 2009
New Revision: 751646

URL: http://svn.apache.org/viewvc?rev=751646&view=rev
Log:
formatting and few comment and docs

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
    
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java?rev=751646&r1=751645&r2=751646&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
 Mon Mar  9 10:32:17 2009
@@ -119,6 +119,12 @@
                         PROP_SECRET_MANAGER + DOT + PROP_PASSWORD_PROVIDER);
 
         if (secretCallbackHandler == null) {
+            if (log.isDebugEnabled()) {
+                log.debug("Unable to find a SecretCallbackHandler and so " +
+                        " cannot get passwords required for " +
+                        "root level secret repositories - trust store password 
or  identity " +
+                        "store password and it's private key password");
+            }
             return;
         }
 
@@ -126,6 +132,7 @@
         String identityKeyPass;
         String trustStorePass;
 
+        // Creating required password class backs
         SingleSecretCallback trustStorePassSecretCallback
                 = new SingleSecretCallback(TRUSTSTORE_PASSWORD_PROMPT);
         SingleSecretCallback identityStorePassSecretCallback
@@ -133,15 +140,18 @@
         SingleSecretCallback identityKeyPassSecretCallback
                 = new 
SingleSecretCallback(IDENTITYSTORE_PRIVATE_KEY_PASSWORD_PROMPT);
 
+        // Group all as a one callback
         MultiSecretCallback callback = new MultiSecretCallback();
         callback.addSecretCallback(trustStorePassSecretCallback);
         callback.addSecretCallback(identityStorePassSecretCallback);
         callback.addSecretCallback(identityKeyPassSecretCallback);
+        SecretCallback[] secretCallbacks = new SecretCallback[]{callback};
 
+        // Create and initiating SecretLoadingModule
         SecretLoadingModule secretLoadingModule = new SecretLoadingModule();
         secretLoadingModule.init(new 
SecretCallbackHandler[]{secretCallbackHandler});
 
-        SecretCallback[] secretCallbacks = new SecretCallback[]{callback};
+        //load passwords
         secretLoadingModule.load(secretCallbacks);
 
         identityKeyPass = identityKeyPassSecretCallback.getSecret();
@@ -265,7 +275,7 @@
     }
 
     private boolean validatePasswords(String identityStorePass,
-                                   String identityKeyPass, String 
trustStorePass) {
+                                      String identityKeyPass, String 
trustStorePass) {
         boolean isValid = false;
         if (trustStorePass != null && !"".equals(trustStorePass)) {
             if (log.isDebugEnabled()) {

Modified: 
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java?rev=751646&r1=751645&r2=751646&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java
 (original)
+++ 
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java
 Mon Mar  9 10:32:17 2009
@@ -32,7 +32,8 @@
 
     private static final Log log = 
LogFactory.getLog(SecretCallbackHandlerFactory.class);
 
-    public static SecretCallbackHandler createSecretCallbackHandler(Properties 
properties, String key) {
+    public static SecretCallbackHandler createSecretCallbackHandler(Properties 
properties,
+                                                                    String 
key) {
         String provider = MiscellaneousUtil.getProperty(
                 properties, key,
                 null);