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