Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 1104 invoked from network); 9 Apr 2009 03:36:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2009 03:36:14 -0000 Received: (qmail 31812 invoked by uid 500); 9 Apr 2009 03:36:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 31758 invoked by uid 500); 9 Apr 2009 03:36:14 -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 31749 invoked by uid 99); 9 Apr 2009 03:36:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2009 03:36:14 +0000 X-ASF-Spam-Status: No, hits=-1999.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2009 03:36:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A032E23889E9; Thu, 9 Apr 2009 03:35:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r763501 - in /directory/apacheds/branches/ldif-partition: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core-integ/src/test/java... Date: Thu, 09 Apr 2009 03:35:51 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090409033552.A032E23889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Thu Apr 9 03:35:49 2009 New Revision: 763501 URL: http://svn.apache.org/viewvc?rev=763501&view=rev Log: changed some method signatures on Store for clarity and fixed a couple bugs Modified: directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmPartition.java directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmStore.java directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Modified: directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original) +++ directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Thu Apr 9 03:35:49 2009 @@ -90,7 +90,7 @@ // initialize the store getStore().setName( getId() ); - getStore().setSuffixDn( suffix ); + getStore().setUpSuffixString( suffix ); Set> userIndices = new HashSet>(); Modified: directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original) +++ directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Thu Apr 9 03:35:49 2009 @@ -464,7 +464,7 @@ /** * {@inheritDoc} */ - public LdapDN getSuffix() + public LdapDN getNormSuffixDn() { return suffixDn; } @@ -473,7 +473,7 @@ /** * {@inheritDoc} */ - public String getSuffixDn() + public String getUpSuffixString() { return suffixDn.getUpName(); } @@ -491,7 +491,7 @@ /** * {@inheritDoc} */ - public LdapDN getUpSuffix() throws Exception + public LdapDN getUpSuffixDn() throws Exception { // TODO fix this return new LdapDN( suffixDn.getUpName() ); @@ -1446,7 +1446,7 @@ /** * {@inheritDoc} */ - public void setSuffixDn( String suffixDn ) throws Exception + public void setUpSuffixString( String suffixDn ) throws Exception { // TODO fix this this.suffixDn = new LdapDN( suffixDn ); Modified: directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original) +++ directory/apacheds/branches/ldif-partition/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Thu Apr 9 03:35:49 2009 @@ -675,7 +675,7 @@ { store.setCacheSize( 1000 ); store.setName( "schema" ); - store.setSuffixDn( SchemaConstants.OU_AT + "=schema" ); + store.setUpSuffixString( SchemaConstants.OU_AT + "=schema" ); store.setSyncOnWrite( false ); store.setWorkingDirectory( workingDirectory ); Modified: directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original) +++ directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Thu Apr 9 03:35:49 2009 @@ -46,7 +46,6 @@ import org.junit.runner.RunWith; import javax.naming.NamingEnumeration; -import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; @@ -78,7 +77,7 @@ public static class MyFactory implements DirectoryServiceFactory { - public DirectoryService newInstance() throws NamingException + public DirectoryService newInstance() throws Exception { DirectoryService service = new DefaultDirectoryService(); service.getChangeLog().setEnabled( true ); Modified: directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java (original) +++ directory/apacheds/branches/ldif-partition/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java Thu Apr 9 03:35:49 2009 @@ -116,7 +116,7 @@ public static class MyFactory implements DirectoryServiceFactory { - public DirectoryService newInstance() + public DirectoryService newInstance() throws Exception { DirectoryService service = new DefaultDirectoryService(); service.getChangeLog().setEnabled( true ); Modified: directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Thu Apr 9 03:35:49 2009 @@ -535,7 +535,7 @@ Partition partition = opContext.getPartition(); // Turn on default indices - String key = partition.getSuffixDn().getUpName(); + String key = partition.getUpSuffixDn().getUpName(); if ( partitions.containsKey( key ) ) { Modified: directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmPartition.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmPartition.java (original) +++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmPartition.java Thu Apr 9 03:35:49 2009 @@ -75,9 +75,10 @@ // ------------------------------------------------------------------------ - public void setSuffix( String suffix ) + public void setSuffix( String suffix ) throws Exception { this.suffix = suffix; + getStore().setUpSuffixString( suffix ); } @@ -169,7 +170,7 @@ // initialize the store getJdbmStore().setCacheSize( getCacheSize() ); getJdbmStore().setName( getId() ); - getJdbmStore().setSuffixDn( suffix ); + getJdbmStore().setUpSuffixString( suffix ); getJdbmStore().setWorkingDirectory( new File( directoryService.getWorkingDirectory().getPath() + File.separator + getId() ) ); Set> userIndices = new HashSet>(); Modified: directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmStore.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmStore.java (original) +++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/jdbm/JdbmStore.java Thu Apr 9 03:35:49 2009 @@ -146,7 +146,7 @@ // ----------------------------------------------------------------------- - private String suffixDn; + private String suffixString; private int cacheSize = DEFAULT_CACHE_SIZE; private String name; @@ -173,19 +173,6 @@ } - public void setSuffixDn( String suffixDn ) - { - protect( "suffixDn" ); - this.suffixDn = suffixDn; - } - - - public String getSuffixDn() - { - return suffixDn; - } - - public void setSyncOnWrite( boolean isSyncOnWrite ) { protect( "syncOnWrite" ); @@ -244,7 +231,7 @@ OBJECT_CLASS_AT = attributeTypeRegistry.lookup( SchemaConstants.OBJECT_CLASS_AT ); ALIASED_OBJECT_NAME_AT = attributeTypeRegistry.lookup( SchemaConstants.ALIASED_OBJECT_NAME_AT ); - this.upSuffix = new LdapDN( suffixDn ); + this.upSuffix = new LdapDN( suffixString ); this.normSuffix = LdapDN.normalize( upSuffix, attributeTypeRegistry.getNormalizerMapping() ); workingDirectory.mkdirs(); @@ -258,13 +245,17 @@ cacheSize = DEFAULT_CACHE_SIZE; LOG.debug( "Using the default entry cache size of {} for {} partition", cacheSize, name ); } + else if ( cacheSize == 0 ) + { + recMan = base; + } else { LOG.debug( "Using the custom configured cache size of {} for {} partition", cacheSize, name ); - } - // Now, create the entry cache for this partition - recMan = new CacheRecordManager( base, new MRU( cacheSize ) ); + // Now, create the entry cache for this partition + recMan = new CacheRecordManager( base, new MRU( cacheSize ) ); + } // Create the master table (the table containing all the entries) master = new JdbmMasterTable( recMan, registries ); @@ -407,7 +398,7 @@ */ public synchronized void destroy() throws Exception { - LOG.debug( "destroy() called on store for {}", this.suffixDn ); + LOG.debug( "destroy() called on store for {}", this.suffixString ); if ( !initialized ) { @@ -424,7 +415,7 @@ try { index.close(); - LOG.debug( "Closed {} index for {} partition.", index.getAttributeId(), suffixDn ); + LOG.debug( "Closed {} index for {} partition.", index.getAttributeId(), suffixString ); } catch ( Throwable t ) { @@ -436,7 +427,7 @@ try { master.close(); - LOG.debug( "Closed master table for {} partition.", suffixDn ); + LOG.debug( "Closed master table for {} partition.", suffixString ); } catch ( Throwable t ) { @@ -447,7 +438,7 @@ try { recMan.close(); - LOG.debug( "Closed record manager for {} partition.", suffixDn ); + LOG.debug( "Closed record manager for {} partition.", suffixString ); } catch ( Throwable t ) { @@ -1158,13 +1149,32 @@ } - public LdapDN getSuffix() + public void setUpSuffixString( String suffixDn ) throws Exception { + protect( "suffixDn" ); + this.suffixString = suffixDn; + this.upSuffix = new LdapDN( suffixDn ); + } + + + public String getUpSuffixString() + { + return suffixString; + } + + + public LdapDN getNormSuffixDn() + { + if ( ! initialized ) + { + throw new RuntimeException( "Initialization required before getting normalized suffix" ); + } + return normSuffix; } - public LdapDN getUpSuffix() + public LdapDN getUpSuffixDn() { return upSuffix; } Modified: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java Thu Apr 9 03:35:49 2009 @@ -185,16 +185,24 @@ store.setSubAliasIndex( new JdbmIndex( "subAlias" ) ); assertNotNull( store.getSubAliasIndex() ); - assertNull( store.getSuffixDn() ); - store.setSuffixDn( "dc=example,dc=com" ); - assertEquals( "dc=example,dc=com", store.getSuffixDn() ); + assertNull( store.getUpSuffixString() ); + store.setUpSuffixString( "dc=example,dc=com" ); + assertEquals( "dc=example,dc=com", store.getUpSuffixString() ); assertNull( store.getUpdnIndex() ); store.setUpdnIndex( new JdbmIndex( "updn" ) ); assertNotNull( store.getUpdnIndex() ); - assertNull( store.getUpSuffix() ); - assertNull( store.getSuffix() ); + assertNotNull( store.getUpSuffixDn() ); + + try + { + store.getNormSuffixDn(); + fail(); + } + catch ( Exception e ) + { + } assertEquals( 0, store.getUserIndices().size() ); Set> set = new HashSet>(); @@ -255,8 +263,8 @@ try { store.setSubAliasIndex( new JdbmIndex( "subAlias" ) ); fail(); } catch( IllegalStateException e ) {} - assertNotNull( store.getSuffixDn() ); - try { store.setSuffixDn( "dc=example,dc=com" ); fail(); } + assertNotNull( store.getUpSuffixString() ); + try { store.setUpSuffixString( "dc=example,dc=com" ); fail(); } catch( IllegalStateException e ) {} assertNotNull( store.getUpdnIndex() ); @@ -275,8 +283,8 @@ try { store.getSystemIndex( "dc" ); fail(); } catch ( IndexNotFoundException e ) {} - assertNotNull( store.getUpSuffix() ); - assertNotNull( store.getSuffix() ); + assertNotNull( store.getUpSuffixDn() ); + assertNotNull( store.getNormSuffixDn() ); assertEquals( 2, store.getUserIndices().size() ); assertFalse( store.hasUserIndexOn( "dc" ) ); Modified: directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original) +++ directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Thu Apr 9 03:35:49 2009 @@ -36,7 +36,6 @@ import org.junit.Test; import javax.naming.Context; -import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; @@ -150,7 +149,7 @@ } - protected void configureDirectoryService() throws NamingException + protected void configureDirectoryService() throws Exception { directoryService.setAllowAnonymousAccess( false ); Set partitions = new HashSet(); Modified: directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original) +++ directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Thu Apr 9 03:35:49 2009 @@ -90,17 +90,48 @@ */ - void setUserIndices( Set> userIndices ) throws Exception; + /** + * Sets the user provided (Up) distinguished name as a String to be used + * as the suffix for this store. This suffix string will be used to + * generate the user provided suffix DN object returned by + * {@link #getUpSuffixDn()}. After initialization of the Store, schema + * registries are available to properly normalize this DN and provide + * access to the normalized DN. + * + * @param upSuffixString the user provided suffix DN as a String + */ + void setUpSuffixString( String upSuffixString ) throws Exception; - Set> getUserIndices(); + /** + * Gets the user provided suffix DN as a String. + * + * @return the user provided suffix DN as a String. + */ + String getUpSuffixString() throws Exception; - void setSuffixDn( String suffixDn ) throws Exception; + /** + * Gets the normalized distinguished name of the suffix as an LdapDN. This + * method can only be accessed after initialization or else an exception + * will be thrown. + * + * @return the normalized suffix as an LdapDN + * @throws RuntimeException if accessed before initialization + */ + LdapDN getNormSuffixDn() throws Exception; - String getSuffixDn(); + /** + * Gets the user provided suffix distinguished name as an LdapDN + * + * @return the user provided LdapDN for the suffix + */ + LdapDN getUpSuffixDn() throws Exception; + + // ---------------- + void setName( String name ); @@ -108,6 +139,11 @@ String getName(); + // ----------------------------------------------------------------------- + // START: Life Cycle Management Methods + // ----------------------------------------------------------------------- + + /** * Initialize the JDBM storage system. * @@ -134,10 +170,26 @@ */ boolean isInitialized(); + + // ----------------------------------------------------------------------- + // END: Life Cycle Management Methods + // ----------------------------------------------------------------------- + + + // ----------------------------------------------------------------------- + // START: Index Management Methods + // ----------------------------------------------------------------------- + void addIndex( Index index ) throws Exception; + void setUserIndices( Set> userIndices ) throws Exception; + + + Set> getUserIndices(); + + Index getPresenceIndex(); @@ -204,6 +256,11 @@ Index getSystemIndex( String id ) throws IndexNotFoundException; + // ----------------------------------------------------------------------- + // END: Index Management Methods + // ----------------------------------------------------------------------- + + Long getEntryId( String dn ) throws Exception; @@ -257,12 +314,6 @@ int getChildCount( Long id ) throws Exception; - LdapDN getSuffix(); - - - LdapDN getUpSuffix() throws Exception; - - void setProperty( String propertyName, String propertyValue ) throws Exception; Modified: directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java (original) +++ directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java Thu Apr 9 03:35:49 2009 @@ -403,14 +403,14 @@ } - public final LdapDN getSuffixDn() + public final LdapDN getSuffixDn() throws Exception { - return store.getSuffix(); + return store.getNormSuffixDn(); } public final LdapDN getUpSuffixDn() throws Exception { - return store.getUpSuffix(); + return store.getUpSuffixDn(); } Modified: directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original) +++ directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Thu Apr 9 03:35:49 2009 @@ -73,7 +73,7 @@ { try { - this.contextEntryId = db.getEntryId( db.getSuffix().getNormName() ); + this.contextEntryId = db.getEntryId( db.getNormSuffixDn().getNormName() ); } catch ( Exception e ) { Modified: directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original) +++ directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Thu Apr 9 03:35:49 2009 @@ -99,7 +99,7 @@ { try { - this.contextEntryId = db.getEntryId( db.getSuffix().getNormName() ); + this.contextEntryId = db.getEntryId( db.getNormSuffixDn().getNormName() ); } catch ( Exception e ) { Modified: directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java (original) +++ directory/apacheds/branches/ldif-partition/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java Thu Apr 9 03:35:49 2009 @@ -94,7 +94,7 @@ { try { - this.contextEntryId = db.getEntryId( db.getSuffix().getNormName() ); + this.contextEntryId = db.getEntryId( db.getNormSuffixDn().getNormName() ); } catch ( Exception e ) { Modified: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=763501&r1=763500&r2=763501&view=diff ============================================================================== --- directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java (original) +++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Thu Apr 9 03:35:49 2009 @@ -61,7 +61,7 @@ */ public static void loadExampleData( Store store, Registries registries ) throws Exception { - store.setSuffixDn( "o=Good Times Co." ); + store.setUpSuffixString( "o=Good Times Co." ); LdapDN suffixDn = new LdapDN( "o=Good Times Co." ); suffixDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );