directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [11/15] directory-fortress-core git commit: removed local config and put check in all factories to load remote config
Date Thu, 05 May 2016 13:49:28 GMT
removed local config and put check in all factories to load remote config


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/e9c143f7
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/e9c143f7
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/e9c143f7

Branch: refs/heads/master
Commit: e9c143f7050d04c4540ae1b57cafff44bb33b9af
Parents: a5ad103
Author: clp207 <clp207@psu.edu>
Authored: Tue May 3 13:45:06 2016 -0400
Committer: clp207 <clp207@psu.edu>
Committed: Tue May 3 13:45:06 2016 -0400

----------------------------------------------------------------------
 .../fortress/core/AccelMgrFactory.java          |   7 +
 .../fortress/core/AccessMgrFactory.java         |   7 +
 .../fortress/core/AdminMgrFactory.java          |   7 +
 .../fortress/core/AuditMgrFactory.java          |   7 +
 .../fortress/core/DelAccessMgrFactory.java      |   7 +
 .../fortress/core/DelAdminMgrFactory.java       |   7 +
 .../fortress/core/DelReviewMgrFactory.java      |   7 +
 .../fortress/core/GroupMgrFactory.java          |   7 +
 .../fortress/core/PwPolicyMgrFactory.java       |   7 +
 .../fortress/core/ReviewMgrFactory.java         |   7 +
 .../directory/fortress/core/impl/ConfigDAO.java |   4 +-
 .../core/ldap/LdapConnectionProvider.java       |  64 ++--
 .../directory/fortress/core/util/Config.java    | 190 +++++++++-
 .../fortress/core/util/LocalConfig.java         | 360 -------------------
 .../fortress/core/util/crypto/EncryptUtil.java  |   6 +-
 15 files changed, 294 insertions(+), 400 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
index fabea9f..5fd7ee9 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
@@ -71,6 +71,13 @@ public final class AccelMgrFactory
         {
             accelMgr = (AccelMgr) ClassUtil.createInstance(accelClassName);
         }
+        
+        if(accelMgr instanceof AccelMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
 
         accelMgr.setContextId(contextId);
         return accelMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
index 1455379..3d4a98a 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
@@ -81,6 +81,13 @@ public final class AccessMgrFactory
         {
             accessMgr = (AccessMgr) ClassUtil.createInstance(accessClassName);
         }
+        
+        if(accessMgr instanceof AccessMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
 
         accessMgr.setContextId(contextId);
         return accessMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index 8c617d5..b17dae7 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
@@ -85,6 +85,13 @@ public final class AdminMgrFactory
             adminMgr = (AdminMgr) ClassUtil.createInstance(adminClassName);
         }
 
+        if(adminMgr instanceof AdminMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
+        
         adminMgr.setContextId(contextId);
         return adminMgr;
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index 8ae1834..57864a8 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
@@ -83,6 +83,13 @@ public final class AuditMgrFactory
         {
             auditMgr = (AuditMgr) ClassUtil.createInstance(auditClassName);
         }
+        
+        if(auditMgr instanceof AuditMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
 
         auditMgr.setContextId(contextId);
         return auditMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index ed8a905..98e546c 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
@@ -83,6 +83,13 @@ public final class DelAccessMgrFactory
         {
             accessMgr = (DelAccessMgr) ClassUtil.createInstance(accessClassName);
         }
+        
+        if(accessMgr instanceof DelAccessMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
 
         accessMgr.setContextId(contextId);
         return accessMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
index 00d2c5a..b5b0d2e 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
@@ -85,6 +85,13 @@ public final class DelAdminMgrFactory
             delAdminMgr = (DelAdminMgr) ClassUtil.createInstance( dAdminClassName );
         }
 
+        if(delAdminMgr instanceof DelAdminMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
+        
         delAdminMgr.setContextId(contextId);
         
         return delAdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
index 1c008b4..7e35055 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
@@ -81,6 +81,13 @@ public final class DelReviewMgrFactory
         {
             delReviewMgr = (DelReviewMgr) ClassUtil.createInstance(dReviewClassName);
         }
+        
+        if(delReviewMgr instanceof DelReviewMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
 
         delReviewMgr.setContextId(contextId);
         return delReviewMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
index 7b3473c..22bd0c1 100755
--- a/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
@@ -79,6 +79,13 @@ public final class GroupMgrFactory
         GroupMgr groupMgr = (GroupMgr) ClassUtil.createInstance(groupClassName);
         groupMgr.setContextId(contextId);
         
+        if(groupMgr instanceof GroupMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
+        
         return groupMgr;
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
index 0fb127a..f32d1b7 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
@@ -83,6 +83,13 @@ public final class PwPolicyMgrFactory
             policyMgr = (PwPolicyMgr) ClassUtil.createInstance(policyClassName);
         }
 
+        if(policyMgr instanceof PwPolicyMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
+        
         policyMgr.setContextId(contextId);
         return policyMgr;
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index 2ee3f8c..720b504 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -83,6 +83,13 @@ public final class ReviewMgrFactory
             reviewMgr = ( ReviewMgr ) ClassUtil.createInstance(reviewClassName);
         }
 
+        if(reviewMgr instanceof ReviewMgrImpl){
+        	Config cfg = Config.getInstance();
+        	if(!cfg.isRemoteConfigLoaded()){
+        		cfg.loadRemoteConfig();
+        	}
+        }
+        
         reviewMgr.setContextId(contextId);
         return reviewMgr;
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
index f971c46..e765762 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
@@ -39,7 +39,7 @@ import org.apache.directory.fortress.core.RemoveException;
 import org.apache.directory.fortress.core.UpdateException;
 import org.apache.directory.fortress.core.ldap.LdapDataProvider;
 import org.apache.directory.fortress.core.model.PropUtil;
-import org.apache.directory.fortress.core.util.LocalConfig;
+import org.apache.directory.fortress.core.util.Config;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -104,7 +104,7 @@ final class ConfigDAO extends LdapDataProvider
     {
     	super();
     	
-    	CONFIG_ROOT_DN = LocalConfig.getInstance().getProperty( GlobalIds.CONFIG_ROOT_PARAM );
+    	CONFIG_ROOT_DN = Config.getInstance().getProperty( GlobalIds.CONFIG_ROOT_PARAM );
     }
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
index dd56e93..e18af91 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
@@ -13,7 +13,7 @@ import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.fortress.core.CfgRuntimeException;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.util.LocalConfig;
+import org.apache.directory.fortress.core.util.Config;
 import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.LdapConnectionConfig;
@@ -73,55 +73,55 @@ public class LdapConnectionProvider {
     private void init()
     {    			
     	IS_SSL = (
-    			LocalConfig.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ) != null &&
-    			LocalConfig.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ).equalsIgnoreCase( "true" ) &&
-    			LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ) != null &&
-    			LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) != null );	
+    			Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ) != null &&
+    			Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ).equalsIgnoreCase( "true" ) &&
+    			Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) != null &&
+    			Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) != null );	
     	
         IS_SET_TRUST_STORE_PROP = (
     	        IS_SSL &&
-    	        LocalConfig.getInstance().getProperty( GlobalIds.SET_TRUST_STORE_PROP ) != null &&
-    	        LocalConfig.getInstance().getProperty( GlobalIds.SET_TRUST_STORE_PROP ).equalsIgnoreCase( "true" ) );
+    	        Config.getInstance().getProperty( GlobalIds.SET_TRUST_STORE_PROP ) != null &&
+    	        Config.getInstance().getProperty( GlobalIds.SET_TRUST_STORE_PROP ).equalsIgnoreCase( "true" ) );
     	
-    	IS_SSL_DEBUG = ( ( LocalConfig.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ) != null ) && ( LocalConfig
+    	IS_SSL_DEBUG = ( ( Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ) != null ) && ( Config
     			.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ).equalsIgnoreCase( "true" ) ) );	
     	
     	
-        String host = LocalConfig.getInstance().getProperty( GlobalIds.LDAP_HOST, "localhost" );
-        int port = LocalConfig.getInstance().getInt( GlobalIds.LDAP_PORT, 389 );
-        int min = LocalConfig.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MIN, 1 );
-        int max = LocalConfig.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MAX, 10 );
-        int logmin = LocalConfig.getInstance().getInt( LDAP_LOG_POOL_MIN, 1 );
-        int logmax = LocalConfig.getInstance().getInt( LDAP_LOG_POOL_MAX, 10 );
+        String host = Config.getInstance().getProperty( GlobalIds.LDAP_HOST, "localhost" );
+        int port = Config.getInstance().getInt( GlobalIds.LDAP_PORT, 389 );
+        int min = Config.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MIN, 1 );
+        int max = Config.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MAX, 10 );
+        int logmin = Config.getInstance().getInt( LDAP_LOG_POOL_MIN, 1 );
+        int logmax = Config.getInstance().getInt( LDAP_LOG_POOL_MAX, 10 );
         LOG.info( "LDAP POOL:  host=[{}], port=[{}], min=[{}], max=[{}]", host, port, min, max );
 
         if ( IS_SET_TRUST_STORE_PROP )
         {
             LOG.info( "Set JSSE truststore properties in Apache LDAP client:" );
-            LOG.info( "javax.net.ssl.trustStore: {}", LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ) );
+            LOG.info( "javax.net.ssl.trustStore: {}", Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) );
             LOG.info( "javax.net.debug: {}", IS_SSL_DEBUG );
-            System.setProperty( "javax.net.ssl.trustStore", LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ) );
-            System.setProperty( "javax.net.ssl.trustStorePassword", LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) );
+            System.setProperty( "javax.net.ssl.trustStore", Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) );
+            System.setProperty( "javax.net.ssl.trustStorePassword", Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) );
             System.setProperty( "javax.net.debug", Boolean.valueOf( IS_SSL_DEBUG ).toString() );
         }
 
         LdapConnectionConfig config = new LdapConnectionConfig();
         config.setLdapHost( host );
         config.setLdapPort( port );
-        config.setName( LocalConfig.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
+        config.setName( Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
 
         config.setUseSsl( IS_SSL );
         //config.setTrustManagers( new NoVerificationTrustManager() );
 
-        if(LocalConfig.getInstance().getBoolean(ENABLE_LDAP_STARTTLS, false)){
+        if(Config.getInstance().getBoolean(ENABLE_LDAP_STARTTLS, false)){
         	config.setUseTls(true);
         }
         
-        if ( IS_SSL && StringUtils.isNotEmpty( LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ) )
-            && StringUtils.isNotEmpty( LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) ) )
+        if ( IS_SSL && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) )
+            && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) ) )
         {
             // validate certificates but allow self-signed certs if within this truststore:
-            config.setTrustManagers( new LdapClientTrustStoreManager( LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ), LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE_PW )
+            config.setTrustManagers( new LdapClientTrustStoreManager( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ), Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW )
                 .toCharArray(), null,
                 true ) );
         }
@@ -129,11 +129,11 @@ public class LdapConnectionProvider {
         String adminPw;
         if ( EncryptUtil.isEnabled() )
         {
-            adminPw = EncryptUtil.getInstance().decrypt( LocalConfig.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW ) );
+            adminPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW ) );
         }
         else
         {
-            adminPw = LocalConfig.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW );
+            adminPw = Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW );
         }
 
         config.setCredentials( adminPw );
@@ -188,28 +188,28 @@ public class LdapConnectionProvider {
             LdapConnectionConfig logConfig = new LdapConnectionConfig();
             logConfig.setLdapHost( host );
             logConfig.setLdapPort( port );
-            logConfig.setName( LocalConfig.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
+            logConfig.setName( Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
 
             logConfig.setUseSsl( IS_SSL );
 
-            if ( IS_SSL && StringUtils.isNotEmpty( LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ) )
-                && StringUtils.isNotEmpty( LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) ) )
+            if ( IS_SSL && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) )
+                && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) ) )
             {
                 // validate certificates but allow self-signed certs if within this truststore:
-                logConfig.setTrustManagers( new LdapClientTrustStoreManager( LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE ),
-                	LocalConfig.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ).toCharArray(),
+                logConfig.setTrustManagers( new LdapClientTrustStoreManager( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ),
+                	Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ).toCharArray(),
                     null, true ) );
             }
 
-            logConfig.setName( LocalConfig.getInstance().getProperty( LDAP_LOG_POOL_UID, "" ) );
+            logConfig.setName( Config.getInstance().getProperty( LDAP_LOG_POOL_UID, "" ) );
             String logPw;
             if ( EncryptUtil.isEnabled() )
             {
-                logPw = EncryptUtil.getInstance().decrypt( LocalConfig.getInstance().getProperty( LDAP_LOG_POOL_PW ) );
+                logPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( LDAP_LOG_POOL_PW ) );
             }
             else
             {
-                logPw = LocalConfig.getInstance().getProperty( LDAP_LOG_POOL_PW );
+                logPw = Config.getInstance().getProperty( LDAP_LOG_POOL_PW );
             }
             logConfig.setCredentials( logPw );
             poolFactory = new ValidatingPoolableLdapConnectionFactory( logConfig );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/util/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index 556725d..355fce9 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -20,10 +20,12 @@
 package org.apache.directory.fortress.core.util;
 
 
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.Properties;
 
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.CfgException;
 import org.apache.directory.fortress.core.CfgRuntimeException;
 import org.apache.directory.fortress.core.ConfigMgr;
@@ -54,6 +56,25 @@ public final class Config
     private static final String CLS_NM = Config.class.getName();
     private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
 
+    private static final String PROP_FILE = "fortress.properties";
+    private static final String USER_PROP_FILE = "fortress.user.properties";
+    private static final String EXT_LDAP_HOST = "fortress.host";
+    private static final String EXT_LDAP_PORT = "fortress.port";
+    private static final String EXT_LDAP_ADMIN_POOL_UID = "fortress.admin.user";
+    private static final String EXT_LDAP_ADMIN_POOL_PW = "fortress.admin.pw";
+    private static final String EXT_LDAP_ADMIN_POOL_MIN = "fortress.min.admin.conn";
+    private static final String EXT_LDAP_ADMIN_POOL_MAX = "fortress.max.admin.conn";
+    private static final String EXT_ENABLE_LDAP_SSL = "fortress.enable.ldap.ssl";
+    private static final String EXT_ENABLE_LDAP_SSL_DEBUG = "fortress.enable.ldap.ssl.debug";
+    private static final String EXT_TRUST_STORE = "fortress.trust.store";
+    private static final String EXT_TRUST_STORE_PW = "fortress.trust.store.password";
+    private static final String EXT_SET_TRUST_STORE_PROP = "fortress.trust.store.set.prop";
+    private static final String EXT_CONFIG_REALM = "fortress.config.realm";
+    private static final String EXT_CONFIG_ROOT_DN = "fortress.config.root";
+    private static final String EXT_SERVER_TYPE = "fortress.ldap.server.type";
+    
+    private boolean remoteConfigLoaded = false;
+    
     public boolean IS_REST;
     public boolean IS_AUDIT_DISABLED;
     public boolean IS_OPENLDAP;
@@ -83,12 +104,171 @@ public final class Config
         return INSTANCE;
     }
     
-    private void init()
+    private void loadLocalConfig()
     {
         try
         {
-            config = LocalConfig.getInstance().getConfig();
+            // Load the system config file.
+            URL fUrl = Config.class.getClassLoader().getResource( PROP_FILE );
+            config = new PropertiesConfiguration();
+            config.setDelimiterParsingDisabled( true );
+            if ( fUrl == null )
+            {
+                String error = "static init: Error, null cfg file: " + PROP_FILE;
+                LOG.warn( error );
+            }
+            else
+            {
+                LOG.info( "static init: found from: {} path: {}", PROP_FILE, fUrl.getPath() );
+                config.load( fUrl );
+                LOG.info( "static init: loading from: {}", PROP_FILE );
+            }
+
+            URL fUserUrl = Config.class.getClassLoader().getResource( USER_PROP_FILE );
+            if ( fUserUrl != null )
+            {
+                LOG.info( "static init: found user properties from: {} path: {}", USER_PROP_FILE, fUserUrl.getPath() );
+                config.load( fUserUrl );
+            }
+
+            // Check to see if any of the ldap connection parameters have been overridden:
+            getExternalConfig();
+        }
+        catch ( org.apache.commons.configuration.ConfigurationException ex )
+        {
+            String error = "static init: Error loading from cfg file: [" + PROP_FILE
+                + "] ConfigurationException=" + ex;
+            LOG.error( error );
+            throw new CfgRuntimeException( GlobalErrIds.FT_CONFIG_BOOTSTRAP_FAILED, error, ex );
+        }
+    }
+    
+    /**
+     * This method is called during configuration initialization.  It determines if
+     * the ldap connection coordinates have been overridden as system properties.
+     */
+    private void getExternalConfig()
+    {
+        String PREFIX = "getExternalConfig override name [{}] value [{}]";
+        // Check to see if the ldap host has been overridden by a system property:
+        String szValue = System.getProperty( EXT_LDAP_HOST );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_HOST, szValue );
+            LOG.info( PREFIX, GlobalIds.LDAP_HOST, szValue );
+        }
+        // Check to see if the ldap port has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_PORT );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_PORT, szValue );
+            LOG.info( PREFIX, GlobalIds.LDAP_PORT, szValue );
+        }
+
+        // Check to see if the admin pool uid has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_UID );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_UID, szValue );
+            // never display ldap admin userid name to log:
+            LOG.info( "getExternalConfig override name [{}]", GlobalIds.LDAP_ADMIN_POOL_UID );
+        }
+
+        // Check to see if the admin pool pw has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_PW );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_PW, szValue );
+            // never display password of any type to log:
+            LOG.info( "getExternalConfig override name [{}]", GlobalIds.LDAP_ADMIN_POOL_PW );
+        }
+
+        // Check to see if the admin pool min connections has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_MIN );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_MIN, szValue );
+            LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MIN, szValue );
+        }
+
+        // Check to see if the admin pool max connections has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_MAX );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_MAX, szValue );
+            LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MAX, szValue );
+        }
+
+        // Check to see if ssl enabled parameter has been overridden by a system property:
+        szValue = System.getProperty( EXT_ENABLE_LDAP_SSL );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.ENABLE_LDAP_SSL, szValue );
+            LOG.info( PREFIX, GlobalIds.ENABLE_LDAP_SSL, szValue );
+        }
+
+        // Check to see if the ssl debug enabled parameter has been overridden by a system property:
+        szValue = System.getProperty( EXT_ENABLE_LDAP_SSL_DEBUG );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG, szValue );
+            LOG.info( PREFIX, GlobalIds.ENABLE_LDAP_SSL_DEBUG, szValue );
+        }
+
+        // Check to see if the trust store location has been overridden by a system property:
+        szValue = System.getProperty( EXT_TRUST_STORE );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.TRUST_STORE, szValue );
+            LOG.info( PREFIX, GlobalIds.TRUST_STORE, szValue );
+        }
+
+        // Check to see if the trust store password has been overridden by a system property:
+        szValue = System.getProperty( EXT_TRUST_STORE_PW );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.TRUST_STORE_PW, szValue );
+            // never display password value to log:
+            LOG.info( "getExternalConfig override name [{}]", GlobalIds.TRUST_STORE_PW );
+        }
 
+        // Check to see if the trust store set parameter has been overridden by a system property:
+        szValue = System.getProperty( EXT_SET_TRUST_STORE_PROP );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.SET_TRUST_STORE_PROP, szValue );
+            LOG.info( PREFIX, GlobalIds.SET_TRUST_STORE_PROP, szValue );
+        }
+
+        // Check to see if the config realm name has been overridden by a system property:
+        szValue = System.getProperty( EXT_CONFIG_REALM );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.CONFIG_REALM, szValue );
+            LOG.info( PREFIX, GlobalIds.CONFIG_REALM, szValue );
+        }
+
+        // Check to see if the config realm name has been overridden by a system property:
+        szValue = System.getProperty( EXT_CONFIG_ROOT_DN );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.CONFIG_ROOT_PARAM, szValue );
+            LOG.info( PREFIX, GlobalIds.CONFIG_ROOT_PARAM, szValue );
+        }
+
+        // Check to see if the ldap server type has been overridden by a system property:
+        szValue = System.getProperty( EXT_SERVER_TYPE  );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.SERVER_TYPE, szValue );
+            LOG.info( PREFIX, GlobalIds.SERVER_TYPE, szValue );
+        }
+    }
+    
+    public void loadRemoteConfig()
+    {
+        try
+        {
             // Retrieve parameters from the config node stored in target LDAP DIT:
             String realmName = config.getString( GlobalIds.CONFIG_REALM, "DEFAULT" );
             if ( realmName != null && realmName.length() > 0 )
@@ -134,6 +314,7 @@ public final class Config
             	
             	DELIMITER = getProperty( "attr.delimiter", "$" );
                 
+                remoteConfigLoaded = true;
             }
             else
             {
@@ -155,7 +336,7 @@ public final class Config
      */
     private Config()
     {
-        init();
+        loadLocalConfig();
     }
 
    private char[] loadLdapEscapeChars()
@@ -440,4 +621,7 @@ public final class Config
         return props;
     }
 
+	public boolean isRemoteConfigLoaded() {
+		return remoteConfigLoaded;
+	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/util/LocalConfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LocalConfig.java b/src/main/java/org/apache/directory/fortress/core/util/LocalConfig.java
deleted file mode 100644
index 7c612e1..0000000
--- a/src/main/java/org/apache/directory/fortress/core/util/LocalConfig.java
+++ /dev/null
@@ -1,360 +0,0 @@
-package org.apache.directory.fortress.core.util;
-
-import java.net.URL;
-
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.CfgRuntimeException;
-import org.apache.directory.fortress.core.GlobalErrIds;
-import org.apache.directory.fortress.core.GlobalIds;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LocalConfig {
-
-    private static final String CLS_NM = LocalConfig.class.getName();
-    private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
-	
-    private static final String PROP_FILE = "fortress.properties";
-    private static final String USER_PROP_FILE = "fortress.user.properties";
-    private static final String EXT_LDAP_HOST = "fortress.host";
-    private static final String EXT_LDAP_PORT = "fortress.port";
-    private static final String EXT_LDAP_ADMIN_POOL_UID = "fortress.admin.user";
-    private static final String EXT_LDAP_ADMIN_POOL_PW = "fortress.admin.pw";
-    private static final String EXT_LDAP_ADMIN_POOL_MIN = "fortress.min.admin.conn";
-    private static final String EXT_LDAP_ADMIN_POOL_MAX = "fortress.max.admin.conn";
-    private static final String EXT_ENABLE_LDAP_SSL = "fortress.enable.ldap.ssl";
-    private static final String EXT_ENABLE_LDAP_SSL_DEBUG = "fortress.enable.ldap.ssl.debug";
-    private static final String EXT_TRUST_STORE = "fortress.trust.store";
-    private static final String EXT_TRUST_STORE_PW = "fortress.trust.store.password";
-    private static final String EXT_SET_TRUST_STORE_PROP = "fortress.trust.store.set.prop";
-    private static final String EXT_CONFIG_REALM = "fortress.config.realm";
-    private static final String EXT_CONFIG_ROOT_DN = "fortress.config.root";
-    private static final String EXT_SERVER_TYPE = "fortress.ldap.server.type";
-	
-    private PropertiesConfiguration config;
-	
-    private static volatile LocalConfig INSTANCE = null;    
-    
-    public static LocalConfig getInstance() {
-        if(INSTANCE == null) {
-            synchronized (LocalConfig.class) {
-                if(INSTANCE == null){
-                    INSTANCE = new LocalConfig();
-                }
-            }
-        }
-        return INSTANCE;
-    }
-	
-    private void init()
-    {
-        try
-        {
-            // Load the system config file.
-            URL fUrl = Config.class.getClassLoader().getResource( PROP_FILE );
-            config = new PropertiesConfiguration();
-            config.setDelimiterParsingDisabled( true );
-            if ( fUrl == null )
-            {
-                String error = "static init: Error, null cfg file: " + PROP_FILE;
-                LOG.warn( error );
-            }
-            else
-            {
-                LOG.info( "static init: found from: {} path: {}", PROP_FILE, fUrl.getPath() );
-                config.load( fUrl );
-                LOG.info( "static init: loading from: {}", PROP_FILE );
-            }
-
-            URL fUserUrl = Config.class.getClassLoader().getResource( USER_PROP_FILE );
-            if ( fUserUrl != null )
-            {
-                LOG.info( "static init: found user properties from: {} path: {}", USER_PROP_FILE, fUserUrl.getPath() );
-                config.load( fUserUrl );
-            }
-
-            // Check to see if any of the ldap connection parameters have been overridden:
-            getExternalConfig();
-        }
-        catch ( org.apache.commons.configuration.ConfigurationException ex )
-        {
-            String error = "static init: Error loading from cfg file: [" + PROP_FILE
-                + "] ConfigurationException=" + ex;
-            LOG.error( error );
-            throw new CfgRuntimeException( GlobalErrIds.FT_CONFIG_BOOTSTRAP_FAILED, error, ex );
-        }
-    }
-
-    /**
-     * Private constructor
-     *
-     */
-    private LocalConfig()
-    {
-        init();
-    }
-    
-    /**
-     * This method is called during configuration initialization.  It determines if
-     * the ldap connection coordinates have been overridden as system properties.
-     */
-    private void getExternalConfig()
-    {
-        String PREFIX = "getExternalConfig override name [{}] value [{}]";
-        // Check to see if the ldap host has been overridden by a system property:
-        String szValue = System.getProperty( EXT_LDAP_HOST );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.LDAP_HOST, szValue );
-            LOG.info( PREFIX, GlobalIds.LDAP_HOST, szValue );
-        }
-        // Check to see if the ldap port has been overridden by a system property:
-        szValue = System.getProperty( EXT_LDAP_PORT );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.LDAP_PORT, szValue );
-            LOG.info( PREFIX, GlobalIds.LDAP_PORT, szValue );
-        }
-
-        // Check to see if the admin pool uid has been overridden by a system property:
-        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_UID );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_UID, szValue );
-            // never display ldap admin userid name to log:
-            LOG.info( "getExternalConfig override name [{}]", GlobalIds.LDAP_ADMIN_POOL_UID );
-        }
-
-        // Check to see if the admin pool pw has been overridden by a system property:
-        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_PW );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_PW, szValue );
-            // never display password of any type to log:
-            LOG.info( "getExternalConfig override name [{}]", GlobalIds.LDAP_ADMIN_POOL_PW );
-        }
-
-        // Check to see if the admin pool min connections has been overridden by a system property:
-        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_MIN );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_MIN, szValue );
-            LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MIN, szValue );
-        }
-
-        // Check to see if the admin pool max connections has been overridden by a system property:
-        szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_MAX );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.LDAP_ADMIN_POOL_MAX, szValue );
-            LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MAX, szValue );
-        }
-
-        // Check to see if ssl enabled parameter has been overridden by a system property:
-        szValue = System.getProperty( EXT_ENABLE_LDAP_SSL );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.ENABLE_LDAP_SSL, szValue );
-            LOG.info( PREFIX, GlobalIds.ENABLE_LDAP_SSL, szValue );
-        }
-
-        // Check to see if the ssl debug enabled parameter has been overridden by a system property:
-        szValue = System.getProperty( EXT_ENABLE_LDAP_SSL_DEBUG );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG, szValue );
-            LOG.info( PREFIX, GlobalIds.ENABLE_LDAP_SSL_DEBUG, szValue );
-        }
-
-        // Check to see if the trust store location has been overridden by a system property:
-        szValue = System.getProperty( EXT_TRUST_STORE );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.TRUST_STORE, szValue );
-            LOG.info( PREFIX, GlobalIds.TRUST_STORE, szValue );
-        }
-
-        // Check to see if the trust store password has been overridden by a system property:
-        szValue = System.getProperty( EXT_TRUST_STORE_PW );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.TRUST_STORE_PW, szValue );
-            // never display password value to log:
-            LOG.info( "getExternalConfig override name [{}]", GlobalIds.TRUST_STORE_PW );
-        }
-
-        // Check to see if the trust store set parameter has been overridden by a system property:
-        szValue = System.getProperty( EXT_SET_TRUST_STORE_PROP );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.SET_TRUST_STORE_PROP, szValue );
-            LOG.info( PREFIX, GlobalIds.SET_TRUST_STORE_PROP, szValue );
-        }
-
-        // Check to see if the config realm name has been overridden by a system property:
-        szValue = System.getProperty( EXT_CONFIG_REALM );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.CONFIG_REALM, szValue );
-            LOG.info( PREFIX, GlobalIds.CONFIG_REALM, szValue );
-        }
-
-        // Check to see if the config realm name has been overridden by a system property:
-        szValue = System.getProperty( EXT_CONFIG_ROOT_DN );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.CONFIG_ROOT_PARAM, szValue );
-            LOG.info( PREFIX, GlobalIds.CONFIG_ROOT_PARAM, szValue );
-        }
-
-        // Check to see if the ldap server type has been overridden by a system property:
-        szValue = System.getProperty( EXT_SERVER_TYPE  );
-        if( StringUtils.isNotEmpty( szValue ))
-        {
-            config.setProperty( GlobalIds.SERVER_TYPE, szValue );
-            LOG.info( PREFIX, GlobalIds.SERVER_TYPE, szValue );
-        }
-    }
-
-	public PropertiesConfiguration getConfig() {
-		return config;
-	}
-	
-    /**
-     * Gets the prop attribute as String value from the apache commons cfg component.
-     *
-     * @param name contains the name of the property.
-     * @return contains the value associated with the property or null if not not found.
-     */
-    public String getProperty( String name )
-    {
-        String value = null;
-        if ( config != null )
-        {
-            value = ( String ) config.getProperty( name );
-            LOG.debug( "getProperty name [{}] value [{}]", name, value );
-        }
-        else
-        {
-            LOG.error( "getProperty invalid config, can't read prop [{}]", name );
-        }
-        return value;
-    }
-    
-
-    /**
-     * Get the property value from the apache commons config but specify a default value if not found.
-     *
-     * @param name         contains the name of the property.
-     * @param defaultValue specified by client will be returned if property value is not found.
-     * @return contains the value for the property as a String.
-     */
-    public String getProperty( String name, String defaultValue )
-    {
-        String value = null;
-        if ( config != null )
-        {
-            value = ( String ) config.getProperty( name );
-        }
-        else
-        {
-            String warn = "getProperty invalid config, can't read prop [" + name + "]";
-            LOG.warn( warn );
-        }
-        if ( value == null || value.length() == 0 )
-        {
-            value = defaultValue;
-        }
-        return value;
-    }
-    
-    /**
-     * Gets the int attribute of the Config class, or 0 if not found.
-     *
-     * @param key name of the property name.
-     * @return The int value or 0 if not found.
-     */
-    public int getInt( String key )
-    {
-        int value = 0;
-        if ( config != null )
-        {
-            value = config.getInt( key );
-        }
-        else
-        {
-            String warn = "getInt invalid config, can't read prop [" + key + "]";
-            LOG.warn( warn );
-        }
-        return value;
-    }
-
-
-    /**
-     * Gets the int attribute of the Config class or default value if not found.
-     *
-     * @param key          name of the property name.
-     * @param defaultValue to use if property not found.
-     * @return The int value or default value if not found.
-     */
-    public int getInt( String key, int defaultValue )
-    {
-        int value = 0;
-        if ( config != null )
-        {
-            value = config.getInt( key, defaultValue );
-        }
-        else
-        {
-            String warn = "getInt invalid config, can't read prop [" + key + "]";
-            LOG.warn( warn );
-        }
-        return value;
-    }
-
-    /**
-     * Gets the boolean attribute associated with the name or false if not found.
-     *
-     * @param key name of the property name.
-     * @return The boolean value or false if not found.
-     */
-    public boolean getBoolean( String key )
-    {
-        boolean value = false;
-        if ( config != null )
-        {
-            value = config.getBoolean( key );
-        }
-        else
-        {
-            String warn = "getBoolean - invalid config, can't read prop [" + key + "]";
-            LOG.warn( warn );
-        }
-        return value;
-    }
-
-
-    /**
-     * Gets the boolean attribute associated with the name or false if not found.
-     *
-     * @param key          name of the property name.
-     * @param defaultValue specified by client will be returned if property value is not found.
-     * @return The boolean value or false if not found.
-     */
-    public boolean getBoolean( String key, boolean defaultValue )
-    {
-        boolean value = defaultValue;
-        if ( config != null )
-        {
-            value = config.getBoolean( key, defaultValue );
-        }
-        else
-        {
-            String warn = "getBoolean - invalid config, can't read prop [" + key + "]";
-            LOG.warn( warn );
-        }
-        return value;
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e9c143f7/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
index be17eac..bf5d516 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.core.util.crypto;
 
-import org.apache.directory.fortress.core.util.LocalConfig;
+import org.apache.directory.fortress.core.util.Config;
 import org.jasypt.util.text.BasicTextEncryptor;
 
 /**
@@ -48,7 +48,7 @@ public final class EncryptUtil
     private void init()
     {
         textEncryptor = new BasicTextEncryptor();
-        textEncryptor.setPassword(LocalConfig.getInstance().getProperty(CRYPTO_PROP, "adlfarerovcja;39 d"));
+        textEncryptor.setPassword(Config.getInstance().getProperty(CRYPTO_PROP, "adlfarerovcja;39 d"));
     }
 
     /**
@@ -84,7 +84,7 @@ public final class EncryptUtil
     public static boolean isEnabled()
     {
         boolean result = false;
-        if(LocalConfig.getInstance().getProperty(CRYPTO_PROP)!= null && !LocalConfig.getInstance().getProperty(CRYPTO_PROP).equals("${crypto.prop}"))
+        if(Config.getInstance().getProperty(CRYPTO_PROP)!= null && !Config.getInstance().getProperty(CRYPTO_PROP).equals("${crypto.prop}"))
         {
             result = true;
         }


Mime
View raw message