Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 83430 invoked from network); 28 Mar 2011 08:41:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Mar 2011 08:41:54 -0000 Received: (qmail 49915 invoked by uid 500); 28 Mar 2011 08:41:54 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 49885 invoked by uid 500); 28 Mar 2011 08:41:54 -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 49877 invoked by uid 99); 28 Mar 2011 08:41:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Mar 2011 08:41:53 +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, 28 Mar 2011 08:41:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A61E423889DA; Mon, 28 Mar 2011 08:41:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1086156 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ apacheds/trunk/core/src/main/java/org/apache/directory/server/co... Date: Mon, 28 Mar 2011 08:41:16 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110328084117.A61E423889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Mar 28 08:41:15 2011 New Revision: 1086156 URL: http://svn.apache.org/viewvc?rev=1086156&view=rev Log: Renamed the applySchemaManager method Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareDnSerializationTest.java directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java directory/shared/trunk/ldap/extras/aci/src/main/antlr/ACIItem.g directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/FastDnParser.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Mon Mar 28 08:41:15 2011 @@ -200,7 +200,7 @@ public final class LdapPrincipal impleme try { - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); } catch ( LdapInvalidDnException lide ) { Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Mon Mar 28 08:41:15 2011 @@ -1712,7 +1712,7 @@ public abstract class ServerContext impl try { target = target.add( relativeName ); - target.applySchemaManager( schemaManager ); + target.apply( schemaManager ); } catch (LdapInvalidDnException lide ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Mar 28 08:41:15 2011 @@ -1489,7 +1489,7 @@ public class DefaultDirectoryService imp schemaService.initialize(); schemaService.getSchemaPartition().initialize(); partitions.add( schemaService.getSchemaPartition() ); - systemPartition.getSuffix().applySchemaManager( schemaManager ); + systemPartition.getSuffix().apply( schemaManager ); pwdPolicySubentryAT = schemaManager.lookupAttributeTypeRegistry( "pwdPolicySubentry" ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java Mon Mar 28 08:41:15 2011 @@ -115,7 +115,7 @@ public class DefaultDnFactory implements { if ( !cachedDn.isSchemaAware() && ( schemaManager != null ) ) { - cachedDn.applySchemaManager( schemaManager ); + cachedDn.apply( schemaManager ); } if ( enableStats ) Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Mon Mar 28 08:41:15 2011 @@ -222,7 +222,7 @@ public class DefaultOperationManager imp { // Normalize the addContext Dn Dn dn = addContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // We have to deal with the referral first directoryService.getReferralManager().lockRead(); @@ -307,7 +307,7 @@ public class DefaultOperationManager imp { // Normalize the compareContext Dn Dn dn = compareContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // We have to deal with the referral first directoryService.getReferralManager().lockRead(); @@ -387,7 +387,7 @@ public class DefaultOperationManager imp { // Normalize the deleteContext Dn Dn dn = deleteContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // We have to deal with the referral first directoryService.getReferralManager().lockRead(); @@ -563,7 +563,7 @@ public class DefaultOperationManager imp { // Normalize the modifyContext Dn Dn dn = modifyContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); ReferralManager referralManager = directoryService.getReferralManager(); @@ -654,11 +654,11 @@ public class DefaultOperationManager imp { // Normalize the moveContext Dn Dn dn = moveContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // Normalize the moveContext superior Dn Dn newSuperiorDn = moveContext.getNewSuperior(); - newSuperiorDn.applySchemaManager( directoryService.getSchemaManager() ); + newSuperiorDn.apply( directoryService.getSchemaManager() ); // We have to deal with the referral first directoryService.getReferralManager().lockRead(); @@ -756,7 +756,7 @@ public class DefaultOperationManager imp { // Normalize the moveAndRenameContext Dn Dn dn = moveAndRenameContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // We have to deal with the referral first directoryService.getReferralManager().lockRead(); @@ -810,7 +810,7 @@ public class DefaultOperationManager imp // Now, check the destination // Normalize the moveAndRenameContext Dn Dn newSuperiorDn = moveAndRenameContext.getNewSuperiorDn(); - newSuperiorDn.applySchemaManager( directoryService.getSchemaManager() ); + newSuperiorDn.apply( directoryService.getSchemaManager() ); // If he parent Dn is a referral, or has a referral ancestor, we have to issue a AffectMultipleDsas result // as stated by RFC 3296 Section 5.6.2 @@ -860,7 +860,7 @@ public class DefaultOperationManager imp { // Normalize the renameContext Dn Dn dn = renameContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // Inject the newDn into the operation context // Inject the new Dn into the context @@ -951,7 +951,7 @@ public class DefaultOperationManager imp { // Normalize the searchContext Dn Dn dn = searchContext.getDn(); - dn.applySchemaManager( directoryService.getSchemaManager() ); + dn.apply( directoryService.getSchemaManager() ); // We have to deal with the referral first directoryService.getReferralManager().lockRead(); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Mon Mar 28 08:41:15 2011 @@ -935,7 +935,7 @@ public class AciAuthorizationInterceptor if ( !principalDn.isSchemaAware() ) { - principalDn.applySchemaManager( schemaManager ); + principalDn.apply( schemaManager ); } // Bypass this interceptor if we disabled the AC subsystem or if the principal is the admin @@ -1413,7 +1413,7 @@ public class AciAuthorizationInterceptor { public boolean accept( SearchingOperationContext searchContext, ClonedServerEntry entry ) throws Exception { - Dn normName = entry.getDn().applySchemaManager( schemaManager ); + Dn normName = entry.getDn().apply( schemaManager ); return filter( searchContext, normName, entry ); } } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Mon Mar 28 08:41:15 2011 @@ -489,7 +489,7 @@ public class DefaultAuthorizationInterce if ( !dn.isSchemaAware() ) { - dn.applySchemaManager( opContext.getSession().getDirectoryService().getSchemaManager() ); + dn.apply( opContext.getSession().getDirectoryService().getSchemaManager() ); } // Admin users gets full access to all entries Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Mon Mar 28 08:41:15 2011 @@ -161,7 +161,7 @@ public class GroupCache while ( results.next() ) { Entry result = results.get(); - Dn groupDn = result.getDn().applySchemaManager( schemaManager ); + Dn groupDn = result.getDn().apply( schemaManager ); EntryAttribute members = getMemberAttribute( result ); if ( members != null ) Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Mon Mar 28 08:41:15 2011 @@ -144,7 +144,7 @@ public class TupleCache while ( results.next() ) { Entry result = results.get(); - Dn subentryDn = result.getDn().applySchemaManager( session.getDirectoryService().getSchemaManager() ); + Dn subentryDn = result.getDn().apply( session.getDirectoryService().getSchemaManager() ); EntryAttribute aci = result.get( PRESCRIPTIVE_ACI_AT ); if ( aci == null ) Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Mon Mar 28 08:41:15 2011 @@ -332,7 +332,7 @@ public class EventInterceptor extends Ba */ public void addListener( DirectoryListener listener, NotificationCriteria criteria ) throws Exception { - criteria.getBase().applySchemaManager( directoryService.getSchemaManager() ); + criteria.getBase().apply( directoryService.getSchemaManager() ); ExprNode result = ( ExprNode ) criteria.getFilter().accept( filterNormalizer ); criteria.setFilter( result ); registrations.add( new RegistrationEntry( listener, criteria ) ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Mon Mar 28 08:41:15 2011 @@ -109,8 +109,8 @@ public class NormalizationInterceptor ex */ public void add( NextInterceptor nextInterceptor, AddOperationContext addContext ) throws LdapException { - addContext.getDn().applySchemaManager( schemaManager ); - addContext.getEntry().getDn().applySchemaManager( schemaManager ); + addContext.getDn().apply( schemaManager ); + addContext.getEntry().getDn().apply( schemaManager ); addRdnAttributesToEntry( addContext.getDn(), addContext.getEntry() ); nextInterceptor.add( addContext ); } @@ -125,7 +125,7 @@ public class NormalizationInterceptor ex if ( !dn.isSchemaAware() ) { - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); } nextInterceptor.delete( deleteContext ); @@ -139,7 +139,7 @@ public class NormalizationInterceptor ex { if ( !modifyContext.getDn().isSchemaAware() ) { - modifyContext.getDn().applySchemaManager( schemaManager ); + modifyContext.getDn().apply( schemaManager ); } if ( modifyContext.getModItems() != null ) @@ -164,14 +164,14 @@ public class NormalizationInterceptor ex if ( !renameContext.getDn().isSchemaAware() ) { - renameContext.getDn().applySchemaManager( schemaManager ); + renameContext.getDn().apply( schemaManager ); } renameContext.getNewRdn().apply( schemaManager ); if ( !renameContext.getNewDn().isSchemaAware() ) { - renameContext.getNewDn().applySchemaManager( schemaManager ); + renameContext.getNewDn().apply( schemaManager ); } // Push to the next interceptor @@ -186,22 +186,22 @@ public class NormalizationInterceptor ex { if ( !moveContext.getDn().isSchemaAware() ) { - moveContext.getDn().applySchemaManager( schemaManager ); + moveContext.getDn().apply( schemaManager ); } if ( !moveContext.getOldSuperior().isSchemaAware() ) { - moveContext.getOldSuperior().applySchemaManager( schemaManager ); + moveContext.getOldSuperior().apply( schemaManager ); } if ( !moveContext.getNewSuperior().isSchemaAware() ) { - moveContext.getNewSuperior().applySchemaManager( schemaManager ); + moveContext.getNewSuperior().apply( schemaManager ); } if ( !moveContext.getNewDn().isSchemaAware() ) { - moveContext.getNewDn().applySchemaManager( schemaManager ); + moveContext.getNewDn().apply( schemaManager ); } if ( !moveContext.getRdn().isSchemaAware() ) @@ -227,17 +227,17 @@ public class NormalizationInterceptor ex if ( !moveAndRenameContext.getDn().isSchemaAware() ) { - moveAndRenameContext.getDn().applySchemaManager( schemaManager ); + moveAndRenameContext.getDn().apply( schemaManager ); } if ( !moveAndRenameContext.getNewDn().isSchemaAware() ) { - moveAndRenameContext.getNewDn().applySchemaManager( schemaManager ); + moveAndRenameContext.getNewDn().apply( schemaManager ); } if ( !moveAndRenameContext.getNewSuperiorDn().isSchemaAware() ) { - moveAndRenameContext.getNewSuperiorDn().applySchemaManager( schemaManager ); + moveAndRenameContext.getNewSuperiorDn().apply( schemaManager ); } nextInterceptor.moveAndRename( moveAndRenameContext ); @@ -254,7 +254,7 @@ public class NormalizationInterceptor ex if ( !dn.isSchemaAware() ) { - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); } ExprNode filter = searchContext.getFilter(); @@ -288,7 +288,7 @@ public class NormalizationInterceptor ex */ public boolean hasEntry( NextInterceptor nextInterceptor, EntryOperationContext hasEntryContext ) throws LdapException { - hasEntryContext.getDn().applySchemaManager( schemaManager ); + hasEntryContext.getDn().apply( schemaManager ); return nextInterceptor.hasEntry( hasEntryContext ); } @@ -299,7 +299,7 @@ public class NormalizationInterceptor ex public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext listContext ) throws LdapException { - listContext.getDn().applySchemaManager( schemaManager ); + listContext.getDn().apply( schemaManager ); return nextInterceptor.list( listContext ); } @@ -332,7 +332,7 @@ public class NormalizationInterceptor ex */ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext lookupContext ) throws LdapException { - lookupContext.getDn().applySchemaManager( schemaManager ); + lookupContext.getDn().apply( schemaManager ); List attrIds = lookupContext.getAttrsId(); @@ -356,7 +356,7 @@ public class NormalizationInterceptor ex { if ( !compareContext.getDn().isSchemaAware() ) { - compareContext.getDn().applySchemaManager( schemaManager ); + compareContext.getDn().apply( schemaManager ); } // Get the attributeType from the OID @@ -387,7 +387,7 @@ public class NormalizationInterceptor ex */ public void bind( NextInterceptor next, BindOperationContext bindContext ) throws LdapException { - bindContext.getDn().applySchemaManager( schemaManager ); + bindContext.getDn().apply( schemaManager ); next.bind( bindContext ); } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Mar 28 08:41:15 2011 @@ -223,7 +223,7 @@ public class DefaultPartitionNexus exten // Initialize and normalize the localy used DNs Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); - adminDn.applySchemaManager( schemaManager ); + adminDn.apply( schemaManager ); Value attr = rootDSE.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemSubentryDn = directoryService.getDnFactory().create( attr.getString() ); @@ -887,7 +887,7 @@ public class DefaultPartitionNexus exten if ( !base.isSchemaAware() ) { - base.applySchemaManager( schemaManager ); + base.apply( schemaManager ); } Partition backend = getPartition( base ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Mon Mar 28 08:41:15 2011 @@ -187,11 +187,11 @@ public class SchemaInterceptor extends B // stuff for dealing with subentries (garbage for now) Value subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemaSubentryDn = directoryService.getDnFactory().create( subschemaSubentry.getString() ); - subschemaSubentryDn.applySchemaManager( schemaManager ); + subschemaSubentryDn.apply( schemaManager ); subschemaSubentryDnNorm = subschemaSubentryDn.getNormName(); schemaModificationAttributesDn = directoryService.getDnFactory().create( ServerDNConstants.SCHEMA_MODIFICATIONS_DN ); - schemaModificationAttributesDn.applySchemaManager( schemaManager ); + schemaModificationAttributesDn.apply( schemaManager ); computeSuperiors(); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Mon Mar 28 08:41:15 2011 @@ -1193,7 +1193,7 @@ public class SubentryInterceptor extends baseDn = baseDn.add( ss.getBase() ); Dn newName = newSuperiorDn; newName = newName.add( oldDn.getRdn() ); - newName.applySchemaManager( schemaManager ); + newName.apply( schemaManager ); subentryCache.addSubentry( newName, subentry ); @@ -1220,7 +1220,7 @@ public class SubentryInterceptor extends { Entry candidate = subentries.get(); Dn dn = candidate.getDn(); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); if ( evaluator.evaluate( ss, apName, dn, candidate ) ) { @@ -1285,7 +1285,7 @@ public class SubentryInterceptor extends Dn newName = newSuperiorDn.getParent(); newName = newName.add( moveAndRenameContext.getNewRdn() ); - newName.applySchemaManager( schemaManager ); + newName.apply( schemaManager ); subentryCache.addSubentry( newName, subentry ); @@ -1311,7 +1311,7 @@ public class SubentryInterceptor extends { Entry candidate = subentries.get(); Dn dn = candidate.getDn(); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); if ( evaluator.evaluate( ss, apName, dn, candidate ) ) { @@ -1368,7 +1368,7 @@ public class SubentryInterceptor extends Dn newName = oldDn.getParent(); newName = newName.add( renameContext.getNewRdn() ); - newName.applySchemaManager( schemaManager ); + newName.apply( schemaManager ); subentryCache.addSubentry( newName, subentry ); next.rename( renameContext ); @@ -1392,7 +1392,7 @@ public class SubentryInterceptor extends { Entry candidate = subentries.get(); Dn dn = candidate.getDn(); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); if ( evaluator.evaluate( ss, apName, dn, candidate ) ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Mon Mar 28 08:41:15 2011 @@ -153,7 +153,7 @@ public class TriggerSpecCache continue; } - Dn normSubentryName = subentryDn.applySchemaManager( directoryService.getSchemaManager() ); + Dn normSubentryName = subentryDn.apply( directoryService.getSchemaManager() ); subentryAdded( normSubentryName, resultEntry ); } Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Mon Mar 28 08:41:15 2011 @@ -100,10 +100,10 @@ public class MemoryChangeLogStoreTest public void testChangeLogSerialization() throws LdapException, IOException, ClassNotFoundException { Dn systemDn = new Dn( schemaManager, "ou=system" ); - systemDn.applySchemaManager( schemaManager ); + systemDn.apply( schemaManager ); Dn adminDn = new Dn( schemaManager, "uid=admin, ou=system" ); - adminDn.applySchemaManager( schemaManager ); + adminDn.apply( schemaManager ); LdifEntry forward = new LdifEntry(); forward.setDn( systemDn ); @@ -112,7 +112,7 @@ public class MemoryChangeLogStoreTest forward.putAttribute( "ou", "system" ); Dn reverseDn = forward.getDn(); - reverseDn.applySchemaManager( schemaManager ); + reverseDn.apply( schemaManager ); LdifEntry reverse = LdifRevertor.reverseAdd( reverseDn ); Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Mar 28 08:41:15 2011 @@ -73,7 +73,7 @@ public class JdbmPartition extends Abstr store.setId( id ); // Normalize the suffix - suffix.applySchemaManager( schemaManager ); + suffix.apply( schemaManager ); store.setSuffixDn( suffix ); store.setPartitionPath( getPartitionPath() ); Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Mon Mar 28 08:41:15 2011 @@ -167,7 +167,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntryOC() throws Exception { Dn dn = new Dn( "cn=text, dc=example, dc=com" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson" ); @@ -190,7 +190,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntry() throws Exception { Dn dn = new Dn( "cn=text, dc=example, dc=com" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson" ); @@ -216,7 +216,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntryWithEmptyDN() throws Exception { Dn dn = new Dn( "" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson" ); @@ -238,7 +238,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntryWithNoAttributes() throws Exception { Dn dn = new Dn( "" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); @@ -256,7 +256,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntryWithAttributeNoValue() throws Exception { Dn dn = new Dn( "" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); @@ -277,7 +277,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntryWithAttributeStringValue() throws Exception { Dn dn = new Dn( "" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); @@ -296,7 +296,7 @@ public class ServerEntrySerializerTest public void testSerializeServerEntryWithAttributeBinaryValue() throws Exception { Dn dn = new Dn( "" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); Entry entry = new DefaultEntry( schemaManager, dn ); Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original) +++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Mon Mar 28 08:41:15 2011 @@ -156,7 +156,7 @@ public class LdifPartition extends Abstr if ( !suffix.isSchemaAware() ) { - suffix.applySchemaManager( schemaManager ); + suffix.apply( schemaManager ); } String suffixDirName = getFileName( suffix ); Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java (original) +++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java Mon Mar 28 08:41:15 2011 @@ -124,7 +124,7 @@ public class SingleFileLdifPartition ext if ( !suffix.isSchemaAware() ) { - suffix.applySchemaManager( schemaManager ); + suffix.apply( schemaManager ); } loadEntries(); Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java Mon Mar 28 08:41:15 2011 @@ -389,7 +389,7 @@ public class LdifPartitionTest SearchOperationContext searchCtx = new SearchOperationContext( session ); Dn dn = new Dn( "dc=test,ou=test,ou=system" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); searchCtx.setDn( dn ); ExprNode filter = FilterParser.parse( schemaManager, "(ObjectClass=domain)" ); NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager ); Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java Mon Mar 28 08:41:15 2011 @@ -644,7 +644,7 @@ public class SingleFileLdifPartitionTest SearchOperationContext searchCtx = new SearchOperationContext( mockSession ); Dn dn = new Dn( "dc=test,ou=test,ou=system" ); - dn.applySchemaManager( schemaManager ); + dn.apply( schemaManager ); searchCtx.setDn( dn ); ExprNode filter = FilterParser.parse( schemaManager, "(ObjectClass=domain)" ); NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager ); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Mon Mar 28 08:41:15 2011 @@ -1093,7 +1093,7 @@ public class SearchHandler extends LdapR ReferralManager referralManager = directoryService.getReferralManager(); Dn reqTargetDn = req.getBase(); - reqTargetDn.applySchemaManager( directoryService.getSchemaManager() ); + reqTargetDn.apply( directoryService.getSchemaManager() ); // Check if the entry itself is a referral referralManager.lockRead(); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Mon Mar 28 08:41:15 2011 @@ -157,7 +157,7 @@ public class NtlmSaslServer extends Abst { result = provider.authenticate( getLdapSession().getIoSession(), response ); Dn dn = getBindRequest().getName(); - dn.applySchemaManager( getLdapSession().getLdapServer().getDirectoryService().getSchemaManager() ); + dn.apply( getLdapSession().getLdapServer().getDirectoryService().getSchemaManager() ); LdapPrincipal ldapPrincipal = new LdapPrincipal( getAdminSession().getDirectoryService().getSchemaManager(), dn, AuthenticationLevel.STRONG ); getLdapSession().putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal ); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Mon Mar 28 08:41:15 2011 @@ -231,11 +231,11 @@ public class PagedSearchContext // Compare the baseDN try { - request.getBase().applySchemaManager( schemaManager ); + request.getBase().apply( schemaManager ); if ( !previousSearchRequest.getBase().isSchemaAware() ) { - previousSearchRequest.getBase().applySchemaManager( schemaManager ); + previousSearchRequest.getBase().apply( schemaManager ); } if ( !request.getBase().equals( previousSearchRequest.getBase() ) ) Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java Mon Mar 28 08:41:15 2011 @@ -88,7 +88,7 @@ public class AvlPartition extends Abstra // initialize the store store.setId( getId() ); - suffix.applySchemaManager( schemaManager ); + suffix.apply( schemaManager ); store.setSuffixDn( suffix ); for ( AvlIndex index : indexedAttributes ) Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Mon Mar 28 08:41:15 2011 @@ -412,7 +412,7 @@ public abstract class BTreePartition if ( schemaManager != null ) { - this.suffix.applySchemaManager( schemaManager ); + this.suffix.apply( schemaManager ); } } Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Mon Mar 28 08:41:15 2011 @@ -775,7 +775,7 @@ public abstract class AbstractStore upName = sb.toString(); parseInternal( upName, rdns ); - applySchemaManager( schemaManager ); + apply( schemaManager ); } @@ -322,7 +322,7 @@ public class Dn implements Iterable this.rdns.add( rdn.clone() ); } - applySchemaManager( null ); + apply( null ); toUpName(); } @@ -348,7 +348,7 @@ public class Dn implements Iterable rdns.add( 0, rdn ); - applySchemaManager( dn.schemaManager ); + apply( dn.schemaManager ); toUpName(); } @@ -372,7 +372,7 @@ public class Dn implements Iterable rdns.add( rdnParent ); } - applySchemaManager( schemaManager ); + apply( schemaManager ); toUpName(); } @@ -396,7 +396,7 @@ public class Dn implements Iterable this.rdns.add( rdn.clone() ); } - applySchemaManager( schemaManager ); + apply( schemaManager ); } @@ -802,7 +802,7 @@ public class Dn implements Iterable } newDn.toUpName(); - newDn.applySchemaManager( schemaManager ); + newDn.apply( schemaManager ); return newDn; } @@ -883,7 +883,7 @@ public class Dn implements Iterable } newDn.toUpName(); - newDn.applySchemaManager( schemaManager ); + newDn.apply( schemaManager ); return newDn; } @@ -916,7 +916,7 @@ public class Dn implements Iterable } else { - clonedDn.applySchemaManager( schemaManager ); + clonedDn.apply( schemaManager ); clonedDn.toUpName(); } @@ -941,7 +941,7 @@ public class Dn implements Iterable clonedDn.rdns.add( 0, newRdn ); - clonedDn.applySchemaManager( schemaManager ); + clonedDn.apply( schemaManager ); clonedDn.toUpName(); return clonedDn; @@ -964,7 +964,7 @@ public class Dn implements Iterable Dn clonedDn = copy(); clonedDn.rdns.add( 0, newRdn.clone() ); - clonedDn.applySchemaManager( schemaManager ); + clonedDn.apply( schemaManager ); clonedDn.toUpName(); return clonedDn; @@ -997,7 +997,7 @@ public class Dn implements Iterable try { - newDn.applySchemaManager( schemaManager ); + newDn.apply( schemaManager ); } catch ( LdapInvalidDnException e ) { @@ -1160,11 +1160,11 @@ public class Dn implements Iterable /** * Normalizes the Dn using the given the schema manager * - * @param schemaManager The schemaManager to use to normalize the Dn + * @param schemaManager The schemaManagerto use to normalize the Dn * @return The normalized Dn * @throws LdapInvalidDnException If the Dn is invalid. */ - public Dn applySchemaManager( SchemaManager schemaManager ) throws LdapInvalidDnException + public Dn apply( SchemaManager schemaManager ) throws LdapInvalidDnException { this.schemaManager = schemaManager; Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/FastDnParser.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/FastDnParser.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/FastDnParser.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/FastDnParser.java Mon Mar 28 08:41:15 2011 @@ -68,7 +68,7 @@ import org.apache.directory.shared.util. { parseDn(name, dn.rdns); dn.setUpName( name ); - dn.applySchemaManager( null ); + dn.apply( null ); } Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java Mon Mar 28 08:41:15 2011 @@ -86,7 +86,7 @@ public class DnComparator extends LdapCo { dn = (Dn)obj; - dn = ( dn.isSchemaAware() ? dn : dn.applySchemaManager( schemaManager ) ); + dn = ( dn.isSchemaAware() ? dn : dn.apply( schemaManager ) ); } else if ( obj instanceof String ) { Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java Mon Mar 28 08:41:15 2011 @@ -172,7 +172,7 @@ public class UniqueMemberComparator exte { dn = (Dn) obj; - dn = ( dn.isSchemaAware() ? dn : dn.applySchemaManager( schemaManager ) ); + dn = ( dn.isSchemaAware() ? dn : dn.apply( schemaManager ) ); } else if ( obj instanceof String ) { Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java Mon Mar 28 08:41:15 2011 @@ -87,7 +87,7 @@ public class DnNormalizer extends Normal { Dn dn = null; - dn = value.applySchemaManager( schemaManager ); + dn = value.apply( schemaManager ); return dn.getNormName(); } Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1086156&r1=1086155&r2=1086156&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original) +++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Mon Mar 28 08:41:15 2011 @@ -1394,7 +1394,7 @@ public class DefaultSchemaManager implem try { schemaModificationAttributesDn = new Dn( SchemaConstants.SCHEMA_MODIFICATIONS_DN ); - schemaModificationAttributesDn.applySchemaManager( new DefaultSchemaManager() ); + schemaModificationAttributesDn.apply( new DefaultSchemaManager() ); } catch ( LdapInvalidDnException e ) {