Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 54026 invoked from network); 20 Aug 2010 19:27:02 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Aug 2010 19:27:02 -0000 Received: (qmail 70045 invoked by uid 500); 20 Aug 2010 19:27:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69983 invoked by uid 500); 20 Aug 2010 19:27:02 -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 69976 invoked by uid 99); 20 Aug 2010 19:27:02 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Aug 2010 19:27:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 20 Aug 2010 19:26:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B088B23889E5; Fri, 20 Aug 2010 19:25:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r987607 [1/3] - in /directory/clients/ldap/trunk: ./ ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/ ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ ldap-client-api/src/main/java/org/apache/dir... Date: Fri, 20 Aug 2010 19:25:19 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100820192519.B088B23889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Fri Aug 20 19:25:18 2010 New Revision: 987607 URL: http://svn.apache.org/viewvc?rev=987607&view=rev Log: o merging changes done by Emmanuel in codec message merge branch Removed: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java Modified: directory/clients/ldap/trunk/ (props changed) directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SearchCursor.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ResponseFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/AddListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/BindListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/CompareListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/DeleteListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ExtendedListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/IntermediateResponseListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyDnListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/SearchListener.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolCodecFactory.java directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java Propchange: directory/clients/ldap/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 20 19:25:18 2010 @@ -1 +1,2 @@ +/directory/clients/ldap/branches/ldap-client-codec-merge:982372-987585 /directory/clients/ldap/branches/ldap-client-subtree:965547-965686 Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java?rev=987607&r1=987606&r2=987607&view=diff ============================================================================== --- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java (original) +++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java Fri Aug 20 19:25:18 2010 @@ -11,17 +11,17 @@ import org.apache.directory.ldap.client. import org.apache.directory.ldap.client.api.future.ModifyDnFuture; import org.apache.directory.ldap.client.api.future.ModifyFuture; import org.apache.directory.ldap.client.api.future.SearchFuture; -import org.apache.directory.ldap.client.api.message.AddRequest; -import org.apache.directory.ldap.client.api.message.BindRequest; -import org.apache.directory.ldap.client.api.message.CompareRequest; -import org.apache.directory.ldap.client.api.message.DeleteRequest; -import org.apache.directory.ldap.client.api.message.ExtendedRequest; -import org.apache.directory.ldap.client.api.message.ModifyDnRequest; -import org.apache.directory.ldap.client.api.message.ModifyRequest; -import org.apache.directory.ldap.client.api.message.SearchRequest; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.message.AddRequest; +import org.apache.directory.shared.ldap.message.BindRequest; +import org.apache.directory.shared.ldap.message.CompareRequest; +import org.apache.directory.shared.ldap.message.DeleteRequest; +import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.message.ModifyDnRequest; +import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.name.DN; @@ -177,7 +177,7 @@ public interface LdapAsyncConnection ext */ ExtendedFuture extendedAsync( ExtendedRequest extendedRequest ) throws LdapException; - + /** * configuration of LdapNetworkConnection * Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=987607&r1=987606&r2=987607&view=diff ============================================================================== --- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original) +++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Fri Aug 20 19:25:18 2010 @@ -4,23 +4,6 @@ package org.apache.directory.ldap.client import java.io.IOException; import java.util.List; -import org.apache.directory.ldap.client.api.message.AbandonRequest; -import org.apache.directory.ldap.client.api.message.AddRequest; -import org.apache.directory.ldap.client.api.message.AddResponse; -import org.apache.directory.ldap.client.api.message.BindRequest; -import org.apache.directory.ldap.client.api.message.BindResponse; -import org.apache.directory.ldap.client.api.message.CompareRequest; -import org.apache.directory.ldap.client.api.message.CompareResponse; -import org.apache.directory.ldap.client.api.message.DeleteRequest; -import org.apache.directory.ldap.client.api.message.DeleteResponse; -import org.apache.directory.ldap.client.api.message.ExtendedRequest; -import org.apache.directory.ldap.client.api.message.ExtendedResponse; -import org.apache.directory.ldap.client.api.message.ModifyDnRequest; -import org.apache.directory.ldap.client.api.message.ModifyDnResponse; -import org.apache.directory.ldap.client.api.message.ModifyRequest; -import org.apache.directory.ldap.client.api.message.ModifyResponse; -import org.apache.directory.ldap.client.api.message.SearchRequest; -import org.apache.directory.ldap.client.api.message.SearchResponse; import org.apache.directory.shared.asn1.primitives.OID; import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.entry.Entry; @@ -29,6 +12,23 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.message.AbandonRequest; +import org.apache.directory.shared.ldap.message.AddRequest; +import org.apache.directory.shared.ldap.message.AddResponse; +import org.apache.directory.shared.ldap.message.BindRequest; +import org.apache.directory.shared.ldap.message.BindResponse; +import org.apache.directory.shared.ldap.message.CompareRequest; +import org.apache.directory.shared.ldap.message.CompareResponse; +import org.apache.directory.shared.ldap.message.DeleteRequest; +import org.apache.directory.shared.ldap.message.DeleteResponse; +import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.message.ExtendedResponse; +import org.apache.directory.shared.ldap.message.ModifyDnRequest; +import org.apache.directory.shared.ldap.message.ModifyDnResponse; +import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.message.ModifyResponse; +import org.apache.directory.shared.ldap.message.Response; +import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -174,8 +174,8 @@ public interface LdapConnection * @param scope The sarch scope : OBJECT, ONELEVEL or SUBTREE * @return A cursor on the result. */ - public abstract Cursor search( DN baseDn, String filter, SearchScope scope, - String... attributes ) throws LdapException; + public abstract Cursor search( DN baseDn, String filter, SearchScope scope, String... attributes ) + throws LdapException; /** @@ -195,8 +195,8 @@ public interface LdapConnection * @param scope The sarch scope : OBJECT, ONELEVEL or SUBTREE * @return A cursor on the result. */ - public abstract Cursor search( String baseDn, String filter, SearchScope scope, - String... attributes ) throws LdapException; + public abstract Cursor search( String baseDn, String filter, SearchScope scope, String... attributes ) + throws LdapException; /** @@ -206,7 +206,7 @@ public interface LdapConnection * @return A {@link Cursor} containing Entries and Referencs * @throws LdapException @TODO */ - public abstract Cursor search( SearchRequest searchRequest ) throws LdapException; + public abstract Cursor search( SearchRequest searchRequest ) throws LdapException; //------------------------ The LDAP operations ------------------------// @@ -248,7 +248,7 @@ public interface LdapConnection * @return the modify operation's response * @throws LdapException in case of modify operation failure or timeout happens */ - public abstract ModifyResponse modify( String dn, Modification... modifications ) throws LdapException; + public abstract ModifyResponse modify( String dn, Modification... modifications ) throws LdapException; /** @@ -268,7 +268,7 @@ public interface LdapConnection * the ModifyRequest. * * @param modRequest the request for modify operation - * @return the modify operation's r"esponse + * @return the modify operation's response * @throws LdapException in case of modify operation failure or timeout happens */ public abstract ModifyResponse modify( ModifyRequest modRequest ) throws LdapException; @@ -358,7 +358,8 @@ public interface LdapConnection * @param newDn The new Entry DN * @param deleteOldRdn Tells if the old RDN must be removed */ - public abstract ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) throws LdapException; + public abstract ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) + throws LdapException; /** @@ -530,13 +531,13 @@ public interface LdapConnection /** * @see #lookup(DN, String...) */ - public abstract SearchResponse lookup( DN dn ) throws LdapException; + public abstract Response lookup( DN dn ) throws LdapException; /** * @see #lookup(String, String...) */ - public abstract SearchResponse lookup( String dn ) throws LdapException; + public abstract Response lookup( String dn ) throws LdapException; /** @@ -547,7 +548,7 @@ public interface LdapConnection * @return the Entry with the given DN or null if no entry exists with that DN * @throws LdapException in case of any problems while searching for the DN */ - public abstract SearchResponse lookup( DN dn, String... attributes ) throws LdapException; + public abstract Response lookup( DN dn, String... attributes ) throws LdapException; /** @@ -558,7 +559,7 @@ public interface LdapConnection * @return the Entry with the given DN or null if no entry exists with that DN * @throws LdapException in case of any problems while searching for the DN */ - public abstract SearchResponse lookup( String dn, String... attributes ) throws LdapException; + public abstract Response lookup( String dn, String... attributes ) throws LdapException; /**