Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 9476 invoked from network); 2 Nov 2008 00:42:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2008 00:42:04 -0000 Received: (qmail 78314 invoked by uid 500); 2 Nov 2008 00:42:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78247 invoked by uid 500); 2 Nov 2008 00:42:10 -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 78238 invoked by uid 99); 2 Nov 2008 00:42:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2008 17:42:10 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 02 Nov 2008 00:41:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 11237238896F; Sat, 1 Nov 2008 17:41:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r709818 - /directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java Date: Sun, 02 Nov 2008 00:41:43 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081102004144.11237238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Nov 1 17:41:43 2008 New Revision: 709818 URL: http://svn.apache.org/viewvc?rev=709818&view=rev Log: Initialize the factory accordingly to MINA 2 Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java?rev=709818&r1=709817&r2=709818&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java (original) +++ directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java Sat Nov 1 17:41:43 2008 @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; -import java.util.concurrent.Executors; import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; @@ -36,7 +35,6 @@ import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms; -import org.apache.mina.transport.socket.nio.NioProcessor; import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.apache.mina.util.AvailablePortFinder; @@ -71,7 +69,7 @@ LdapService ldapService = new LdapService(); ldapService.setDirectoryService( service ); - ldapService.setSocketAcceptor( new NioSocketAcceptor( new NioProcessor( Executors.newCachedThreadPool() ) ) ); + ldapService.setSocketAcceptor( new NioSocketAcceptor() ); ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) ); ldapService.addExtendedOperationHandler( new StartTlsHandler() ); ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );