Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 82437 invoked from network); 24 Jan 2011 20:59:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jan 2011 20:59:53 -0000 Received: (qmail 6587 invoked by uid 500); 24 Jan 2011 20:59:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 6530 invoked by uid 500); 24 Jan 2011 20:59:53 -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 6523 invoked by uid 99); 24 Jan 2011 20:59:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jan 2011 20:59:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 24 Jan 2011 20:59:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A81EC23889EA; Mon, 24 Jan 2011 20:59:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062975 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/test/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/org/apache/di... Date: Mon, 24 Jan 2011 20:59:30 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110124205930.A81EC23889EA@eris.apache.org> Author: elecharny Date: Mon Jan 24 20:59:28 2011 New Revision: 1062975 URL: http://svn.apache.org/viewvc?rev=1062975&view=rev Log: Rename DNFactory to DnFactory Added: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DnFactory.java - copied, changed from r1062900, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java - copied, changed from r1062900, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDNFactory.java Removed: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDNFactory.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.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/ReferralManagerImpl.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/collective/CollectiveAttributeInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.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/prefs/ServerSystemPreferences.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.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/schema/SchemaSubentryManager.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.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/AbstractStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.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/subtree/SubtreeEvaluatorTest.java directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Mon Jan 24 20:59:28 2011 @@ -586,5 +586,5 @@ public interface DirectoryService extend * * @return the Dn factory */ - DNFactory getDNFactory(); + DnFactory getDnFactory(); } Copied: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DnFactory.java (from r1062900, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java) URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DnFactory.java?p2=directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DnFactory.java&p1=directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java&r1=1062900&r2=1062975&rev=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DnFactory.java Mon Jan 24 20:59:28 2011 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public interface DNFactory +public interface DnFactory { /** Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Mon Jan 24 20:59:28 2011 @@ -560,7 +560,7 @@ public class MockDirectoryService implem /** * {@inheritDoc} */ - public DNFactory getDNFactory() + public DnFactory getDnFactory() { return null; } 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -268,7 +268,7 @@ public class DefaultDirectoryService imp private AttributeType pwdPolicySubentryAT; /** The Dn factory */ - private DNFactory dnFactory; + private DnFactory dnFactory; /** * The synchronizer thread. It flush data on disk periodically. @@ -1209,7 +1209,7 @@ public class DefaultDirectoryService imp // create system users area // ------------------------------------------------------------------- - Dn userDn = getDNFactory().create( ServerDNConstants.USERS_SYSTEM_DN ); + Dn userDn = getDnFactory().create( ServerDNConstants.USERS_SYSTEM_DN ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, userDn ) ) ) { @@ -1234,7 +1234,7 @@ public class DefaultDirectoryService imp // create system groups area // ------------------------------------------------------------------- - Dn groupDn = getDNFactory().create( ServerDNConstants.GROUPS_SYSTEM_DN ); + Dn groupDn = getDnFactory().create( ServerDNConstants.GROUPS_SYSTEM_DN ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, groupDn ) ) ) { @@ -1259,7 +1259,7 @@ public class DefaultDirectoryService imp // create administrator group // ------------------------------------------------------------------- - Dn name = getDNFactory().create( ServerDNConstants.ADMINISTRATORS_GROUP_DN ); + Dn name = getDnFactory().create( ServerDNConstants.ADMINISTRATORS_GROUP_DN ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, name ) ) ) { @@ -1285,7 +1285,7 @@ public class DefaultDirectoryService imp // create system configuration area // ------------------------------------------------------------------- - Dn configurationDn = getDNFactory().create( "ou=configuration,ou=system" ); + Dn configurationDn = getDnFactory().create( "ou=configuration,ou=system" ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, configurationDn ) ) ) { @@ -1307,7 +1307,7 @@ public class DefaultDirectoryService imp // create system configuration area for partition information // ------------------------------------------------------------------- - Dn partitionsDn = getDNFactory().create( "ou=partitions,ou=configuration,ou=system" ); + Dn partitionsDn = getDnFactory().create( "ou=partitions,ou=configuration,ou=system" ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, partitionsDn ) ) ) { @@ -1328,7 +1328,7 @@ public class DefaultDirectoryService imp // create system configuration area for services // ------------------------------------------------------------------- - Dn servicesDn = getDNFactory().create( "ou=services,ou=configuration,ou=system" ); + Dn servicesDn = getDnFactory().create( "ou=services,ou=configuration,ou=system" ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, servicesDn ) ) ) { @@ -1350,7 +1350,7 @@ public class DefaultDirectoryService imp // create system configuration area for interceptors // ------------------------------------------------------------------- - Dn interceptorsDn = getDNFactory().create( "ou=interceptors,ou=configuration,ou=system" ); + Dn interceptorsDn = getDnFactory().create( "ou=interceptors,ou=configuration,ou=system" ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, interceptorsDn ) ) ) { @@ -1372,7 +1372,7 @@ public class DefaultDirectoryService imp // create system preferences area // ------------------------------------------------------------------- - Dn sysPrefRootDn = getDNFactory().create( ServerDNConstants.SYSPREFROOT_SYSTEM_DN ); + Dn sysPrefRootDn = getDnFactory().create( ServerDNConstants.SYSPREFROOT_SYSTEM_DN ); if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, sysPrefRootDn ) ) ) { @@ -1406,7 +1406,7 @@ public class DefaultDirectoryService imp // Warn if the default password is not changed. boolean needToChangeAdminPassword = false; - Dn adminDn = getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + Dn adminDn = getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); Entry adminEntry = partitionNexus.lookup( new LookupOperationContext( adminSession, adminDn ) ); Value userPassword = adminEntry.get( SchemaConstants.USER_PASSWORD_AT ).get(); @@ -1475,7 +1475,7 @@ public class DefaultDirectoryService imp subschemaAPCache = new DnNode(); triggerExecutionAPCache = new DnNode(); - dnFactory = new DefaultDNFactory( schemaManager, cacheService.getCache( "dnCache" ) ); + dnFactory = new DefaultDnFactory( schemaManager, cacheService.getCache( "dnCache" ) ); // triggers partition to load schema fully from schema partition schemaService.initialize(); @@ -1485,7 +1485,7 @@ public class DefaultDirectoryService imp pwdPolicySubentryAT = schemaManager.lookupAttributeTypeRegistry( "pwdPolicySubentry" ); - adminDn = getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + adminDn = getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), this ); // @TODO - NOTE: Need to find a way to instantiate without dependency on DPN @@ -1612,7 +1612,7 @@ public class DefaultDirectoryService imp try { Entry entry = readEntry( ldif ); - Dn newDn = getDNFactory().create( dn ); + Dn newDn = getDnFactory().create( dn ); entry.setDn( newDn ); @@ -1890,7 +1890,7 @@ public class DefaultDirectoryService imp if ( pwdPolicySubentry != null ) { - Dn configDn = getDNFactory().create( pwdPolicySubentry.getString() ); + Dn configDn = getDnFactory().create( pwdPolicySubentry.getString() ); return pwdPolicyContainer.getPolicyConfig( configDn ); } @@ -1923,7 +1923,7 @@ public class DefaultDirectoryService imp /** * {@inheritDoc} */ - public DNFactory getDNFactory() + public DnFactory getDnFactory() { return dnFactory; } Copied: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java (from r1062900, 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?p2=directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDNFactory.java&r1=1062900&r2=1062975&rev=1062975&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 Jan 24 20:59:28 2011 @@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class DefaultDNFactory implements DNFactory +public class DefaultDnFactory implements DnFactory { - private static final Logger LOG = LoggerFactory.getLogger( DefaultDNFactory.class ); + private static final Logger LOG = LoggerFactory.getLogger( DefaultDnFactory.class ); /** The cache for DNs */ private Cache dnCache; @@ -59,7 +59,7 @@ public class DefaultDNFactory implements * * @param directoryService the directory service */ - public DefaultDNFactory( SchemaManager schemaManager, Cache dnCache ) + public DefaultDnFactory( SchemaManager schemaManager, Cache dnCache ) { this.schemaManager = schemaManager; this.dnCache = dnCache; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Mon Jan 24 20:59:28 2011 @@ -161,7 +161,7 @@ public class ReferralManagerImpl impleme for ( String suffix:suffixes ) { // We will store each entry's Dn into the Referral tree - Dn suffixDn = directoryService.getDNFactory().create( suffix ); + Dn suffixDn = directoryService.getDnFactory().create( suffix ); SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, suffixDn, referralFilter, searchControl ); searchOperationContext.setAliasDerefMode( AliasDerefMode.DEREF_ALWAYS ); 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -277,7 +277,7 @@ public class AciAuthorizationInterceptor nexus = directoryService.getPartitionNexus(); - Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); chain = directoryService.getInterceptorChain(); @@ -293,7 +293,7 @@ public class AciAuthorizationInterceptor // stuff for dealing with subentries (garbage for now) Value subschemaSubentry = directoryService.getPartitionNexus().getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); - Dn subschemaSubentryDnName = directoryService.getDNFactory().create( subschemaSubentry.getString() ); + Dn subschemaSubentryDnName = directoryService.getDnFactory().create( subschemaSubentry.getString() ); subschemaSubentryDn = subschemaSubentryDnName.getNormName(); // Init the caches now 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -101,11 +101,11 @@ public class DefaultAuthorizationInterce nexus = directoryService.getPartitionNexus(); - ADMIN_SYSTEM_DN = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + ADMIN_SYSTEM_DN = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); - GROUP_BASE_DN = directoryService.getDNFactory().create( ServerDNConstants.GROUPS_SYSTEM_DN ); + GROUP_BASE_DN = directoryService.getDnFactory().create( ServerDNConstants.GROUPS_SYSTEM_DN ); - ADMIN_GROUP_DN = directoryService.getDNFactory().create( ServerDNConstants.ADMINISTRATORS_GROUP_DN ); + ADMIN_GROUP_DN = directoryService.getDnFactory().create( ServerDNConstants.ADMINISTRATORS_GROUP_DN ); loadAdministrators( directoryService ); } @@ -115,7 +115,7 @@ public class DefaultAuthorizationInterce { // read in the administrators and cache their normalized names Set newAdministrators = new HashSet( 2 ); - Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ); + Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ); CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); @@ -130,7 +130,7 @@ public class DefaultAuthorizationInterce for ( Value value : uniqueMember ) { - Dn memberDn = directoryService.getDNFactory().create( value.getString() ); + Dn memberDn = directoryService.getDnFactory().create( value.getString() ); newAdministrators.add( memberDn.getNormName() ); } 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -31,7 +31,7 @@ import net.sf.ehcache.Element; import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.CoreSession; -import org.apache.directory.server.core.DNFactory; +import org.apache.directory.server.core.DnFactory; import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; @@ -88,7 +88,7 @@ public class GroupCache private SchemaManager schemaManager; /** the Dn factory */ - private DNFactory dnFactory; + private DnFactory dnFactory; /** the normalized dn of the administrators group */ private Dn administratorsGroupDn; @@ -107,7 +107,7 @@ public class GroupCache public GroupCache( DirectoryService dirService ) throws LdapException { schemaManager = dirService.getSchemaManager(); - dnFactory = dirService.getDNFactory(); + dnFactory = dirService.getDnFactory(); nexus = dirService.getPartitionNexus(); OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT ); MEMBER_AT = schemaManager.getAttributeType( SchemaConstants.MEMBER_AT ); 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -31,7 +31,7 @@ import java.util.Set; import javax.naming.directory.SearchControls; import org.apache.directory.server.core.CoreSession; -import org.apache.directory.server.core.DNFactory; +import org.apache.directory.server.core.DnFactory; import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.partition.PartitionNexus; @@ -77,7 +77,7 @@ public class TupleCache private final Map> tuples = new HashMap>(); /** the Dn factory */ - private final DNFactory dnFactory; + private final DnFactory dnFactory; /** a handle on the partition nexus */ private final PartitionNexus nexus; @@ -101,7 +101,7 @@ public class TupleCache public TupleCache( CoreSession session ) throws LdapException { SchemaManager schemaManager = session.getDirectoryService().getSchemaManager(); - this.dnFactory = session.getDirectoryService().getDNFactory(); + this.dnFactory = session.getDirectoryService().getDnFactory(); this.nexus = session.getDirectoryService().getPartitionNexus(); NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager ); aciParser = new ACIItemParser( ncn, schemaManager ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Mon Jan 24 20:59:28 2011 @@ -391,7 +391,7 @@ public class CollectiveAttributeIntercep for ( Value value : collectiveAttributeSubentries ) { String subentryDnStr = value.getString(); - Dn subentryDn = opContext.getSession().getDirectoryService().getDNFactory().create( subentryDnStr ); + Dn subentryDn = opContext.getSession().getDirectoryService().getDnFactory().create( subentryDnStr ); /* * TODO - Instead of hitting disk here can't we leverage the Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Mon Jan 24 20:59:28 2011 @@ -103,7 +103,7 @@ public class ExceptionInterceptor extend super.init( directoryService ); nexus = directoryService.getPartitionNexus(); Value attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); - subschemSubentryDn = directoryService.getDNFactory().create( attr.getString() ); + subschemSubentryDn = directoryService.getDnFactory().create( attr.getString() ); } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Mon Jan 24 20:59:28 2011 @@ -126,10 +126,10 @@ public class OperationalAttributeInterce // stuff for dealing with subentries (garbage for now) Value subschemaSubentry = directoryService.getPartitionNexus().getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); - subschemaSubentryDn = directoryService.getDNFactory().create( subschemaSubentry.getString() ); + subschemaSubentryDn = directoryService.getDnFactory().create( subschemaSubentry.getString() ); // Create the Admin Dn - adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); } @@ -496,7 +496,7 @@ public class OperationalAttributeInterce if ( attr != null ) { - Dn creatorsName = directoryService.getDNFactory().create( attr.getString() ); + Dn creatorsName = directoryService.getDnFactory().create( attr.getString() ); attr.clear(); attr.add( denormalizeTypes( creatorsName ).getName() ); @@ -506,7 +506,7 @@ public class OperationalAttributeInterce if ( attr != null ) { - Dn modifiersName = directoryService.getDNFactory().create( attr.getString() ); + Dn modifiersName = directoryService.getDnFactory().create( attr.getString() ); attr.clear(); attr.add( denormalizeTypes( modifiersName ).getName() ); @@ -516,7 +516,7 @@ public class OperationalAttributeInterce if ( attr != null ) { - Dn modifiersName = directoryService.getDNFactory().create( attr.getString() ); + Dn modifiersName = directoryService.getDnFactory().create( attr.getString() ); attr.clear(); attr.add( denormalizeTypes( modifiersName ).getName() ); 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -222,11 +222,11 @@ public class DefaultPartitionNexus exten OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT ); // Initialize and normalize the localy used DNs - Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); adminDn.normalize( schemaManager ); Value attr = rootDSE.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); - subschemSubentryDn = directoryService.getDNFactory().create( attr.getString() ); + subschemSubentryDn = directoryService.getDnFactory().create( attr.getString() ); initializeSystemPartition( directoryService ); @@ -301,7 +301,7 @@ public class DefaultPartitionNexus exten system.initialize(); // Add root context entry for system partition - Dn systemSuffixDn = directoryService.getDNFactory().create( ServerDNConstants.SYSTEM_DN ); + Dn systemSuffixDn = directoryService.getDnFactory().create( ServerDNConstants.SYSTEM_DN ); CoreSession adminSession = directoryService.getAdminSession(); if ( !system.hasEntry( new EntryOperationContext( adminSession, systemSuffixDn ) ) ) @@ -369,7 +369,7 @@ public class DefaultPartitionNexus exten { try { - removeContextPartition( directoryService.getDNFactory().create( suffix ) ); + removeContextPartition( directoryService.getDnFactory().create( suffix ) ); } catch ( Exception e ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Mon Jan 24 20:59:28 2011 @@ -85,7 +85,7 @@ public class ServerSystemPreferences ext try { - dn = directoryService.getDNFactory().create( "prefNodeName=sysPrefRoot,ou=system" ); + dn = directoryService.getDnFactory().create( "prefNodeName=sysPrefRoot,ou=system" ); } catch ( LdapInvalidDnException e ) { @@ -115,7 +115,7 @@ public class ServerSystemPreferences ext Dn parentDn = ( ( ServerSystemPreferences ) parent() ).dn; try { - dn = directoryService.getDNFactory().create( "prefNodeName=" + name + "," + parentDn.getName() ); + dn = directoryService.getDnFactory().create( "prefNodeName=" + name + "," + parentDn.getName() ); if ( ! directoryService.getAdminSession().exists( dn ) ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Mon Jan 24 20:59:28 2011 @@ -203,7 +203,7 @@ public class ReferralInterceptor extends directoryService.setReferralManager( referralManager ); Value subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); - subschemaSubentryDn = directoryService.getDNFactory().create( subschemaSubentry.getString() ); + subschemaSubentryDn = directoryService.getDnFactory().create( subschemaSubentry.getString() ); } 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -181,23 +181,23 @@ public class SchemaInterceptor extends B filters.add( binaryAttributeFilter ); filters.add( topFilter ); - schemaBaseDn = directoryService.getDNFactory().create( SchemaConstants.OU_SCHEMA ); + schemaBaseDn = directoryService.getDnFactory().create( SchemaConstants.OU_SCHEMA ); schemaService = directoryService.getSchemaService(); // 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 = directoryService.getDnFactory().create( subschemaSubentry.getString() ); subschemaSubentryDn.normalize( schemaManager ); subschemaSubentryDnNorm = subschemaSubentryDn.getNormName(); - schemaModificationAttributesDn = directoryService.getDNFactory().create( ServerDNConstants.SCHEMA_MODIFICATIONS_DN ); + schemaModificationAttributesDn = directoryService.getDnFactory().create( ServerDNConstants.SCHEMA_MODIFICATIONS_DN ); schemaModificationAttributesDn.normalize( schemaManager ); computeSuperiors(); // Initialize the schema manager SchemaLoader loader = schemaService.getSchemaPartition().getSchemaManager().getLoader(); - schemaSubEntryManager = new SchemaSubentryManager( schemaManager, loader, directoryService.getDNFactory() ); + schemaSubEntryManager = new SchemaSubentryManager( schemaManager, loader, directoryService.getDnFactory() ); if ( IS_DEBUG ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Mon Jan 24 20:59:28 2011 @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.directory.server.core.DNFactory; +import org.apache.directory.server.core.DnFactory; import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -109,7 +109,7 @@ public class SchemaSubentryManager } - public SchemaSubentryManager( SchemaManager schemaManager, SchemaLoader loader, DNFactory dnFactory ) + public SchemaSubentryManager( SchemaManager schemaManager, SchemaLoader loader, DnFactory dnFactory ) throws LdapException { this.schemaManager = schemaManager; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Mon Jan 24 20:59:28 2011 @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.directory.server.core.DNFactory; +import org.apache.directory.server.core.DnFactory; import org.apache.directory.server.core.authn.AuthenticationInterceptor; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor; @@ -82,7 +82,7 @@ public class SchemaSubentryModifier private SchemaManager schemaManager; /** The Dn factory */ - private DNFactory dnFactory; + private DnFactory dnFactory; /** @@ -92,7 +92,7 @@ public class SchemaSubentryModifier * @param schemaManager The server schemaManager * @param dnFactory The Dn factory */ - public SchemaSubentryModifier( SchemaManager schemaManager, DNFactory dnFactory ) + public SchemaSubentryModifier( SchemaManager schemaManager, DnFactory dnFactory ) { this.schemaManager = schemaManager; this.dnFactory = dnFactory; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Mon Jan 24 20:59:28 2011 @@ -78,7 +78,7 @@ public class CoreKeyStoreSpi extends Key private Entry getTlsEntry() throws Exception { - Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); LdapPrincipal principal = new LdapPrincipal( adminDn, AuthenticationLevel.SIMPLE ); CoreSession session = directoryService.getSession( principal ); return session.lookup( adminDn ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Mon Jan 24 20:59:28 2011 @@ -74,7 +74,7 @@ public class LdapClassLoader extends Cla { super( LdapClassLoader.class.getClassLoader() ); this.directoryService = directoryService; - defaultSearchDn = directoryService.getDNFactory().create( DEFAULT_SEARCH_CONTEXTS_CONFIG ); + defaultSearchDn = directoryService.getDnFactory().create( DEFAULT_SEARCH_CONTEXTS_CONFIG ); OBJECT_CLASS_AT = directoryService.getSchemaManager().getAttributeType( SchemaConstants.OBJECT_CLASS_AT ); } @@ -162,7 +162,7 @@ public class LdapClassLoader extends Cla for ( Value val : attr ) { - Dn dn = directoryService.getDNFactory().create( val.getString() ); + Dn dn = directoryService.getDnFactory().create( val.getString() ); searchContexts.add( dn ); } @@ -186,7 +186,7 @@ public class LdapClassLoader extends Cla for ( String suffix:suffixes ) { - Dn dn = directoryService.getDNFactory().create( suffix ); + Dn dn = directoryService.getDnFactory().create( suffix ); namingContexts.add( dn ); } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Mon Jan 24 20:59:28 2011 @@ -89,7 +89,7 @@ public class StoredProcExecutionManager AttributeType storeProcUnitNamAT = session.getDirectoryService() .getSchemaManager().lookupAttributeTypeRegistry( "storedProcUnitName" ); ExprNode filter = new EqualityNode( storeProcUnitNamAT, new StringValue( storeProcUnitNamAT, spUnitName ) ); - Dn dn = session.getDirectoryService().getDNFactory().create( storedProcContainer ); + Dn dn = session.getDirectoryService().getDnFactory().create( storedProcContainer ); EntryFilteringCursor results = session.search( dn, SearchScope.SUBTREE, filter, AliasDerefMode.DEREF_ALWAYS, EMPTY_ATTRIBS ); if ( results.first() ) 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -199,12 +199,12 @@ public class SubentryInterceptor extends controls.setReturningAttributes( new String[] { SchemaConstants.SUBTREE_SPECIFICATION_AT, SchemaConstants.OBJECT_CLASS_AT } ); - Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); // search each namingContext for subentries for ( String suffix : suffixes ) { - Dn suffixDn = directoryService.getDNFactory().create( suffix ); + Dn suffixDn = directoryService.getDnFactory().create( suffix ); CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java Mon Jan 24 20:59:28 2011 @@ -54,7 +54,7 @@ public abstract class AbstractStoredProc protected Dn getOperationPrincipal() throws LdapInvalidDnException { Principal principal = opContext.getSession().getEffectivePrincipal(); - Dn userName = opContext.getSession().getDirectoryService().getDNFactory().create( principal.getName() ); + Dn userName = opContext.getSession().getDirectoryService().getDnFactory().create( principal.getName() ); return userName; } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java Mon Jan 24 20:59:28 2011 @@ -53,7 +53,7 @@ public class AddStoredProcedureParameter public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( addedEntryName.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( addedEntryName.getName() ); } }; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Mon Jan 24 20:59:28 2011 @@ -52,7 +52,7 @@ public class DeleteStoredProcedureParame public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( deletedEntryName.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( deletedEntryName.getName() ); } }; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Mon Jan 24 20:59:28 2011 @@ -70,7 +70,7 @@ public class ModifyDNStoredProcedurePara public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( oldDn.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( oldDn.getName() ); } }; @@ -82,7 +82,7 @@ public class ModifyDNStoredProcedurePara public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( newRdn.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( newRdn.getName() ); } }; @@ -106,7 +106,7 @@ public class ModifyDNStoredProcedurePara public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( newSuperiorDn.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( newSuperiorDn.getName() ); } }; @@ -118,7 +118,7 @@ public class ModifyDNStoredProcedurePara public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( oldRdn.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( oldRdn.getName() ); } }; @@ -130,7 +130,7 @@ public class ModifyDNStoredProcedurePara public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( oldSuperiorDn.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( oldSuperiorDn.getName() ); } }; @@ -142,7 +142,7 @@ public class ModifyDNStoredProcedurePara public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( newDn.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( newDn.getName() ); } }; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Mon Jan 24 20:59:28 2011 @@ -61,7 +61,7 @@ public class ModifyStoredProcedureParame public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException { // Return a safe copy constructed with user provided name. - return opContext.getSession().getDirectoryService().getDNFactory().create( modifiedEntryName.getName() ); + return opContext.getSession().getDirectoryService().getDnFactory().create( modifiedEntryName.getName() ); } }; 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=1062975&r1=1062974&r2=1062975&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 Jan 24 20:59:28 2011 @@ -123,13 +123,13 @@ public class TriggerSpecCache for ( String suffix:suffixes ) { - Dn baseDn = directoryService.getDNFactory().create( suffix ); + Dn baseDn = directoryService.getDnFactory().create( suffix ); ExprNode filter = new EqualityNode( objectClassAt, new StringValue( ApacheSchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC ) ); SearchControls ctls = new SearchControls(); ctls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ); + Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ); CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Mon Jan 24 20:59:28 2011 @@ -33,8 +33,8 @@ import net.sf.ehcache.CacheManager; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.server.core.DNFactory; -import org.apache.directory.server.core.DefaultDNFactory; +import org.apache.directory.server.core.DnFactory; +import org.apache.directory.server.core.DefaultDnFactory; import org.apache.directory.server.core.normalization.FilterNormalizingVisitor; import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -65,7 +65,7 @@ import org.junit.runner.RunWith; @Concurrent() public class SubtreeEvaluatorTest { - private static DNFactory dnFactory; + private static DnFactory dnFactory; private static SchemaManager schemaManager; private static SubtreeEvaluator evaluator; private static FilterNormalizingVisitor visitor; @@ -98,7 +98,7 @@ public class SubtreeEvaluatorTest CacheManager.getInstance().addCacheIfAbsent( "dnCache" ); Cache dnCache = CacheManager.getInstance().getCache( "dnCache" ); - dnFactory = new DefaultDNFactory( schemaManager, dnCache ); + dnFactory = new DefaultDnFactory( schemaManager, dnCache ); ncn = new ConcreteNameComponentNormalizer( schemaManager ); Modified: directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=1062975&r1=1062974&r2=1062975&view=diff ============================================================================== --- directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java (original) +++ directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Mon Jan 24 20:59:28 2011 @@ -176,7 +176,7 @@ public class HttpServer if ( httpsTransport != null ) { // load the admin entry to get the private key and certificate - Dn adminDn = dirService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); + Dn adminDn = dirService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); Entry adminEntry = dirService.getAdminSession().lookup( adminDn, new String[]{ "+" } ); File confDir = dirService.getInstanceLayout().getConfDirectory();