Author: elecharny Date: Mon Oct 13 14:34:35 2008 New Revision: 704263 URL: http://svn.apache.org/viewvc?rev=704263&view=rev Log: reapplied the patch for MINA 2.0 migration Removed: directory/apacheds/branches/apacheds-mina2/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DatagramAcceptor.java directory/apacheds/branches/apacheds-mina2/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/SocketAcceptor.java Modified: directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesAckMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryAckMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationClientProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationServerProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageDecoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageEncoder.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationContextHandler.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java directory/apacheds/branches/apacheds-mina2/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java directory/apacheds/branches/apacheds-mina2/pom.xml directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordTcpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordTcpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordTcpProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordUdpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordUdpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordUdpProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java directory/apacheds/branches/apacheds-mina2/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java directory/apacheds/branches/apacheds-mina2/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/CanonicalNameRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/MailExchangeRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/NameServerRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/PointerRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/QuestionRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/ResourceRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/ServerSelectionRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/StartOfAuthorityRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/TextRecordEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolTcpCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolUdpCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsTcpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsTcpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsUdpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsUdpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AbstractResourceRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/CanonicalNameRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/MailExchangeRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/NameServerRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/PointerRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/QuestionRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/ServerSelectionRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/StartOfAuthorityRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/TextRecordEncoderTest.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosUdpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosUdpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosUdpProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java directory/apacheds/branches/apacheds-mina2/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/pom.xml directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSessionManager.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractMechanismHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslFilter.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java directory/apacheds/branches/apacheds-mina2/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java directory/apacheds/branches/apacheds-mina2/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java directory/apacheds/branches/apacheds-mina2/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java directory/apacheds/branches/apacheds-mina2/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java directory/apacheds/branches/apacheds-mina2/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java directory/apacheds/branches/apacheds-mina2/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java directory/apacheds/branches/apacheds-mina2/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java directory/apacheds/branches/apacheds-mina2/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java directory/apacheds/branches/apacheds-mina2/server-integ/src/main/java/org/apache/directory/server/integ/state/NonExistentState.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java directory/apacheds/branches/apacheds-mina2/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java directory/apacheds/branches/apacheds-mina2/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java directory/installers/branches/installers-mina2/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java directory/installers/branches/installers-mina2/pom.xml directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java directory/shared/branches/shared-mina2/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java directory/shared/branches/shared-mina2/pom.xml Modified: directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java (original) +++ directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java Mon Oct 13 14:34:35 2008 @@ -30,7 +30,7 @@ import java.util.Collections; import java.util.List; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; /** @@ -66,7 +66,7 @@ */ public static Keytab read( File file ) throws IOException { - ByteBuffer buffer = ByteBuffer.wrap( getBytesFromFile( file ) ); + IoBuffer buffer = IoBuffer.wrap( getBytesFromFile( file ) ); return readKeytab( buffer ); } @@ -92,7 +92,7 @@ public void write( File file ) throws IOException { KeytabEncoder writer = new KeytabEncoder(); - ByteBuffer buffer = writer.write( keytabVersion, entries ); + IoBuffer buffer = writer.write( keytabVersion, entries ); writeFile( buffer, file ); } @@ -141,7 +141,7 @@ */ static Keytab read( byte[] bytes ) { - ByteBuffer buffer = ByteBuffer.wrap( bytes ); + IoBuffer buffer = IoBuffer.wrap( bytes ); return readKeytab( buffer ); } @@ -150,7 +150,7 @@ * Write the keytab to a {@link ByteBuffer}. * @return The buffer. */ - ByteBuffer write() + IoBuffer write() { KeytabEncoder writer = new KeytabEncoder(); return writer.write( keytabVersion, entries ); @@ -163,7 +163,7 @@ * @param buffer * @return The keytab. */ - private static Keytab readKeytab( ByteBuffer buffer ) + private static Keytab readKeytab( IoBuffer buffer ) { KeytabDecoder reader = new KeytabDecoder(); byte[] keytabVersion = reader.getKeytabVersion( buffer ); @@ -227,7 +227,7 @@ * @param file * @throws IOException */ - protected void writeFile( ByteBuffer buffer, File file ) throws IOException + protected void writeFile( IoBuffer buffer, File file ) throws IOException { // Set append false to replace existing. FileChannel wChannel = new FileOutputStream( file, false ).getChannel(); Modified: directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java Mon Oct 13 14:34:35 2008 @@ -27,11 +27,11 @@ import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; /** - * Decode a {@link ByteBuffer} into keytab fields. + * Decode a {@link IoBuffer} into keytab fields. * * @author Apache Directory Project * @version $Rev$, $Date$ @@ -42,7 +42,7 @@ * Read the keytab 16-bit file format version. This * keytab reader currently only supports version 5.2. */ - byte[] getKeytabVersion( ByteBuffer buffer ) + byte[] getKeytabVersion( IoBuffer buffer ) { byte[] version = new byte[2]; buffer.get( version ); @@ -58,7 +58,7 @@ * @param buffer * @return The keytab entries. */ - List getKeytabEntries( ByteBuffer buffer ) + List getKeytabEntries( IoBuffer buffer ) { List entries = new ArrayList(); @@ -68,7 +68,7 @@ byte[] entry = new byte[size]; buffer.get( entry ); - entries.add( getKeytabEntry( ByteBuffer.wrap( entry ) ) ); + entries.add( getKeytabEntry( IoBuffer.wrap( entry ) ) ); } return entries; @@ -79,7 +79,7 @@ * Reads off a "keytab entry," which consists of a principal name, * principal type, key version number, and key material. */ - private KeytabEntry getKeytabEntry( ByteBuffer buffer ) + private KeytabEntry getKeytabEntry( IoBuffer buffer ) { String principalName = getPrincipalName( buffer ); @@ -102,7 +102,7 @@ * @param buffer * @return The principal name. */ - private String getPrincipalName( ByteBuffer buffer ) + private String getPrincipalName( IoBuffer buffer ) { int count = buffer.getUnsignedShort(); @@ -132,7 +132,7 @@ /** * Read off a 16-bit encryption type and symmetric key material. */ - private EncryptionKey getKeyBlock( ByteBuffer buffer, int keyVersion ) + private EncryptionKey getKeyBlock( IoBuffer buffer, int keyVersion ) { int type = buffer.getUnsignedShort(); byte[] keyblock = getCountedBytes( buffer ); @@ -148,7 +148,7 @@ * Use a prefixed 16-bit length to read off a String. Realm and name * components are ASCII encoded text with no zero terminator. */ - private String getCountedString( ByteBuffer buffer ) + private String getCountedString( IoBuffer buffer ) { int length = buffer.getUnsignedShort(); byte[] data = new byte[length]; @@ -169,7 +169,7 @@ /** * Use a prefixed 16-bit length to read off raw bytes. */ - private byte[] getCountedBytes( ByteBuffer buffer ) + private byte[] getCountedBytes( IoBuffer buffer ) { int length = buffer.getUnsignedShort(); byte[] data = new byte[length]; Modified: directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java Mon Oct 13 14:34:35 2008 @@ -24,11 +24,11 @@ import java.util.List; import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; /** - * Encode keytab fields into a {@link ByteBuffer}. + * Encode keytab fields into a {@link IoBuffer}. * * @author Apache Directory Project * @version $Rev$, $Date$ @@ -36,15 +36,15 @@ class KeytabEncoder { /** - * Write the keytab version and entries into a {@link ByteBuffer}. + * Write the keytab version and entries into a {@link IoBuffer}. * * @param keytabVersion * @param entries - * @return The ByteBuffer. + * @return The IoBuffer. */ - ByteBuffer write( byte[] keytabVersion, List entries ) + IoBuffer write( byte[] keytabVersion, List entries ) { - ByteBuffer buffer = ByteBuffer.allocate( 512 ); + IoBuffer buffer = IoBuffer.allocate( 512 ); putKeytabVersion( buffer, keytabVersion ); putKeytabEntries( buffer, entries ); buffer.flip(); @@ -57,7 +57,7 @@ * Encode the 16-bit file format version. This * keytab reader currently only support verision 5.2. */ - private void putKeytabVersion( ByteBuffer buffer, byte[] version ) + private void putKeytabVersion( IoBuffer buffer, byte[] version ) { buffer.put( version ); } @@ -69,13 +69,13 @@ * @param buffer * @param entries */ - private void putKeytabEntries( ByteBuffer buffer, List entries ) + private void putKeytabEntries( IoBuffer buffer, List entries ) { Iterator iterator = entries.iterator(); while ( iterator.hasNext() ) { - ByteBuffer entryBuffer = putKeytabEntry( iterator.next() ); + IoBuffer entryBuffer = putKeytabEntry( iterator.next() ); int size = entryBuffer.position(); entryBuffer.flip(); @@ -90,9 +90,9 @@ * Encode a "keytab entry," which consists of a principal name, * principal type, key version number, and key material. */ - private ByteBuffer putKeytabEntry( KeytabEntry entry ) + private IoBuffer putKeytabEntry( KeytabEntry entry ) { - ByteBuffer buffer = ByteBuffer.allocate( 100 ); + IoBuffer buffer = IoBuffer.allocate( 100 ); putPrincipalName( buffer, entry.getPrincipalName() ); @@ -114,7 +114,7 @@ * @param buffer * @param principalName */ - private void putPrincipalName( ByteBuffer buffer, String principalName ) + private void putPrincipalName( IoBuffer buffer, String principalName ) { String[] split = principalName.split( "@" ); String nameComponent = split[0]; @@ -138,7 +138,7 @@ /** * Encode a 16-bit encryption type and symmetric key material. */ - private void putKeyBlock( ByteBuffer buffer, EncryptionKey key ) + private void putKeyBlock( IoBuffer buffer, EncryptionKey key ) { buffer.putShort( ( short ) key.getKeyType().getOrdinal() ); putCountedBytes( buffer, key.getKeyValue() ); @@ -149,7 +149,7 @@ * Use a prefixed 16-bit length to encode a String. Realm and name * components are ASCII encoded text with no zero terminator. */ - private void putCountedString( ByteBuffer buffer, String string ) + private void putCountedString( IoBuffer buffer, String string ) { byte[] data = string.getBytes(); buffer.putShort( ( short ) data.length ); @@ -160,7 +160,7 @@ /** * Use a prefixed 16-bit length to encode raw bytes. */ - private void putCountedBytes( ByteBuffer buffer, byte[] data ) + private void putCountedBytes( IoBuffer buffer, byte[] data ) { buffer.putShort( ( short ) data.length ); buffer.put( data ); Modified: directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java (original) +++ directory/apacheds/branches/apacheds-mina2/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java Mon Oct 13 14:34:35 2008 @@ -38,7 +38,7 @@ import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory; import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; /** @@ -151,7 +151,7 @@ Keytab writer = Keytab.getInstance(); writer.setEntries( entries ); - ByteBuffer buffer = writer.write(); + IoBuffer buffer = writer.write(); assertEquals( "Expected file size.", 130, buffer.limit() ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java Mon Oct 13 14:34:35 2008 @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -34,16 +33,14 @@ import org.apache.directory.mitosis.service.protocol.handler.ReplicationClientContextHandler; import org.apache.directory.mitosis.service.protocol.handler.ReplicationClientProtocolHandler; import org.apache.directory.mitosis.service.protocol.handler.ReplicationProtocolHandler; -import org.apache.mina.common.ConnectFuture; -import org.apache.mina.common.ExecutorThreadModel; -import org.apache.mina.common.IoConnector; -import org.apache.mina.common.IoConnectorConfig; -import org.apache.mina.common.IoSession; -import org.apache.mina.common.RuntimeIOException; -import org.apache.mina.filter.LoggingFilter; +import org.apache.mina.core.RuntimeIoException; +import org.apache.mina.core.future.ConnectFuture; +import org.apache.mina.core.service.IoConnector; +import org.apache.mina.core.session.IoSession; +import org.apache.mina.filter.logging.LoggingFilter; import org.apache.mina.filter.codec.ProtocolCodecFilter; -import org.apache.mina.transport.socket.nio.SocketConnector; -import org.apache.mina.transport.socket.nio.SocketConnectorConfig; +import org.apache.mina.filter.executor.ExecutorFilter; +import org.apache.mina.transport.socket.nio.NioSocketConnector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,8 +67,7 @@ private static final Logger LOG = LoggerFactory.getLogger( ClientConnectionManager.class ); private final ReplicationInterceptor interceptor; - private final IoConnector connector = new SocketConnector(); - private final IoConnectorConfig connectorConfig = new SocketConnectorConfig(); + private final IoConnector connector = new NioSocketConnector(); private final Map sessions = new HashMap(); private ReplicationConfiguration configuration; private ConnectionMonitor monitor; @@ -81,16 +77,17 @@ { this.interceptor = interceptor; - ExecutorThreadModel threadModel = ExecutorThreadModel.getInstance( "mitosis" ); - threadModel.setExecutor( new ThreadPoolExecutor( 16, 16, 60, TimeUnit.SECONDS, new LinkedBlockingQueue() ) ); - connectorConfig.setThreadModel( threadModel ); - - //// add codec - connectorConfig.getFilterChain().addLast( "protocol", + ExecutorFilter executor = new ExecutorFilter( new ThreadPoolExecutor( 16, 16, 60, TimeUnit.SECONDS, new LinkedBlockingQueue() ) ); + + // Add executor filter + connector.getFilterChain().addLast( "executor", executor ); + + // add codec + connector.getFilterChain().addLast( "protocol", new ProtocolCodecFilter( new ReplicationClientProtocolCodecFactory() ) ); - //// add logger - connectorConfig.getFilterChain().addLast( "logger", new LoggingFilter() ); + // add logger + connector.getFilterChain().addLast( "logger", new LoggingFilter() ); } @@ -110,7 +107,8 @@ // remove all filters connector.getFilterChain().clear(); - ( ( ExecutorService ) ( ( ExecutorThreadModel ) connectorConfig.getThreadModel() ).getExecutor() ).shutdown(); + // Shutdown the executor + ((ThreadPoolExecutor)(((ExecutorFilter)(connector.getFilterChain().get( "executor" )))).getExecutor()).shutdown(); // Remove all status values. sessions.clear(); @@ -370,11 +368,11 @@ IoSession session; try { - connectorConfig.setConnectTimeout( configuration.getResponseTimeout() ); - ConnectFuture future = connector.connect( replica.getAddress(), new ReplicationClientProtocolHandler( - interceptor ), connectorConfig ); + connector.setConnectTimeoutMillis( configuration.getResponseTimeout() ); + connector.setHandler( new ReplicationClientProtocolHandler( interceptor ) ); + ConnectFuture future = connector.connect( replica.getAddress() ); - future.join(); + future.awaitUninterruptibly(); session = future.getSession(); synchronized ( con ) @@ -385,7 +383,7 @@ con.replicaId = replica.getId(); } } - catch ( RuntimeIOException e ) + catch ( RuntimeIoException e ) { LOG.warn( "[Replica-" + ClientConnectionManager.this.configuration.getReplicaId() + "] Failed to connect to replica-" + replica.getId(), e ); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java Mon Oct 13 14:34:35 2008 @@ -33,8 +33,9 @@ import org.apache.directory.mitosis.service.protocol.handler.ReplicationProtocolHandler; import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.server.core.DirectoryService; -import org.apache.mina.common.IoSession; -import org.apache.mina.util.SessionLog; +import org.apache.mina.core.session.IoSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The default implementation of {@link ReplicationContext} @@ -43,6 +44,9 @@ */ public class DefaultReplicationContext implements ReplicationContext { + /** A logger for this class */ + private final Logger logger = LoggerFactory.getLogger(getClass()); + private static final Timer EXPIRATION_TIMER = new Timer( "ReplicationMessageExpirer" ); private final ReplicationInterceptor interceptor; @@ -208,7 +212,7 @@ { if ( removeTask( message.getSequence() ) == this ) { - SessionLog.warn( getSession(), "No response within " + configuration.getResponseTimeout() + logger.warn( "No response within " + configuration.getResponseTimeout() + " second(s) for message #" + message.getSequence() ); getSession().close(); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java Mon Oct 13 14:34:35 2008 @@ -26,7 +26,7 @@ import org.apache.directory.mitosis.service.protocol.handler.ReplicationContextHandler; import org.apache.directory.mitosis.service.protocol.handler.ReplicationServerContextHandler; import org.apache.directory.server.core.DirectoryService; -import org.apache.mina.common.IoSession; +import org.apache.mina.core.session.IoSession; /** Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Mon Oct 13 14:34:35 2008 @@ -66,11 +66,9 @@ import org.apache.directory.shared.ldap.filter.PresenceNode; import org.apache.directory.shared.ldap.message.AliasDerefMode; import org.apache.directory.shared.ldap.name.LdapDN; -import org.apache.mina.common.IoAcceptor; -import org.apache.mina.filter.LoggingFilter; +import org.apache.mina.filter.logging.LoggingFilter; import org.apache.mina.filter.codec.ProtocolCodecFilter; -import org.apache.mina.transport.socket.nio.SocketAcceptor; -import org.apache.mina.transport.socket.nio.SocketAcceptorConfig; +import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,7 +162,7 @@ private PartitionNexus nexus; private OperationFactory operationFactory; private ReplicationStore store; - private IoAcceptor registry; + private NioSocketAcceptor registry; private final ClientConnectionManager clientConnectionManager = new ClientConnectionManager( this ); private Registries registries; @@ -254,18 +252,16 @@ private void startNetworking() throws Exception { - registry = new SocketAcceptor(); - SocketAcceptorConfig config = new SocketAcceptorConfig(); - config.setReuseAddress( true ); - - config.getFilterChain().addLast( "protocol", + registry = new NioSocketAcceptor(); + registry.setReuseAddress( true ); + registry.getFilterChain().addLast( "protocol", new ProtocolCodecFilter( new ReplicationServerProtocolCodecFactory() ) ); - config.getFilterChain().addLast( "logger", new LoggingFilter() ); - + registry.getFilterChain().addLast( "logger", new LoggingFilter() ); + registry.setHandler( new ReplicationServerProtocolHandler( this ) ); + // bind server protocol provider - registry.bind( new InetSocketAddress( configuration.getServerPort() ), new ReplicationServerProtocolHandler( - this ), config ); + registry.bind( new InetSocketAddress( configuration.getServerPort() ) ); clientConnectionManager.start( configuration ); } @@ -290,7 +286,7 @@ LOG.error( "[Replica-{}] Failed to stop the client connection manager.", configuration.getReplicaId() ); LOG.error( "Stop failure exception: ", e ); } - registry.unbindAll(); + registry.unbind(); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -22,8 +22,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderException; import org.apache.mina.filter.codec.ProtocolDecoderOutput; import org.apache.mina.filter.codec.demux.MessageDecoder; @@ -48,13 +48,13 @@ } - public final MessageDecoderResult decodable( IoSession session, ByteBuffer buf ) + public final MessageDecoderResult decodable( IoSession session, IoBuffer buf ) { return type == buf.get() ? OK : NOT_OK; } - public final MessageDecoderResult decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) + public final MessageDecoderResult decode( IoSession session, IoBuffer in, ProtocolDecoderOutput out ) throws Exception { if ( !readHeader ) @@ -104,5 +104,5 @@ } - protected abstract BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, ByteBuffer in ) throws Exception; + protected abstract BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, IoBuffer in ) throws Exception; } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -21,8 +21,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; -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.ProtocolEncoderOutput; import org.apache.mina.filter.codec.demux.MessageEncoder; @@ -37,7 +37,7 @@ public final void encode( IoSession session, Object in, ProtocolEncoderOutput out ) throws Exception { BaseMessage m = ( BaseMessage ) in; - ByteBuffer buf = ByteBuffer.allocate( 16 ); + IoBuffer buf = IoBuffer.allocate( 16 ); buf.setAutoExpand( true ); buf.put( ( byte ) m.getType() ); buf.putInt( m.getSequence() ); @@ -58,5 +58,5 @@ } - protected abstract void encodeBody( BaseMessage in, ByteBuffer out ) throws Exception; + protected abstract void encodeBody( BaseMessage in, IoBuffer out ) throws Exception; } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -30,8 +30,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.BeginLogEntriesAckMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderException; import org.apache.mina.filter.codec.ProtocolDecoderOutput; @@ -48,7 +48,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, IoBuffer in ) throws Exception { if ( responseCode != Constants.OK ) { @@ -65,7 +65,7 @@ } - private void readCSNVector( ByteBuffer in, CSNVector updateVector ) throws Exception + private void readCSNVector( IoBuffer in, CSNVector updateVector ) throws Exception { int nReplicas = in.getInt(); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -26,12 +26,12 @@ import java.util.HashSet; import java.util.Set; -import org.apache.mina.common.ByteBuffer; import org.apache.directory.mitosis.common.CSN; import org.apache.directory.mitosis.common.CSNVector; import org.apache.directory.mitosis.service.protocol.Constants; import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.BeginLogEntriesAckMessage; +import org.apache.mina.core.buffer.IoBuffer; public class BeginLogEntriesAckMessageEncoder extends ResponseMessageEncoder @@ -45,7 +45,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) throws Exception + protected void encodeBody( BaseMessage in, IoBuffer out ) throws Exception { // write out response code super.encodeBody( in, out ); @@ -61,7 +61,7 @@ } - private void writeCSNVector( ByteBuffer out, CSNVector csns ) + private void writeCSNVector( IoBuffer out, CSNVector csns ) { Set replicaIds = csns.getReplicaIds(); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -24,8 +24,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.BeginLogEntriesMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderOutput; @@ -38,7 +38,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, IoBuffer in ) throws Exception { return new BeginLogEntriesMessage( sequence ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -25,7 +25,7 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.BeginLogEntriesMessage; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public class BeginLogEntriesMessageEncoder extends BaseMessageEncoder @@ -35,7 +35,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) + protected void encodeBody( BaseMessage in, IoBuffer out ) { } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesAckMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesAckMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesAckMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesAckMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -24,8 +24,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.EndLogEntriesAckMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderOutput; @@ -37,7 +37,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, IoBuffer in ) throws Exception { return new EndLogEntriesAckMessage( sequence, responseCode ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -24,8 +24,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.EndLogEntriesMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderOutput; @@ -38,7 +38,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, IoBuffer in ) throws Exception { return new EndLogEntriesMessage( sequence ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -25,7 +25,7 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.EndLogEntriesMessage; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public class EndLogEntriesMessageEncoder extends BaseMessageEncoder @@ -35,7 +35,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) + protected void encodeBody( BaseMessage in, IoBuffer out ) { } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryAckMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryAckMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryAckMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryAckMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -24,8 +24,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.LogEntryAckMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderOutput; @@ -37,7 +37,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, IoBuffer in ) throws Exception { return new LogEntryAckMessage( sequence, responseCode ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -25,8 +25,8 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.LogEntryMessage; import org.apache.directory.server.schema.registries.Registries; -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.ProtocolDecoderOutput; @@ -41,7 +41,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, IoBuffer in ) throws Exception { byte[] src = new byte[in.remaining()]; in.get( src ); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -26,7 +26,7 @@ import org.apache.directory.mitosis.operation.OperationCodec; import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.LogEntryMessage; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public class LogEntryMessageEncoder extends BaseMessageEncoder @@ -39,7 +39,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) + protected void encodeBody( BaseMessage in, IoBuffer out ) { LogEntryMessage m = ( LogEntryMessage ) in; out.put( operationCodec.encode( m.getOperation() ) ); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -23,8 +23,8 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; -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.ProtocolDecoderOutput; import org.apache.directory.mitosis.service.protocol.Constants; import org.apache.directory.mitosis.service.protocol.message.BaseMessage; @@ -43,7 +43,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, IoBuffer in ) throws Exception { return new LoginAckMessage( sequence, responseCode, in.getString( utf8decoder ) ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -27,7 +27,7 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.LoginAckMessage; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public class LoginAckMessageEncoder extends ResponseMessageEncoder @@ -48,7 +48,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) throws Exception + protected void encodeBody( BaseMessage in, IoBuffer out ) throws Exception { LoginAckMessage m = ( LoginAckMessage ) in; super.encodeBody( in, out ); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -23,8 +23,8 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; -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.ProtocolDecoderOutput; import org.apache.directory.mitosis.service.protocol.Constants; import org.apache.directory.mitosis.service.protocol.message.BaseMessage; @@ -44,7 +44,7 @@ } - protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, ByteBuffer in ) throws Exception + protected BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, IoBuffer in ) throws Exception { return new LoginMessage( sequence, in.getString( utf8decoder ) ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -28,7 +28,7 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.LoginMessage; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public class LoginMessageEncoder extends BaseMessageEncoder @@ -42,7 +42,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) + protected void encodeBody( BaseMessage in, IoBuffer out ) { LoginMessage m = ( LoginMessage ) in; Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationClientProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationClientProtocolCodecFactory.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationClientProtocolCodecFactory.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationClientProtocolCodecFactory.java Mon Oct 13 14:34:35 2008 @@ -20,6 +20,10 @@ package org.apache.directory.mitosis.service.protocol.codec; +import org.apache.directory.mitosis.service.protocol.message.BeginLogEntriesMessage; +import org.apache.directory.mitosis.service.protocol.message.EndLogEntriesMessage; +import org.apache.directory.mitosis.service.protocol.message.LogEntryMessage; +import org.apache.directory.mitosis.service.protocol.message.LoginMessage; import org.apache.mina.filter.codec.demux.DemuxingProtocolCodecFactory; @@ -28,14 +32,14 @@ public ReplicationClientProtocolCodecFactory() { - register( LogEntryMessageEncoder.class ); - register( LoginMessageEncoder.class ); - register( BeginLogEntriesMessageEncoder.class ); - register( EndLogEntriesMessageEncoder.class ); - - register( LogEntryAckMessageDecoder.class ); - register( LoginAckMessageDecoder.class ); - register( BeginLogEntriesAckMessageDecoder.class ); - register( EndLogEntriesAckMessageDecoder.class ); + addMessageEncoder( LogEntryMessage.class, LogEntryMessageEncoder.class ); + addMessageEncoder( LoginMessage.class, LoginMessageEncoder.class ); + addMessageEncoder( BeginLogEntriesMessage.class, BeginLogEntriesMessageEncoder.class ); + addMessageEncoder( EndLogEntriesMessage.class, EndLogEntriesMessageEncoder.class ); + + addMessageDecoder( LogEntryAckMessageDecoder.class ); + addMessageDecoder( LoginAckMessageDecoder.class ); + addMessageDecoder( BeginLogEntriesAckMessageDecoder.class ); + addMessageDecoder( EndLogEntriesAckMessageDecoder.class ); } } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationServerProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationServerProtocolCodecFactory.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationServerProtocolCodecFactory.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationServerProtocolCodecFactory.java Mon Oct 13 14:34:35 2008 @@ -20,6 +20,10 @@ package org.apache.directory.mitosis.service.protocol.codec; +import org.apache.directory.mitosis.service.protocol.message.BeginLogEntriesAckMessage; +import org.apache.directory.mitosis.service.protocol.message.EndLogEntriesAckMessage; +import org.apache.directory.mitosis.service.protocol.message.LogEntryAckMessage; +import org.apache.directory.mitosis.service.protocol.message.LoginAckMessage; import org.apache.mina.filter.codec.demux.DemuxingProtocolCodecFactory; @@ -28,14 +32,14 @@ public ReplicationServerProtocolCodecFactory() { - register( LogEntryAckMessageEncoder.class ); - register( LoginAckMessageEncoder.class ); - register( BeginLogEntriesAckMessageEncoder.class ); - register( EndLogEntriesAckMessageEncoder.class ); - - register( LogEntryMessageDecoder.class ); - register( LoginMessageDecoder.class ); - register( BeginLogEntriesMessageDecoder.class ); - register( EndLogEntriesMessageDecoder.class ); + addMessageEncoder( LogEntryAckMessage.class, LogEntryAckMessageEncoder.class ); + addMessageEncoder( LoginAckMessage.class, LoginAckMessageEncoder.class ); + addMessageEncoder( BeginLogEntriesAckMessage.class, BeginLogEntriesAckMessageEncoder.class ); + addMessageEncoder( EndLogEntriesAckMessage.class, EndLogEntriesAckMessageEncoder.class ); + + addMessageDecoder( LogEntryMessageDecoder.class ); + addMessageDecoder( LoginMessageDecoder.class ); + addMessageDecoder( BeginLogEntriesMessageDecoder.class ); + addMessageDecoder( EndLogEntriesMessageDecoder.class ); } } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageDecoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageDecoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageDecoder.java Mon Oct 13 14:34:35 2008 @@ -22,7 +22,7 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.server.schema.registries.Registries; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public abstract class ResponseMessageDecoder extends BaseMessageDecoder @@ -34,13 +34,13 @@ } - protected final BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, ByteBuffer in ) throws Exception + protected final BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, IoBuffer in ) throws Exception { return decodeBody( registries, sequence, bodyLength, in.getInt(), in ); } - protected abstract BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, ByteBuffer in ) + protected abstract BaseMessage decodeBody( Registries registries, int sequence, int bodyLength, int responseCode, IoBuffer in ) throws Exception; } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageEncoder.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageEncoder.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageEncoder.java Mon Oct 13 14:34:35 2008 @@ -22,7 +22,7 @@ import org.apache.directory.mitosis.service.protocol.message.BaseMessage; import org.apache.directory.mitosis.service.protocol.message.ResponseMessage; -import org.apache.mina.common.ByteBuffer; +import org.apache.mina.core.buffer.IoBuffer; public abstract class ResponseMessageEncoder extends BaseMessageEncoder @@ -32,7 +32,7 @@ } - protected void encodeBody( BaseMessage in, ByteBuffer out ) throws Exception + protected void encodeBody( BaseMessage in, IoBuffer out ) throws Exception { ResponseMessage m = ( ResponseMessage ) in; out.putInt( m.getResponseCode() ); Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?rev=704263&r1=704262&r2=704263&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Mon Oct 13 14:34:35 2008 @@ -58,9 +58,10 @@ import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.OidNormalizer; import org.apache.directory.shared.ldap.util.StringTools; -import org.apache.mina.common.IdleStatus; -import org.apache.mina.common.WriteFuture; -import org.apache.mina.util.SessionLog; +import org.apache.mina.core.future.WriteFuture; +import org.apache.mina.core.session.IdleStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.naming.directory.SearchControls; import java.net.InetSocketAddress; @@ -124,6 +125,9 @@ */ public class ReplicationClientContextHandler implements ReplicationContextHandler { + /** A logger for this class */ + private final Logger logger = LoggerFactory.getLogger(getClass()); + public void contextBegin( ReplicationContext ctx ) throws Exception { // Send a login message. @@ -131,10 +135,10 @@ writeTimeLimitedMessage( ctx, m ); // Set write timeout - ctx.getSession().setWriteTimeout( ctx.getConfiguration().getResponseTimeout() ); + ctx.getSession().getConfig().setWriteTimeout( ctx.getConfiguration().getResponseTimeout() ); // Check update vector of the remote peer periodically. - ctx.getSession().setIdleTime( IdleStatus.BOTH_IDLE, ctx.getConfiguration().getReplicationInterval() ); + ctx.getSession().getConfig().setIdleTime( IdleStatus.BOTH_IDLE, ctx.getConfiguration().getReplicationInterval() ); } @@ -201,9 +205,9 @@ public void exceptionCaught( ReplicationContext ctx, Throwable cause ) throws Exception { - if ( SessionLog.isWarnEnabled( ctx.getSession() ) ) + if ( logger.isWarnEnabled() ) { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Unexpected exception.", cause ); } ctx.getSession().close(); @@ -220,7 +224,7 @@ { if ( message.getResponseCode() != Constants.OK ) { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Login attempt failed: " + message.getResponseCode() ); ctx.getSession().close(); return; @@ -239,7 +243,7 @@ } else { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Peer address mismatches: " + ctx.getSession().getRemoteAddress() + " (expected: " + replica.getAddress() ); ctx.getSession().close(); @@ -248,7 +252,7 @@ } } - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Unknown peer replica ID: " + message.getReplicaId() ); ctx.getSession().close(); } @@ -261,12 +265,12 @@ // it means previous replication process ended or this is the // first replication attempt. if ( ctx.getState() == State.READY && ctx.getScheduledExpirations() <= 0 - && ctx.getSession().getScheduledWriteRequests() <= 0 ) + && ctx.getSession().getScheduledWriteMessages() <= 0 ) { // Initiate replication process asking update vector. - if ( SessionLog.isDebugEnabled( ctx.getSession() ) ) + if ( logger.isDebugEnabled() ) { - SessionLog.debug( ctx.getSession(), "(" + ctx.getConfiguration().getReplicaId() + "->" + logger.debug( "(" + ctx.getConfiguration().getReplicaId() + "->" + ( ctx.getPeer() != null ? ctx.getPeer().getId() : "null" ) + ") Beginning replication. " ); } ctx.getSession().write( new BeginLogEntriesMessage( ctx.getNextSequence() ) ); @@ -274,13 +278,13 @@ } else { - if ( SessionLog.isDebugEnabled( ctx.getSession() ) ) + if ( logger.isDebugEnabled() ) { - SessionLog.debug( ctx.getSession(), "(" + ctx.getConfiguration().getReplicaId() + "->" + logger.debug( "(" + ctx.getConfiguration().getReplicaId() + "->" + ( ctx.getPeer() != null ? ctx.getPeer().getId() : "null" ) + ") Couldn't begin replication. State:" + ctx.getState() + ", scheduledExpirations:" - + ctx.getScheduledExpirations() + ", scheduledWriteRequests:" - + ctx.getSession().getScheduledWriteRequests() ); + + ctx.getScheduledExpirations() + ", scheduledWriteMessages:" + + ctx.getSession().getScheduledWriteMessages() ); } return false; } @@ -291,7 +295,7 @@ { if ( message.getResponseCode() != Constants.OK ) { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Remote peer failed to execute a log entry." ); ctx.getSession().close(); } @@ -316,7 +320,7 @@ } catch ( Exception e ) { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Failed to get update vector.", e ); ctx.getSession().close(); return; @@ -327,13 +331,13 @@ { if ( myPV.size() > 0 && yourUV.size() == 0 ) { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Starting a whole DIT transfer." ); sendAllEntries( ctx ); } else { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Starting a partial replication log transfer." ); sendReplicationLogs( registries, ctx, myPV, yourUV ); } @@ -354,7 +358,7 @@ if ( namingContextsAttr == null || namingContextsAttr.size() == 0 ) { - SessionLog.warn( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.warn( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] No namingContexts attributes in rootDSE." ); return; } @@ -367,7 +371,7 @@ contextName = new LdapDN( ( String ) namingContext.get() ); - SessionLog.info( ctx.getSession(), "[Replica-" + ctx.getConfiguration().getReplicaId() + logger.info( "[Replica-" + ctx.getConfiguration().getReplicaId() + "] Sending entries under '" + contextName + '\'' ); Map mapping = ctx.getDirectoryService().getRegistries().getAttributeTypeRegistry() @@ -426,7 +430,7 @@ } catch ( IllegalArgumentException ex ) { - SessionLog.warn( ctx.getSession(), "An entry with improper entryCSN: " + entry.getDn() ); + logger.warn( "An entry with improper entryCSN: " + entry.getDn() ); continue; } @@ -457,7 +461,7 @@ if ( yourCSN != null && ( myCSN == null || yourCSN.compareTo( myCSN ) < 0 ) ) { - SessionLog.warn( ctx.getSession(), "Remote update vector (" + yourUV + logger.warn( "Remote update vector (" + yourUV + ") is out-of-date. Full replication is required." ); ctx.getSession().close(); return; @@ -482,7 +486,7 @@ private void onUnexpectedMessage( ReplicationContext ctx, Object message ) { - SessionLog.warn( ctx.getSession(), "Unexpected message: " + message ); + logger.warn( "Unexpected message: " + message ); ctx.getSession().close(); } }