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 691899F0A for ; Mon, 30 Jan 2012 17:43:19 +0000 (UTC) Received: (qmail 53705 invoked by uid 500); 30 Jan 2012 17:43:19 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 53644 invoked by uid 500); 30 Jan 2012 17:43:19 -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 53637 invoked by uid 99); 30 Jan 2012 17:43:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2012 17:43: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; Mon, 30 Jan 2012 17:43:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 87D64238899C for ; Mon, 30 Jan 2012 17:42:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1237829 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/ apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ apacheds/trunk/ldap-client-test/src/test/java/org/ap... Date: Mon, 30 Jan 2012 17:42:57 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120130174257.87D64238899C@eris.apache.org> Author: elecharny Date: Mon Jan 30 17:42:56 2012 New Revision: 1237829 URL: http://svn.apache.org/viewvc?rev=1237829&view=rev Log: o Fixed DIRAPI-58 : The loadSchema method has been renamed loadDefaultSchema Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java?rev=1237829&r1=1237828&r2=1237829&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java Mon Jan 30 17:42:56 2012 @@ -470,7 +470,7 @@ public class LdapCoreSessionConnection i /** * {@inheritDoc} */ - public void loadSchema() throws LdapException + public void loadDefaultSchema() throws LdapException { // do nothing, cause we already have SchemaManager in the session's DirectoryService } Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1237829&r1=1237828&r2=1237829&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Mon Jan 30 17:42:56 2012 @@ -164,7 +164,7 @@ public void testLookup() throws Exceptio Entry entry = connection.lookup( "uid=admin,ou=system" ); assertTrue( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isHumanReadable() ); - connection.loadSchema(); + connection.loadDefaultSchema(); entry = connection.lookup( "uid=admin,ou=system" ); assertFalse( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isHumanReadable() ); @@ -174,7 +174,7 @@ public void testLookup() throws Exceptio @Test public void testLoadSchema() throws Exception { - connection.loadSchema(); + connection.loadDefaultSchema(); SchemaManager manager = connection.getSchemaManager(); assertNotNull( manager ); assertTrue( manager.isEnabled( "system" ) ); Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=1237829&r1=1237828&r2=1237829&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Mon Jan 30 17:42:56 2012 @@ -299,7 +299,7 @@ public class ClientSearchRequestTest ext @Test public void testSearchBinary() throws Exception { - connection.loadSchema(); + connection.loadDefaultSchema(); EntryCursor cursor = connection.search( "ou=system", "(publicKey=\\30\\5C\\30\\0D\\06\\09\\2A\\86\\48\\86\\F7\\0D\\01\\01\\01\\05\\00\\03\\4B\\00\\30\\48\\02\\41\\00\\A6\\C7\\9C\\B1\\6C\\E4\\DD\\8F\\1E\\4D\\20\\93\\22\\3F\\83\\75\\DE\\21\\D8\\F1\\9D\\63\\80\\5B\\94\\55\\6A\\9E\\33\\59\\9B\\8D\\63\\88\\0D\\18\\7D\\4C\\85\\F1\\CF\\54\\77\\32\\E9\\61\\0C\\A2\\8F\\B3\\6B\\15\\34\\5E\\1F\\88\\BF\\A0\\73\\AC\\86\\BB\\D0\\85\\02\\03\\01\\00\\01)", SearchScope.SUBTREE, "publicKey" ); assertTrue( cursor.next() ); Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1237829&r1=1237828&r2=1237829&view=diff ============================================================================== --- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original) +++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Mon Jan 30 17:42:56 2012 @@ -788,7 +788,7 @@ public interface LdapConnection * Note: This method enables all schemas prior to loading * @throws LdapException in case of problems while loading the schema */ - void loadSchema() throws LdapException; + void loadDefaultSchema() throws LdapException; /** 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=1237829&r1=1237828&r2=1237829&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 Mon Jan 30 17:42:56 2012 @@ -3339,7 +3339,7 @@ public class LdapNetworkConnection exten /** * {@inheritDoc} */ - public void loadSchema() throws LdapException + public void loadDefaultSchema() throws LdapException { try { @@ -3414,7 +3414,7 @@ public class LdapNetworkConnection exten { if ( schemaManager == null ) { - loadSchema(); + loadDefaultSchema(); } OpenLdapSchemaParser olsp = new OpenLdapSchemaParser();