You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2016/10/19 21:29:48 UTC
[2/6] archiva-redback-core git commit: Use NamingManager instead of
LdapCtxFactory
Use NamingManager instead of LdapCtxFactory
Fixes deprecation warnings on LdapCtxFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/c9ca73b9
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/c9ca73b9
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/c9ca73b9
Branch: refs/heads/jpa
Commit: c9ca73b94cb294a6d87bbaf75560293744f5e7fe
Parents: c49cb23
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Mon Oct 3 18:32:52 2016 +0300
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Mon Oct 3 18:32:52 2016 +0300
----------------------------------------------------------------------
.../ldap/connection/DefaultLdapConnection.java | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c9ca73b9/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java
index 83f0126..1a6c555 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java
@@ -19,7 +19,6 @@ package org.apache.archiva.redback.common.ldap.connection;
* under the License.
*/
-import com.sun.jndi.ldap.LdapCtxFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +31,7 @@ import java.util.Collections;
import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
+import javax.naming.spi.NamingManager;
/**
* The configuration for a connection will not change.
@@ -43,15 +43,6 @@ public class DefaultLdapConnection
implements LdapConnection
{
- private static LdapCtxFactory ctxFactory;// = new LdapCtxFactory();
-
-
- static
- {
- initCtxFactory();
- }
-
-
private Logger log = LoggerFactory.getLogger( getClass() );
private LdapConnectionConfiguration config;
@@ -60,11 +51,6 @@ public class DefaultLdapConnection
private List<Rdn> baseDnRdns;
- private static void initCtxFactory()
- {
- ctxFactory = new LdapCtxFactory();
- }
-
public DefaultLdapConnection( LdapConnectionConfiguration config, Rdn subRdn )
throws LdapException
{
@@ -92,7 +78,7 @@ public class DefaultLdapConnection
try
{
- context = (DirContext) ctxFactory.getInitialContext( e );
+ context = (DirContext) NamingManager.getInitialContext( e );
}
catch ( NamingException ex )
{
@@ -121,7 +107,7 @@ public class DefaultLdapConnection
try
{
- context = (DirContext) ctxFactory.getInitialContext( e );
+ context = (DirContext) NamingManager.getInitialContext( e );
}
catch ( NamingException ex )
{