You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/10/13 12:16:12 UTC
svn commit: r704006 [4/4] - in /directory/apacheds/trunk: ./
kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/
kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/
mitosis/src/main/java/org/a...
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=704006&r1=704005&r2=704006&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 Mon Oct 13 03:16:07 2008
@@ -59,6 +59,7 @@
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmProvider;
import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.message.BindRequestImpl;
@@ -69,8 +70,7 @@
import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
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.common.IoSession;
import org.apache.mina.util.AvailablePortFinder;
import org.junit.Before;
import org.junit.Test;
@@ -152,7 +152,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
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=704006&r1=704005&r2=704006&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 Mon Oct 13 03:16:07 2008
@@ -37,11 +37,11 @@
import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
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;
@@ -94,7 +94,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
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=704006&r1=704005&r2=704006&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 Mon Oct 13 03:16:07 2008
@@ -58,10 +58,10 @@
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
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;
@@ -135,7 +135,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
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=704006&r1=704005&r2=704006&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 Mon Oct 13 03:16:07 2008
@@ -44,9 +44,9 @@
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
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;
@@ -182,7 +182,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
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=704006&r1=704005&r2=704006&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 Mon Oct 13 03:16:07 2008
@@ -36,9 +36,9 @@
import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
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;
@@ -90,7 +90,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setEnabled( true );
ldapService.setEnableLdaps( true );
Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=704006&r1=704005&r2=704006&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Mon Oct 13 03:16:07 2008
@@ -34,8 +34,8 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.StringTools;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.buffer.SimpleBufferAllocator;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.SimpleByteBufferAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,8 +101,8 @@
this.ldapService = ldapService;
this.ldapsService = ldapsService;
- IoBuffer.setAllocator( new SimpleBufferAllocator() );
- IoBuffer.setUseDirectBuffer( false );
+ ByteBuffer.setAllocator( new SimpleByteBufferAllocator() );
+ ByteBuffer.setUseDirectBuffers( false );
}
Modified: directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java?rev=704006&r1=704005&r2=704006&view=diff
==============================================================================
--- directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java (original)
+++ directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java Mon Oct 13 03:16:07 2008
@@ -54,6 +54,7 @@
import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -61,7 +62,6 @@
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.util.AvailablePortFinder;
import org.slf4j.Logger;
@@ -92,13 +92,15 @@
/** flag whether to delete database files for each test or not */
protected boolean doDelete = true;
+// protected ApacheDS apacheDS = new ApacheDS();
+
protected int port = -1;
private static int start;
private static long t0;
protected static int nbTests = 10000;
protected DirectoryService directoryService;
- protected NioSocketAcceptor socketAcceptor;
+ protected SocketAcceptor socketAcceptor;
protected LdapService ldapService;
@@ -252,7 +254,7 @@
start++;
directoryService = new DefaultDirectoryService();
directoryService.setShutdownHookEnabled( false );
- socketAcceptor = new NioSocketAcceptor( null );
+ socketAcceptor = new SocketAcceptor( null );
ldapService = new LdapService();
ldapService.setSocketAcceptor( socketAcceptor );
ldapService.setDirectoryService( directoryService );