Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5683119A2 for ; Fri, 28 Mar 2014 21:08:36 +0000 (UTC) Received: (qmail 37891 invoked by uid 500); 28 Mar 2014 21:08:36 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 37787 invoked by uid 500); 28 Mar 2014 21:08:30 -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 37666 invoked by uid 99); 28 Mar 2014 21:08:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Mar 2014 21:08:27 +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; Fri, 28 Mar 2014 21:08:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C653823888D7; Fri, 28 Mar 2014 21:08:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1582882 - in /directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api: LdapConnectionConfig.java LdapNetworkConnection.java Date: Fri, 28 Mar 2014 21:08:05 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140328210805.C653823888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Fri Mar 28 21:08:05 2014 New Revision: 1582882 URL: http://svn.apache.org/r1582882 Log: Added a setter for teh LdapApiService in the config Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java?rev=1582882&r1=1582881&r2=1582882&view=diff ============================================================================== --- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java (original) +++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java Fri Mar 28 21:08:05 2014 @@ -32,6 +32,7 @@ import javax.net.ssl.TrustManagerFactory import javax.net.ssl.X509TrustManager; import org.apache.directory.api.ldap.codec.api.BinaryAttributeDetector; +import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,6 +101,9 @@ public class LdapConnectionConfig /** The class used to detect if an attribute is HR or not */ private BinaryAttributeDetector binaryAttributeDetector; + + /** The Service to use internally when creating connections */ + private LdapApiService ldapApiService; /** @@ -460,4 +464,22 @@ public class LdapConnectionConfig { this.useTls = useTls; } + + + /** + * @return the ldapApiService + */ + public LdapApiService getLdapApiService() + { + return ldapApiService; + } + + + /** + * @param ldapApiService the ldapApiService to set + */ + public void setLdapApiService( LdapApiService ldapApiService ) + { + this.ldapApiService = ldapApiService; + } } Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1582882&r1=1582881&r2=1582882&view=diff ============================================================================== --- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Fri Mar 28 21:08:05 2014 @@ -129,12 +129,9 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.api.ldap.model.schema.AttributeType; -import org.apache.directory.api.ldap.model.schema.MutableAttributeType; import org.apache.directory.api.ldap.model.schema.ObjectClass; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.parsers.OpenLdapSchemaParser; -import org.apache.directory.api.ldap.model.schema.registries.AttributeTypeRegistry; -import org.apache.directory.api.ldap.model.schema.registries.ObjectClassRegistry; import org.apache.directory.api.ldap.model.schema.registries.Registries; import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader; import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;