From commits-return-25465-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Apr 01 11:26:36 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 9746 invoked from network); 1 Apr 2010 11:26:35 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Apr 2010 11:26:35 -0000 Received: (qmail 57010 invoked by uid 500); 1 Apr 2010 11:26:35 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 56961 invoked by uid 500); 1 Apr 2010 11:26:35 -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 56954 invoked by uid 99); 1 Apr 2010 11:26:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Apr 2010 11:26:35 +0000 X-ASF-Spam-Status: No, hits=-1585.4 required=10.0 tests=ALL_TRUSTED,AWL 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; Thu, 01 Apr 2010 11:26:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 07148238898B; Thu, 1 Apr 2010 11:26:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r929933 - in /directory/clients/ldap/trunk: ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Date: Thu, 01 Apr 2010 11:26:05 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100401112606.07148238898B@eris.apache.org> Author: kayyagari Date: Thu Apr 1 11:26:05 2010 New Revision: 929933 URL: http://svn.apache.org/viewvc?rev=929933&view=rev Log: o updated the loadSchema() method to load all schemas o updated the testcase Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=929933&r1=929932&r2=929933&view=diff ============================================================================== --- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Thu Apr 1 11:26:05 2010 @@ -26,6 +26,7 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.text.ParseException; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -136,6 +137,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser; import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry; import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry; +import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.util.LdapURL; import org.apache.directory.shared.ldap.util.StringTools; import org.apache.mina.core.filterchain.IoFilter; @@ -3002,8 +3004,16 @@ public class LdapNetworkConnection exten JarLdifSchemaLoader jarSchemaLoader = new JarLdifSchemaLoader(); schemaManager = new DefaultSchemaManager( jarSchemaLoader ); + + // we enale all the schemas so that need not check with server for enabled schemas + Collection schemas = schemaManager.getLoader().getAllSchemas(); + for( Schema s : schemas ) + { + s.enable(); + } + schemaManager.loadAllEnabled(); - schemaManager.getLoader().getAllSchemas(); + if( ! schemaManager.getErrors().isEmpty() ) { String msg = "there are errors while loading the schema"; Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=929933&r1=929932&r2=929933&view=diff ============================================================================== --- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original) +++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Thu Apr 1 11:26:05 2010 @@ -185,12 +185,14 @@ public class LdapConnectionTest extends @Test - public void testLoadSchema() throws LdapException + public void testLoadSchema() throws Exception { connection.loadSchema(); SchemaManager manager = connection.getSchemaManager(); assertNotNull( manager ); assertTrue( manager.isEnabled( "system" ) ); + assertTrue( manager.isEnabled( "nis" ) ); + assertEquals( manager.getLoader().getAllSchemas().size(), manager.getEnabled().size() ); } }