Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A0537991B for ; Mon, 12 Mar 2012 14:38:31 +0000 (UTC) Received: (qmail 25998 invoked by uid 500); 12 Mar 2012 14:38:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 25964 invoked by uid 500); 12 Mar 2012 14:38:31 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 25956 invoked by uid 99); 12 Mar 2012 14:38:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 14:38:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 14:38:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1450B2388C29 for ; Mon, 12 Mar 2012 14:38:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1299690 - in /directory: apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/ apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/ shared/trunk/ldap/client/api/src/main/j... Date: Mon, 12 Mar 2012 14:38:09 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120312143810.1450B2388C29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Mar 12 14:38:09 2012 New Revision: 1299690 URL: http://svn.apache.org/viewvc?rev=1299690&view=rev Log: Removed the LdapConnectionFactory class Removed: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionFactory.java Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java?rev=1299690&r1=1299689&r2=1299690&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java (original) +++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/DelegatingAuthenticator.java Mon Mar 12 14:38:09 2012 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.net.SocketAddress; import org.apache.directory.ldap.client.api.LdapConnection; -import org.apache.directory.ldap.client.api.LdapConnectionFactory; +import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.server.core.api.LdapPrincipal; import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.i18n.I18n; @@ -123,8 +123,8 @@ public class DelegatingAuthenticator ext LOG.debug( "Authenticating {}", bindContext.getDn() ); } - // Create a connection on the remote host - LdapConnection ldapConnection = LdapConnectionFactory.getNetworkConnection( delegateHost, delegatePort ); + // Create a connection on the remote host + LdapConnection ldapConnection = new LdapNetworkConnection( delegateHost, delegatePort ); try { Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java?rev=1299690&r1=1299689&r2=1299690&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java Mon Mar 12 14:38:09 2012 @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTru import static org.junit.Assert.fail; import org.apache.directory.ldap.client.api.LdapConnection; -import org.apache.directory.ldap.client.api.LdapConnectionFactory; +import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifs; @@ -72,7 +72,7 @@ public class DelegatedAuthIT extends Abs * Test with bindDn which is not even found under any namingContext of the * server. * - * @throws Exception + * @throws Exception */ @CreateDS( allowAnonAccess = true, @@ -93,7 +93,7 @@ public class DelegatedAuthIT extends Abs { assertTrue( getService().isStarted() ); assertEquals( "DelegatedAuthIT-method", getService().getInstanceId() ); - LdapConnection ldapConnection = LdapConnectionFactory.getNetworkConnection( "localhost", getLdapServer() + LdapConnection ldapConnection = new LdapNetworkConnection( "localhost", getLdapServer() .getPort() ); ldapConnection.bind( "uid=antoine,ou=users,ou=system", "secret" ); @@ -132,7 +132,7 @@ public class DelegatedAuthIT extends Abs * Test with bindDn which is not even found under any namingContext of the * server. * - * @throws Exception + * @throws Exception */ @CreateDS( allowAnonAccess = true, @@ -167,8 +167,7 @@ public class DelegatedAuthIT extends Abs { assertTrue( getService().isStarted() ); assertEquals( "DelegatedAuthIT-MultipleAuthenticators-method", getService().getInstanceId() ); - LdapConnection ldapConnection = LdapConnectionFactory.getNetworkConnection( "localhost", getLdapServer() - .getPort() ); + LdapConnection ldapConnection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() ); ldapConnection.bind( "uid=emmanuel,ou=users,ou=system", "sesame" ); assertTrue( ldapConnection.isAuthenticated() );