Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 40970 invoked from network); 7 Sep 2009 15:11:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Sep 2009 15:11:44 -0000 Received: (qmail 35469 invoked by uid 500); 7 Sep 2009 15:11:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 35408 invoked by uid 500); 7 Sep 2009 15:11: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 35399 invoked by uid 99); 7 Sep 2009 15:11:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 15:11: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; Mon, 07 Sep 2009 15:11:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF2B22388897; Mon, 7 Sep 2009 15:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r812185 - in /directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core: authz/AutzIntegUtils.java jndi/MixedCaseITest.java operations/search/SearchWithIndicesITest.java partition/PartitionIT.java Date: Mon, 07 Sep 2009 15:11:19 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090907151119.BF2B22388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Mon Sep 7 15:11:19 2009 New Revision: 812185 URL: http://svn.apache.org/viewvc?rev=812185&view=rev Log: making it so DirectoryServiceFactory builds the DS properly Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=812185&r1=812184&r2=812185&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Mon Sep 7 15:11:19 2009 @@ -25,6 +25,9 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.DirectoryServiceFactory; import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext; + +import org.apache.directory.server.core.partition.ldif.LdifPartition; +import org.apache.directory.server.core.schema.SchemaPartition; import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.name.LdapDN; @@ -58,6 +61,9 @@ public DirectoryService newInstance() throws Exception { DefaultDirectoryService service = new DefaultDirectoryService(); + SchemaPartition schemaPartition = new SchemaPartition(); + schemaPartition.setWrappedPartition( new LdifPartition() ); + service.getSchemaService().setSchemaPartition( schemaPartition ); service.setAccessControlEnabled( true ); service.getChangeLog().setEnabled( true ); AutzIntegUtils.service = service; @@ -71,6 +77,9 @@ public DirectoryService newInstance() throws Exception { DefaultDirectoryService service = new DefaultDirectoryService(); + SchemaPartition schemaPartition = new SchemaPartition(); + schemaPartition.setWrappedPartition( new LdifPartition() ); + service.getSchemaService().setSchemaPartition( schemaPartition ); service.setAccessControlEnabled( false ); service.getChangeLog().setEnabled( true ); AutzIntegUtils.service = service; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=812185&r1=812184&r2=812185&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Mon Sep 7 15:11:19 2009 @@ -33,6 +33,8 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; +import org.apache.directory.server.core.partition.ldif.LdifPartition; +import org.apache.directory.server.core.schema.SchemaPartition; import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException; import org.apache.directory.shared.ldap.name.LdapDN; @@ -80,7 +82,10 @@ { public DirectoryService newInstance() throws Exception { - DirectoryService service = new DefaultDirectoryService(); + DefaultDirectoryService service = new DefaultDirectoryService(); + SchemaPartition schemaPartition = new SchemaPartition(); + schemaPartition.setWrappedPartition( new LdifPartition() ); + service.getSchemaService().setSchemaPartition( schemaPartition ); service.getChangeLog().setEnabled( true ); JdbmPartition partition = new JdbmPartition(); Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java?rev=812185&r1=812184&r2=812185&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java Mon Sep 7 15:11:19 2009 @@ -33,6 +33,8 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; +import org.apache.directory.server.core.partition.ldif.LdifPartition; +import org.apache.directory.server.core.schema.SchemaPartition; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -119,7 +121,10 @@ { public DirectoryService newInstance() throws Exception { - DirectoryService service = new DefaultDirectoryService(); + DefaultDirectoryService service = new DefaultDirectoryService(); + SchemaPartition schemaPartition = new SchemaPartition(); + schemaPartition.setWrappedPartition( new LdifPartition() ); + service.getSchemaService().setSchemaPartition( schemaPartition ); service.getChangeLog().setEnabled( true ); // ------------------------------------------------------------------- Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=812185&r1=812184&r2=812185&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Mon Sep 7 15:11:19 2009 @@ -29,6 +29,8 @@ import org.apache.directory.server.core.integ.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.annotations.Factory; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; +import org.apache.directory.server.core.partition.ldif.LdifPartition; +import org.apache.directory.server.core.schema.SchemaPartition; import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext; @@ -82,7 +84,10 @@ { public DirectoryService newInstance() throws Exception { - DirectoryService service = new DefaultDirectoryService(); + DefaultDirectoryService service = new DefaultDirectoryService(); + SchemaPartition schemaPartition = new SchemaPartition(); + schemaPartition.setWrappedPartition( new LdifPartition() ); + service.getSchemaService().setSchemaPartition( schemaPartition ); service.getChangeLog().setEnabled( true ); Partition foo = new JdbmPartition();