You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/07/19 15:57:37 UTC
directory-fortress-core git commit: Migrating to Apache LDAP API
2.0.0.AM1-SNAPSHOT and ApacheDS 2.0.0.AM25-SNAPSHOT
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 8ec2624e5 -> 7fdd12f6a
Migrating to Apache LDAP API 2.0.0.AM1-SNAPSHOT and ApacheDS 2.0.0.AM25-SNAPSHOT
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/7fdd12f6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/7fdd12f6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/7fdd12f6
Branch: refs/heads/master
Commit: 7fdd12f6aef06c43817c6f6a71baeb67f9e19000
Parents: 8ec2624
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Jul 19 17:57:08 2018 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Jul 19 17:57:08 2018 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
.../fortress/core/ldap/LdapConnectionProvider.java | 17 +++++++++--------
.../fortress/core/ldap/LdapDataProvider.java | 10 +++++-----
3 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7fdd12f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f8e4432..4736f18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,8 +94,8 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apache.jdbm1>2.0.0-M3</version.apache.jdbm1>
- <version.apacheds>2.0.0-M24</version.apacheds>
- <version.api.all>1.0.2</version.api.all>
+ <version.apacheds>2.0.0.AM25-SNAPSHOT</version.apacheds>
+ <version.api.all>2.0.0.AM1-SNAPSHOT</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.10</version.commons.codec>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7fdd12f6/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 5aff0b5..3a60db7 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
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.pool.PoolableObjectFactory;
import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.codec.standalone.StandaloneLdapApiService;
@@ -176,7 +177,7 @@ public class LdapConnectionProvider
listExOps.add( "org.openldap.accelerator.impl.dropRole.RbacDropRoleFactory" );
listExOps.add( "org.openldap.accelerator.impl.deleteSession.RbacDeleteSessionFactory" );
listExOps.add( "org.openldap.accelerator.impl.sessionRoles.RbacSessionRolesFactory" );
- LdapApiService ldapApiService = new StandaloneLdapApiService( new ArrayList<String>(), listExOps );
+ LdapApiService ldapApiService = new StandaloneLdapApiService( null, new ArrayList<String>(), listExOps );
if ( !LdapApiServiceFactory.isInitialized() )
{
@@ -190,13 +191,13 @@ public class LdapConnectionProvider
throw new CfgRuntimeException( GlobalErrIds.FT_APACHE_LDAP_POOL_INIT_FAILED, error, ex );
}
- PoolableObjectFactory<LdapConnection> poolFactory = new ValidatingPoolableLdapConnectionFactory( config );
+ PooledObjectFactory<LdapConnection> poolFactory = new ValidatingPoolableLdapConnectionFactory( config );
// Create the Admin pool
adminPool = new LdapConnectionPool( poolFactory );
adminPool.setTestOnBorrow( true );
- adminPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
- adminPool.setMaxActive( max );
+ adminPool.setBlockWhenExhausted(false);
+ adminPool.setMaxTotal( max );
adminPool.setMinIdle( min );
adminPool.setMaxIdle( -1 );
//adminPool.setMaxWait( 0 );
@@ -204,8 +205,8 @@ public class LdapConnectionProvider
// Create the User pool
userPool = new LdapConnectionPool( poolFactory );
userPool.setTestOnBorrow( true );
- userPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
- userPool.setMaxActive( max );
+ userPool.setBlockWhenExhausted( false );
+ userPool.setMaxTotal( max );
userPool.setMinIdle( min );
userPool.setMaxIdle( -1 );
@@ -246,8 +247,8 @@ public class LdapConnectionProvider
poolFactory = new ValidatingPoolableLdapConnectionFactory( logConfig );
logPool = new LdapConnectionPool( poolFactory );
logPool.setTestOnBorrow( true );
- logPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
- logPool.setMaxActive( logmax );
+ logPool.setBlockWhenExhausted( false );
+ logPool.setMaxTotal( logmax );
logPool.setMinIdle( logmin );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7fdd12f6/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
index 4b72891..d7ad982 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
@@ -713,9 +713,9 @@ public abstract class LdapDataProvider
Attribute attr = entry.get( attributeName );
if ( attr != null )
{
- for ( Value<?> value : attr )
+ for ( Value value : attr )
{
- attrValues.add( value.getString() );
+ attrValues.add( value.getValue() );
}
}
else
@@ -765,9 +765,9 @@ public abstract class LdapDataProvider
if ( entry != null && entry.containsAttribute( attributeName ) )
{
- for ( Value<?> value : entry.get( attributeName ) )
+ for ( Value value : entry.get( attributeName ) )
{
- attrValues.add( value.getString() );
+ attrValues.add( value.getValue() );
}
}
@@ -828,7 +828,7 @@ public abstract class LdapDataProvider
{
try
{
- return new Dn( dn ).getRdn().getNormValue();
+ return new Dn( dn ).getRdn().getValue();
}
catch ( LdapInvalidDnException lide )
{