You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/05/22 14:32:00 UTC
directory-fortress-core git commit: FC-105 - [fortress-core] - must
be private and have accessor methods
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 8c3acdd32 -> b1c9dc069
FC-105 - [fortress-core] - must be private and have accessor methods
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/b1c9dc06
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/b1c9dc06
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/b1c9dc06
Branch: refs/heads/master
Commit: b1c9dc06963c63bfaf4478d9e2fdd67fad7f0fc8
Parents: 8c3acdd
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri May 22 07:31:54 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri May 22 07:31:54 2015 -0500
----------------------------------------------------------------------
.../fortress/core/ant/FortressAntTask.java | 26 ++++++++++----------
.../core/ldap/ApacheDsDataProvider.java | 8 ++++--
2 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b1c9dc06/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
index a2270a9..edc093e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
@@ -230,21 +230,21 @@ public class FortressAntTask extends Task implements InputHandler
private final List<Deladminroleinheritance> deladminroleinheritances = new ArrayList<>();
private final List<Deluseradminrole> deluseradminroles = new ArrayList<>();
private final List<Addcontext> addcontexts = new ArrayList<>();
- protected final List<Addgroup> addgroups = new ArrayList<>();
- protected final List<Delgroup> delgroups = new ArrayList<>();
- protected final List<Addgroupmember> addgroupmembers = new ArrayList<>();
- protected final List<Delgroupmember> delgroupmembers = new ArrayList<>();
- protected final List<Addgroupproperty> addgroupproperties = new ArrayList<>();
- protected final List<Delgroupproperty> delgroupproperties = new ArrayList<>();
-
- protected ConfigMgr cfgMgr = null;
- protected AdminMgr adminMgr = null;
- protected DelAdminMgr dAdminMgr = null;
- protected PwPolicyMgr policyMgr = null;
- protected GroupMgr groupMgr = null;
+ private final List<Addgroup> addgroups = new ArrayList<>();
+ private final List<Delgroup> delgroups = new ArrayList<>();
+ private final List<Addgroupmember> addgroupmembers = new ArrayList<>();
+ private final List<Delgroupmember> delgroupmembers = new ArrayList<>();
+ private final List<Addgroupproperty> addgroupproperties = new ArrayList<>();
+ private final List<Delgroupproperty> delgroupproperties = new ArrayList<>();
+
+ private ConfigMgr cfgMgr = null;
+ private AdminMgr adminMgr = null;
+ private DelAdminMgr dAdminMgr = null;
+ private PwPolicyMgr policyMgr = null;
+ private GroupMgr groupMgr = null;
private static final String CLS_NM = FortressAntTask.class.getName();
protected static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
- protected Context context;
+ private Context context;
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b1c9dc06/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index 599cc7c..f9b9bc5 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -82,6 +82,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
import org.apache.directory.fortress.core.util.time.CUtil;
import org.apache.directory.fortress.core.util.time.Constraint;
+import org.apache.directory.ldap.client.api.ValidatingPoolableLdapConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -215,7 +216,9 @@ public abstract class ApacheDsDataProvider
throw new CfgRuntimeException( GlobalErrIds.FT_APACHE_LDAP_POOL_INIT_FAILED, error, ex );
}
- PoolableObjectFactory<LdapConnection> poolFactory = new DefaultPoolableLdapConnectionFactory( config );
+ //PoolableObjectFactory<LdapConnection> poolFactory = new DefaultPoolableLdapConnectionFactory( config );
+ PoolableObjectFactory<LdapConnection> poolFactory = new ValidatingPoolableLdapConnectionFactory( config );
+
// Create the Admin pool
adminPool = new LdapConnectionPool( poolFactory );
@@ -267,7 +270,8 @@ public abstract class ApacheDsDataProvider
logPw = Config.getProperty( LDAP_LOG_POOL_PW );
}
logConfig.setCredentials( logPw );
- poolFactory = new DefaultPoolableLdapConnectionFactory( logConfig );
+ //poolFactory = new DefaultPoolableLdapConnectionFactory( logConfig );
+ poolFactory = new ValidatingPoolableLdapConnectionFactory( logConfig );
logPool = new LdapConnectionPool( poolFactory );
logPool.setTestOnBorrow( true );
logPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );