Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28584 invoked from network); 10 Sep 2009 20:26:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Sep 2009 20:26:44 -0000 Received: (qmail 82004 invoked by uid 500); 10 Sep 2009 20:26:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 81944 invoked by uid 500); 10 Sep 2009 20:26:44 -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 81932 invoked by uid 99); 10 Sep 2009 20:26:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Sep 2009 20:26:44 +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, 10 Sep 2009 20:26:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 416D423888E4; Thu, 10 Sep 2009 20:26:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r813576 - in /directory/apacheds/branches/apacheds-schema: core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Date: Thu, 10 Sep 2009 20:26:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090910202619.416D423888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Sep 10 20:26:18 2009 New Revision: 813576 URL: http://svn.apache.org/viewvc?rev=813576&view=rev Log: Injected the registries into the added partitions Fixed Configuration tests Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=813576&r1=813575&r2=813576&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Thu Sep 10 20:26:18 2009 @@ -20,14 +20,21 @@ package org.apache.directory.server.core.configuration; +import java.util.Hashtable; +import java.util.UUID; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NameNotFoundException; + import junit.framework.Assert; + import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.integ.CiRunner; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.jndi.CoreContextFactory; -import org.apache.directory.server.core.partition.Partition; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; import org.apache.directory.shared.ldap.csn.CsnFactory; import org.apache.directory.shared.ldap.name.LdapDN; @@ -35,12 +42,6 @@ import org.junit.Test; import org.junit.runner.RunWith; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NameNotFoundException; -import java.util.Hashtable; -import java.util.UUID; - /** * Tests dynamic partition addition and removal. @@ -57,9 +58,10 @@ @Test public void testAddAndRemove() throws Exception { - Partition partition = new JdbmPartition(); + JdbmPartition partition = new JdbmPartition(); partition.setId( "removable" ); partition.setSuffix( "ou=removable" ); + partition.setPartitionDir( service.getWorkingDirectory() ); // Test AddContextPartition service.addPartition( partition ); Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=813576&r1=813575&r2=813576&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Sep 10 20:26:18 2009 @@ -576,9 +576,10 @@ } - public void addPartition( Partition parition ) throws Exception + public void addPartition( Partition partition ) throws Exception { - partitions.add( parition ); + partition.setRegistries( getRegistries() ); + partitions.add( partition ); if ( ! started ) { @@ -586,7 +587,7 @@ } AddContextPartitionOperationContext addPartitionCtx = - new AddContextPartitionOperationContext( adminSession, parition ); + new AddContextPartitionOperationContext( adminSession, partition ); partitionNexus.addContextPartition( addPartitionCtx ); }