svn commit: r730172 - in /directory/apacheds/trunk/server-integ/src: main/java/org/apache/directory/server/integ/ test/java/org/apache/directory/server/kerberos/ test/java/org/apache/directory/server/operations/bind/ test/java/org/apache/directory/serv...

Author: elecharny
Date: Tue Dec 30 08:37:54 2008
New Revision: 730172

URL: http://svn.apache.org/viewvc?rev=730172&view=rev
Log:
Forget to commit those classes ...

Modified:
    
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
    
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java

Modified: 
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java
 Tue Dec 30 08:37:54 2008
@@ -36,7 +36,6 @@
 import 
org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 
 
@@ -71,9 +70,7 @@
             LdapService ldapService = new LdapService();
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
-            ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.getTcpTransport().setNbThreads( 3 );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
+            ldapService.setTcpTransport( new TcpTransport( port, 3 ) );
             ldapService.addExtendedOperationHandler( new StartTlsHandler() );
             ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
 Tue Dec 30 08:37:54 2008
@@ -51,7 +51,6 @@
 import 
org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Before;
 import org.junit.Test;
@@ -145,10 +144,8 @@
              ldapService.setDirectoryService( service );
              int port = AvailablePortFinder.getNextAvailable( 1024 );
              ldapService.setTcpTransport( new TcpTransport( port ) );
-             ldapService.setSocketAcceptor( new NioSocketAcceptor() );
              ldapService.setAllowAnonymousAccess( false );
              ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
-             ldapService.getTcpTransport().setNbThreads( 3 );
 
              // Setup SASL Mechanisms
              

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
 Tue Dec 30 08:37:54 2008
@@ -46,7 +46,6 @@
 import 
org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.After;
 import org.junit.Before;
@@ -134,8 +133,6 @@
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.setAllowAnonymousAccess( false );
             ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
 Tue Dec 30 08:37:54 2008
@@ -62,7 +62,6 @@
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.MutableControl;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.After;
 import org.junit.Before;
@@ -125,8 +124,6 @@
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.setAllowAnonymousAccess( true );
             ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
 Tue Dec 30 08:37:54 2008
@@ -71,7 +71,6 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
 import org.apache.mina.core.session.IoSession;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Before;
 import org.junit.Test;
@@ -154,9 +153,7 @@
              LdapService ldapService = new LdapService();
              int port = AvailablePortFinder.getNextAvailable( 1024 );
              ldapService.setTcpTransport( new TcpTransport( port ) );
-             ldapService.getTcpTransport().setNbThreads( 3 );
              ldapService.setDirectoryService( service );
-             ldapService.setSocketAcceptor( new NioSocketAcceptor() );
              ldapService.setAllowAnonymousAccess( false );
              ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
 Tue Dec 30 08:37:54 2008
@@ -42,7 +42,6 @@
 import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.OidNormalizer;
 import org.apache.directory.shared.ldap.sp.JavaStoredProcUtils;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Before;
 import org.junit.Test;
@@ -97,8 +96,6 @@
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.setEnabled( true );
             ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
 Tue Dec 30 08:37:54 2008
@@ -62,7 +62,6 @@
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -138,8 +137,6 @@
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.addExtendedOperationHandler( new StartTlsHandler() );
             ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
 Tue Dec 30 08:37:54 2008
@@ -47,7 +47,6 @@
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -185,8 +184,6 @@
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.addExtendedOperationHandler( new StartTlsHandler() );
             ldapService.addExtendedOperationHandler( new 
StoredProcedureExtendedOperationHandler() );
 

Modified: 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=730172&r1=730171&r2=730172&view=diff
==============================================================================
--- 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
 (original)
+++ 
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
 Tue Dec 30 08:37:54 2008
@@ -39,7 +39,6 @@
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.server.ssl.SSLSocketFactory;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -93,8 +92,6 @@
             ldapService.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.setEnabled( true );
             ldapService.setEnableLdaps( true );
             ldapService.setConfidentialityRequired( true );