You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/01/30 18:42:57 UTC
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...
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
* <b>Note:</b> This method enables <b>all</b> 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();