You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/10/13 23:34:38 UTC
svn commit: r704263 [4/4] - in /directory: apacheds/branches/apacheds-mina2/
apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/
apacheds/branches/apacheds-mina2/kerberos-shared/src/test/ja...
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=704263&r1=704262&r2=704263&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 Mon Oct 13 14:34:35 2008
@@ -21,6 +21,7 @@
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;
@@ -34,8 +35,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.SupportedSaslMechanisms;
+import org.apache.mina.transport.socket.nio.NioProcessor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.util.AvailablePortFinder;
@@ -69,7 +71,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( new NioProcessor( Executors.newCachedThreadPool() ) ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.addExtendedOperationHandler( new StartTlsHandler() );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/state/NonExistentState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/state/NonExistentState.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/state/NonExistentState.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/state/NonExistentState.java Mon Oct 13 14:34:35 2008
@@ -83,6 +83,7 @@
}
catch ( Exception e )
{
+ e.printStackTrace();
throw new NamingException( e.getMessage() );
}
}
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java Mon Oct 13 14:34:35 2008
@@ -49,8 +49,8 @@
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
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.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;
@@ -142,7 +142,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setAllowAnonymousAccess( false );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java Mon Oct 13 14:34:35 2008
@@ -44,8 +44,8 @@
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
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.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;
@@ -131,7 +131,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setAllowAnonymousAccess( false );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Mon Oct 13 14:34:35 2008
@@ -56,12 +56,12 @@
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.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
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;
@@ -122,7 +122,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setAllowAnonymousAccess( true );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Mon Oct 13 14:34:35 2008
@@ -59,7 +59,6 @@
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;
@@ -70,7 +69,8 @@
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.common.IoSession;
+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;
@@ -152,7 +152,7 @@
LdapService ldapService = new LdapService();
ldapService.setDirectoryService( service );
- ldapService.setSocketAcceptor( new SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setAllowAnonymousAccess( false );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java Mon Oct 13 14:34:35 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 SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setEnabled( true );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java Mon Oct 13 14:34:35 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 SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.addExtendedOperationHandler( new StartTlsHandler() );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java Mon Oct 13 14:34:35 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 SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.addExtendedOperationHandler( new StartTlsHandler() );
ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
Modified: directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java Mon Oct 13 14:34:35 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 SocketAcceptor( null ) );
+ ldapService.setSocketAcceptor( new NioSocketAcceptor( null ) );
ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
ldapService.setEnabled( true );
ldapService.setEnableLdaps( true );
Modified: directory/apacheds/branches/apacheds-mina2/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Mon Oct 13 14:34:35 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.common.ByteBuffer;
-import org.apache.mina.common.SimpleByteBufferAllocator;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.buffer.SimpleBufferAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,8 +101,8 @@
this.ldapService = ldapService;
this.ldapsService = ldapsService;
- ByteBuffer.setAllocator( new SimpleByteBufferAllocator() );
- ByteBuffer.setUseDirectBuffers( false );
+ IoBuffer.setAllocator( new SimpleBufferAllocator() );
+ IoBuffer.setUseDirectBuffer( false );
}
Modified: directory/apacheds/branches/apacheds-mina2/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java (original)
+++ directory/apacheds/branches/apacheds-mina2/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java Mon Oct 13 14:34:35 2008
@@ -54,7 +54,6 @@
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;
@@ -62,6 +61,7 @@
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,15 +92,13 @@
/** 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 SocketAcceptor socketAcceptor;
+ protected NioSocketAcceptor socketAcceptor;
protected LdapService ldapService;
@@ -254,7 +252,7 @@
start++;
directoryService = new DefaultDirectoryService();
directoryService.setShutdownHookEnabled( false );
- socketAcceptor = new SocketAcceptor( null );
+ socketAcceptor = new NioSocketAcceptor( null );
ldapService = new LdapService();
ldapService.setSocketAcceptor( socketAcceptor );
ldapService.setDirectoryService( directoryService );
Modified: directory/installers/branches/installers-mina2/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/branches/installers-mina2/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/installers/branches/installers-mina2/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java (original)
+++ directory/installers/branches/installers-mina2/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java Mon Oct 13 14:34:35 2008
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.ldap.LdapService;
-import org.apache.directory.server.protocol.shared.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@
LOG.info( "server: using default settings ..." );
DirectoryService directoryService = new DefaultDirectoryService();
directoryService.startup();
- SocketAcceptor socketAcceptor = new SocketAcceptor( null );
+ NioSocketAcceptor socketAcceptor = new NioSocketAcceptor( null );
LdapService ldapService = new LdapService();
ldapService.setSocketAcceptor( socketAcceptor );
ldapService.setDirectoryService( directoryService );
Modified: directory/installers/branches/installers-mina2/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/installers-mina2/pom.xml?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/installers/branches/installers-mina2/pom.xml (original)
+++ directory/installers/branches/installers-mina2/pom.xml Mon Oct 13 14:34:35 2008
@@ -154,13 +154,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>1.1.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- <version>1.1.7</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
Modified: directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java (original)
+++ directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java Mon Oct 13 14:34:35 2008
@@ -22,8 +22,8 @@
import org.apache.directory.shared.asn1.codec.stateful.DecoderCallback;
import org.apache.directory.shared.asn1.codec.stateful.StatefulDecoder;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderAdapter;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -47,7 +47,7 @@
}
- public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws DecoderException
+ public void decode( IoSession session, IoBuffer in, ProtocolDecoderOutput out ) throws DecoderException
{
callback.decOut = out;
decoder.decode( in.buf() );
Modified: directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java (original)
+++ directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java Mon Oct 13 14:34:35 2008
@@ -26,8 +26,8 @@
import org.apache.directory.shared.asn1.codec.stateful.EncoderCallback;
import org.apache.directory.shared.asn1.codec.stateful.StatefulEncoder;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
@@ -73,8 +73,7 @@
if( encoded instanceof java.nio.ByteBuffer )
{
java.nio.ByteBuffer buf = ( java.nio.ByteBuffer ) encoded;
- ByteBuffer wrappedBuf = ByteBuffer.wrap( buf );
- wrappedBuf.acquire(); // acquire once more to prvent leak
+ IoBuffer wrappedBuf = IoBuffer.wrap( buf );
encOut.write( wrappedBuf );
}
else if( encoded instanceof Object[] )
Modified: directory/shared/branches/shared-mina2/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-mina2/pom.xml?rev=704263&r1=704262&r2=704263&view=diff
==============================================================================
--- directory/shared/branches/shared-mina2/pom.xml (original)
+++ directory/shared/branches/shared-mina2/pom.xml Mon Oct 13 14:34:35 2008
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>1.1.7</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>