From commits-return-9482-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Jul 12 00:27:15 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 33575 invoked from network); 12 Jul 2006 00:27:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jul 2006 00:27:15 -0000 Received: (qmail 7436 invoked by uid 500); 12 Jul 2006 00:27:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 7410 invoked by uid 500); 12 Jul 2006 00:27: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 7398 invoked by uid 99); 12 Jul 2006 00:27:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2006 17:27:14 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2006 17:27:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6C3391A981D; Tue, 11 Jul 2006 17:26:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421053 [2/2] - in /directory/branches/apacheds/optimization: core-unit/src/main/java/org/apache/directory/server/core/unit/ core-unit/src/test/java/org/apache/directory/server/core/configuration/ core-unit/src/test/java/org/apache/director... Date: Wed, 12 Jul 2006 00:26:45 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060712002653.6C3391A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml?rev=421053&r1=421052&r2=421053&view=diff ============================================================================== --- directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml (original) +++ directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml Tue Jul 11 17:26:43 2006 @@ -159,30 +159,69 @@ - + example - 5000 + 10000 dc=example,dc=com + + + false - - dc - ou - krb5PrincipalName - uid - - + + 1.2.6.1.4.1.18060.1.1.1.3.1 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.2 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.3 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.4 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.5 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.6 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.7 + 100 + + dc + 100 + + + ou + 100 + + + krb5PrincipalName + 100 + + + uid + 100 + + objectClass - 5000 + 100 Modified: directory/branches/apacheds/optimization/server-main/server.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-main/server.xml?rev=421053&r1=421052&r2=421053&view=diff ============================================================================== --- directory/branches/apacheds/optimization/server-main/server.xml (original) +++ directory/branches/apacheds/optimization/server-main/server.xml Tue Jul 11 17:26:43 2006 @@ -159,30 +159,69 @@ - + example - 5000 + 10000 dc=example,dc=com + + + false - - dc - ou - krb5PrincipalName - uid - - + + 1.2.6.1.4.1.18060.1.1.1.3.1 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.2 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.3 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.4 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.5 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.6 + 100 + + + 1.2.6.1.4.1.18060.1.1.1.3.7 + 100 + + dc + 100 + + + ou + 100 + + + krb5PrincipalName + 100 + + + uid + 100 + + objectClass - 5000 + 100 Modified: directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java?rev=421053&r1=421052&r2=421053&view=diff ============================================================================== --- directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java (original) +++ directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java Tue Jul 11 17:26:43 2006 @@ -20,7 +20,7 @@ import org.apache.directory.server.configuration.MutableServerStartupConfiguration; import org.apache.directory.server.core.configuration.Configuration; -import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration; +import org.apache.directory.server.core.configuration.MutablePartitionConfiguration; import org.apache.directory.server.core.configuration.ShutdownConfiguration; import org.apache.directory.server.core.configuration.SyncConfiguration; import org.apache.directory.server.jndi.ServerContextFactory; @@ -303,8 +303,8 @@ Set indexedAttrs; BasicAttribute attr; Set pcfgs = new HashSet(); - MutableDirectoryPartitionConfiguration pcfg; - pcfg = new MutableDirectoryPartitionConfiguration(); + MutablePartitionConfiguration pcfg; + pcfg = new MutablePartitionConfiguration(); pcfg.setName( this.customRootPartitionName ); pcfg.setSuffix( "dc=" + this.customRootPartitionName ); Modified: directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java?rev=421053&r1=421052&r2=421053&view=diff ============================================================================== --- directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java (original) +++ directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java Tue Jul 11 17:26:43 2006 @@ -17,7 +17,7 @@ package org.apache.directory.server; -import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration; +import org.apache.directory.server.core.configuration.MutablePartitionConfiguration; import org.apache.directory.server.unit.AbstractServerTest; import org.apache.directory.shared.asn1.util.Asn1StringUtils; import org.apache.directory.shared.ldap.message.Control; @@ -72,7 +72,7 @@ { Set partitions = new HashSet(); partitions.addAll( configuration.getContextPartitionConfigurations() ); - MutableDirectoryPartitionConfiguration partition = new MutableDirectoryPartitionConfiguration(); + MutablePartitionConfiguration partition = new MutablePartitionConfiguration(); partition.setSuffix( "dc=aPache,dc=org" ); Attributes entry = new BasicAttributes( "dc", "aPache", true ); Attribute oc = new BasicAttribute( "objectClass" ); @@ -93,7 +93,7 @@ // create a partition to search Set partitions = new HashSet(); partitions.addAll( configuration.getContextPartitionConfigurations() ); - MutableDirectoryPartitionConfiguration partition = new MutableDirectoryPartitionConfiguration(); + MutablePartitionConfiguration partition = new MutablePartitionConfiguration(); partition.setSuffix( "dc=apache,dc=org" ); Attributes entry = new BasicAttributes( "dc", "apache", true ); Attribute oc = new BasicAttribute( "objectClass" ); Modified: directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java?rev=421053&r1=421052&r2=421053&view=diff ============================================================================== --- directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java (original) +++ directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java Tue Jul 11 17:26:43 2006 @@ -30,7 +30,7 @@ import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; -import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration; +import org.apache.directory.server.core.configuration.MutablePartitionConfiguration; import org.apache.directory.server.core.unit.AbstractAdminTestCase; import org.apache.directory.shared.ldap.exception.LdapConfigurationException; @@ -54,10 +54,10 @@ Set indexedAttrs; Set pcfgs = new HashSet(); - MutableDirectoryPartitionConfiguration pcfg; + MutablePartitionConfiguration pcfg; // Add partition 'testing' - pcfg = new MutableDirectoryPartitionConfiguration(); + pcfg = new MutablePartitionConfiguration(); pcfg.setName( "testing" ); pcfg.setSuffix( "ou=testing" ); @@ -80,7 +80,7 @@ pcfgs.add( pcfg ); // Add partition 'example' - pcfg = new MutableDirectoryPartitionConfiguration(); + pcfg = new MutablePartitionConfiguration(); pcfg.setName( "example" ); pcfg.setSuffix( "dc=example" ); @@ -104,7 +104,7 @@ pcfgs.add( pcfg ); // Add partition 'MixedCase' - pcfg = new MutableDirectoryPartitionConfiguration(); + pcfg = new MutablePartitionConfiguration(); pcfg.setName( "mixedcase" ); pcfg.setSuffix( "dc=MixedCase" ); @@ -280,10 +280,10 @@ public void testBadPartition() throws Exception { - MutableDirectoryPartitionConfiguration pcfg; + MutablePartitionConfiguration pcfg; // Add partition 'test=testing' - pcfg = new MutableDirectoryPartitionConfiguration(); + pcfg = new MutablePartitionConfiguration(); pcfg.setName( "testing" ); try