Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 39164 invoked from network); 27 Feb 2011 20:01:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Feb 2011 20:01:18 -0000 Received: (qmail 69075 invoked by uid 500); 27 Feb 2011 20:01:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69016 invoked by uid 500); 27 Feb 2011 20:01:18 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 69009 invoked by uid 99); 27 Feb 2011 20:01:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Feb 2011 20:01:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Feb 2011 20:01:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 05AA523889D7; Sun, 27 Feb 2011 20:00:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075126 - in /directory: apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/ shared/branches/akarasulu/ldap... Date: Sun, 27 Feb 2011 20:00:53 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110227200054.05AA523889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Feb 27 20:00:53 2011 New Revision: 1075126 URL: http://svn.apache.org/viewvc?rev=1075126&view=rev Log: DIRSHARED-92: making both clients and server use the same ProtocolCodecFactory implementation Removed: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java directory/shared/branches/akarasulu/ldap-codec-standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original) +++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Sun Feb 27 20:00:53 2011 @@ -60,6 +60,8 @@ import org.apache.directory.server.proto import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.directory.server.protocol.shared.transport.Transport; import org.apache.directory.server.protocol.shared.transport.UdpTransport; +import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory; +import org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecFactory; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; @@ -192,7 +194,7 @@ public class LdapServer extends Director private LdapRequestHandler unbindHandler; /** the underlying provider codec factory */ - private ProtocolCodecFactory codecFactory; + private ProtocolCodecFactory codecFactory = LdapCodecServiceFactory.getSingleton().newProtocolCodecFactory(); /** the MINA protocol handler */ private final LdapProtocolHandler handler = new LdapProtocolHandler( this ); @@ -1017,7 +1019,7 @@ public class LdapServer extends Director public void setDirectoryService( DirectoryService directoryService ) { super.setDirectoryService( directoryService ); - this.codecFactory = new LdapProtocolCodecFactory( directoryService ); + this.codecFactory = new LdapProtocolCodecFactory(); } Modified: directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sun Feb 27 20:00:53 2011 @@ -138,7 +138,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.util.StringConstants; import org.apache.directory.shared.util.Strings; -import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.mina.core.filterchain.IoFilter; import org.apache.mina.core.future.CloseFuture; import org.apache.mina.core.future.ConnectFuture; @@ -219,7 +218,7 @@ public class LdapNetworkConnection exten LdapCodecService codec = LdapCodecServiceFactory.getSingleton(); /** The Ldap codec protocol filter */ - private IoFilter ldapProtocolFilter = new ProtocolCodecFilter( codec.newProtocolCodecFactory( true ) ); + private IoFilter ldapProtocolFilter = new ProtocolCodecFilter( codec.newProtocolCodecFactory() ); /** the SslFilter key */ private static final String SSL_FILTER_KEY = "sslFilter"; Modified: directory/shared/branches/akarasulu/ldap-codec-standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec-standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap-codec-standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java (original) +++ directory/shared/branches/akarasulu/ldap-codec-standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java Sun Feb 27 20:00:53 2011 @@ -587,23 +587,10 @@ public class StandaloneLdapCodecService /** * {@inheritDoc} - * - * @TODO - finish this up and add factory registration capabilities, - * of course there is one default mechanism for now. */ - public ProtocolCodecFactory newProtocolCodecFactory( boolean client ) + public ProtocolCodecFactory newProtocolCodecFactory() { - if ( client ) - { - return new LdapProtocolCodecFactory( this ); - } - else - { - throw new NotImplementedException( - "Filters may be different here, and we're probably going to " + - "want to have a protocol codec factory registration mechanism" + - "since this way we can swap in and out MINA/Grizzly" ); - } + return new LdapProtocolCodecFactory(); } Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java (original) +++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java Sun Feb 27 20:00:53 2011 @@ -242,11 +242,9 @@ public interface LdapCodecService /** * Creates a new LDAP {@link ProtocolCodecFactory}. * - * @param client if true a factory designed for clients is returned, - * otherwise one for servers is returned. - * @return the client or server specific {@link ProtocolCodecFactory} + * @return the {@link ProtocolCodecFactory} */ - ProtocolCodecFactory newProtocolCodecFactory( boolean client ); + ProtocolCodecFactory newProtocolCodecFactory(); /** Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original) +++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Sun Feb 27 20:00:53 2011 @@ -184,23 +184,10 @@ public class DefaultLdapCodecService imp /** * {@inheritDoc} - * - * @TODO - finish this up and add factory registration capabilities, - * of course there is one default mechanism for now. */ - public ProtocolCodecFactory newProtocolCodecFactory( boolean client ) + public ProtocolCodecFactory newProtocolCodecFactory() { - if ( client ) - { - return new LdapProtocolCodecFactory( this ); - } - else - { - throw new NotImplementedException( - "Filters may be different here, and we're probably going to " + - "want to have a protocol codec factory registration mechanism" + - "since this way we can swap in and out MINA/Grizzly" ); - } + return new LdapProtocolCodecFactory(); } Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java (original) +++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java Sun Feb 27 20:00:53 2011 @@ -20,7 +20,6 @@ package org.apache.directory.shared.ldap.codec.protocol.mina; -import org.apache.directory.shared.ldap.codec.api.LdapCodecService; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; @@ -44,21 +43,6 @@ public class LdapProtocolCodecFactory im public static final String LDAP_ENCODER = "LDAP_ENCODER"; - private LdapCodecService codec; - - - /** - * Creates a new instance of LdapProtocolCodecFactory. It - * creates the encoded an decoder instances. - * - * @param codec The codec associated with this protocol codec factory - */ - public LdapProtocolCodecFactory( LdapCodecService codec ) - { - this.codec = codec; - } - - /** * Get the LDAP decoder. * @@ -79,6 +63,6 @@ public class LdapProtocolCodecFactory im */ public ProtocolEncoder getEncoder( IoSession session ) { - return new LdapProtocolEncoder( codec ); + return new LdapProtocolEncoder(); } } Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java?rev=1075126&r1=1075125&r2=1075126&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java (original) +++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java Sun Feb 27 20:00:53 2011 @@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap import java.nio.ByteBuffer; import org.apache.directory.shared.ldap.codec.LdapEncoder; -import org.apache.directory.shared.ldap.codec.api.LdapCodecService; +import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory; import org.apache.directory.shared.ldap.model.message.Message; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; @@ -47,9 +47,9 @@ public class LdapProtocolEncoder impleme * * @param codec The LDAP codec service associated with this encoder. */ - public LdapProtocolEncoder( LdapCodecService codec ) + public LdapProtocolEncoder() { - this.encoder = new LdapEncoder( codec ); + this.encoder = new LdapEncoder( LdapCodecServiceFactory.getSingleton() ); }