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...

[el...@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() );