Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 6257 invoked from network); 14 Dec 2006 01:24:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Dec 2006 01:24:57 -0000 Received: (qmail 89612 invoked by uid 500); 14 Dec 2006 01:25:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 89555 invoked by uid 500); 14 Dec 2006 01:25:04 -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 89544 invoked by uid 99); 14 Dec 2006 01:25:04 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Dec 2006 17:25:04 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Dec 2006 17:24:53 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 64E031A981A; Wed, 13 Dec 2006 17:24:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r486923 [1/2] - in /directory/branches/trunks/schema: apacheds/ apacheds/bootstrap-partition/ apacheds/bootstrap-plugin/ apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ apacheds/bootstrap-schema/ a... Date: Thu, 14 Dec 2006 01:24:07 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061214012408.64E031A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Wed Dec 13 17:23:58 2006 New Revision: 486923 URL: http://svn.apache.org/viewvc?view=rev&rev=486923 Log: Merging form schema2 sub-branch all the project shuffling. The nasty dependency issue (cycle) with the bootstrap-partition and the core is gone. With this past us we can start to revise the schema subsystem and the init sequence for the server to use this new pre-loaded partition. Here's the command used to do this merge: svn merge -r 486821:486919 https://svn.apache.org/repos/asf/directory/branches/trunks/schema2 . Added: directory/branches/trunks/schema/apacheds/btree-base/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/ directory/branches/trunks/schema/apacheds/btree-base/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/pom.xml directory/branches/trunks/schema/apacheds/btree-base/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/ directory/branches/trunks/schema/apacheds/btree-base/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ - copied from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoDupsEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoDupsEnumeration.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleBrowser.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleBrowser.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleEnumeration.java directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java directory/branches/trunks/schema/apacheds/constants/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/ directory/branches/trunks/schema/apacheds/constants/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/constants/pom.xml directory/branches/trunks/schema/apacheds/constants/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/ directory/branches/trunks/schema/apacheds/constants/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/ directory/branches/trunks/schema/apacheds/constants/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/directory/server/core/constants/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/constants/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/directory/server/core/partition/ - copied from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/partition/ directory/branches/trunks/schema/apacheds/constants/src/main/java/org/apache/directory/server/core/partition/Oid.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/partition/Oid.java directory/branches/trunks/schema/apacheds/jdbm-store/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/ directory/branches/trunks/schema/apacheds/jdbm-store/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/pom.xml directory/branches/trunks/schema/apacheds/jdbm-store/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ - copied from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeEnumeration.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeIterator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeIterator.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirect.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirect.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumeration.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsEnumeration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsEnumeration.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreConfiguration.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreConfiguration.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTupleBrowser.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTupleBrowser.java directory/branches/trunks/schema/apacheds/schema-bootstrap/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/ directory/branches/trunks/schema/apacheds/schema-bootstrap/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/pom.xml directory/branches/trunks/schema/apacheds/schema-bootstrap/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/schema/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/schema/ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/schema/apache.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/schema/apache.schema directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/schema/core.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/schema/core.schema directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/schema/system.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/schema/system.schema directory/branches/trunks/schema/apacheds/schema-extras/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/ directory/branches/trunks/schema/apacheds/schema-extras/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/pom.xml directory/branches/trunks/schema/apacheds/schema-extras/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/package.html - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/package.html directory/branches/trunks/schema/apacheds/schema-extras/src/main/resources/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/resources/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/resources/META-INF/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/resources/META-INF/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/resources/META-INF/LICENSE.txt - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/resources/META-INF/LICENSE.txt directory/branches/trunks/schema/apacheds/schema-extras/src/main/resources/META-INF/NOTICE.txt - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/resources/META-INF/NOTICE.txt directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/ directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/apachedns.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/apachedns.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/autofs.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/autofs.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/collective.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/collective.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/corba.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/corba.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/cosine.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/cosine.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/dhcp.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/dhcp.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/inetorgperson.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/inetorgperson.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/java.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/java.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/krb5kdc.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/krb5kdc.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/misc.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/misc.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/mozilla.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/mozilla.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/nis.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/nis.schema directory/branches/trunks/schema/apacheds/schema-extras/src/main/schema/samba.schema - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/main/schema/samba.schema directory/branches/trunks/schema/apacheds/schema-extras/src/test/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/ directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/ExtraSchemaLoadTest.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/ExtraSchemaLoadTest.java directory/branches/trunks/schema/apacheds/schema-registries/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/ directory/branches/trunks/schema/apacheds/schema-registries/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/pom.xml directory/branches/trunks/schema/apacheds/schema-registries/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ - copied from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DnComparator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DnComparator.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DnNormalizer.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DnNormalizer.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/Registries.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/Registries.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java directory/branches/trunks/schema/apacheds/utils/ (props changed) - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/ directory/branches/trunks/schema/apacheds/utils/pom.xml - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/utils/pom.xml directory/branches/trunks/schema/apacheds/utils/src/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/ directory/branches/trunks/schema/apacheds/utils/src/main/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/ directory/branches/trunks/schema/apacheds/utils/src/main/java/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/ directory/branches/trunks/schema/apacheds/utils/src/main/java/org/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/ directory/branches/trunks/schema/apacheds/utils/src/main/java/org/apache/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/ directory/branches/trunks/schema/apacheds/utils/src/main/java/org/apache/directory/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/ directory/branches/trunks/schema/apacheds/utils/src/main/java/org/apache/directory/server/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/server/ directory/branches/trunks/schema/apacheds/utils/src/main/java/org/apache/directory/server/core/ - copied from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/server/core/ directory/branches/trunks/schema/apacheds/utils/src/main/java/org/apache/directory/server/core/ServerUtils.java - copied unchanged from r486919, directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/server/core/ServerUtils.java directory/branches/trunks/schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java - copied unchanged from r486919, directory/branches/trunks/schema2/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java Removed: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/MojoDSConfig.java directory/branches/trunks/schema/apacheds/bootstrap-schema/ directory/branches/trunks/schema/apacheds/core-schema/ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/ServerUtils.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoDupsEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleBrowser.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeIterator.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirect.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsEnumeration.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTupleBrowser.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DnComparator.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DnNormalizer.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectFactoryRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/Registries.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/StateFactoryRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ directory/branches/trunks/schema/apacheds/core/src/main/schema/ Modified: directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml directory/branches/trunks/schema/apacheds/bootstrap-plugin/pom.xml directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java directory/branches/trunks/schema/apacheds/core/ (props changed) directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java directory/branches/trunks/schema/apacheds/core-unit/pom.xml directory/branches/trunks/schema/apacheds/core/pom.xml directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java directory/branches/trunks/schema/apacheds/pom.xml directory/branches/trunks/schema/apacheds/protocol-shared/pom.xml Modified: directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml (original) +++ directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml Wed Dec 13 17:23:58 2006 @@ -28,7 +28,7 @@ org.apache.directory.server - apacheds-core + apacheds-jdbm-store ${pom.version} Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/pom.xml?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/bootstrap-plugin/pom.xml (original) +++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/pom.xml Wed Dec 13 17:23:58 2006 @@ -32,12 +32,12 @@ org.apache.directory.server - apacheds-core + apacheds-jdbm-store ${pom.version} org.apache.directory.server - apacheds-bootstrap-schema + apacheds-schema-extras ${pom.version} Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original) +++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Wed Dec 13 17:23:58 2006 @@ -21,23 +21,19 @@ import java.io.File; import java.io.IOException; -import java.util.HashMap; +import java.math.BigInteger; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; -import org.apache.directory.server.core.configuration.MutablePartitionConfiguration; -import org.apache.directory.server.core.configuration.MutableStartupConfiguration; -import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; +import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; +import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStoreConfiguration; import org.apache.directory.server.core.schema.AttributeTypeRegistry; import org.apache.directory.server.core.schema.ComparatorRegistry; import org.apache.directory.server.core.schema.MatchingRuleRegistry; @@ -53,8 +49,6 @@ import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader; import org.apache.directory.server.core.schema.bootstrap.CoreSchema; import org.apache.directory.server.core.schema.bootstrap.SystemSchema; -import org.apache.directory.shared.ldap.filter.ExprNode; -import org.apache.directory.shared.ldap.filter.PresenceNode; import org.apache.directory.shared.ldap.message.LockableAttributeImpl; import org.apache.directory.shared.ldap.message.LockableAttributesImpl; import org.apache.directory.shared.ldap.name.LdapDN; @@ -118,8 +112,8 @@ /** Registries of objects used to load the schema partition. */ private Registries registries = new BootstrapRegistries(); - /** The partition to load schema entities into. */ - private JdbmPartition partition = new JdbmPartition(); + /** The store to load schema entities into. */ + private JdbmStore store = new JdbmStore(); /** @@ -152,13 +146,13 @@ LdapDN dn = new LdapDN( "ou=schema" ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - if ( ! partition.hasEntry( dn ) ) + if ( ! hasEntry( dn ) ) { Attributes entry = new LockableAttributesImpl(); entry.put( "objectClass", "top" ); entry.get( "objectClass" ).add( "organizationalUnit" ); entry.put( "ou", "schema" ); - partition.add( dn, entry ); + store.add( dn, entry ); } addSyntaxCheckers(); @@ -186,11 +180,6 @@ getLog().info( "" ); getLog().info( "------------------------------------------------------------------------" ); } - - if ( getLog().isDebugEnabled() ) - { - listEntries(); - } } catch ( NamingException e ) { @@ -200,7 +189,7 @@ try { - partition.sync(); + store.sync(); } catch ( NamingException e ) { @@ -230,7 +219,7 @@ Attributes entry = attributesFactory.getAttributes( at ); dn.add( "m-oid=" + at.getOid() ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -257,7 +246,7 @@ Attributes entry = attributesFactory.getAttributes( oc ); dn.add( "m-oid=" + oc.getOid() ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -284,7 +273,7 @@ Attributes entry = attributesFactory.getAttributes( mr ); dn.add( "m-oid=" + mr.getOid() ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -311,7 +300,7 @@ Attributes entry = attributesFactory.getAttributes( oid, comparatorRegistry.lookup( oid ) ); dn.add( "m-oid=" + oid ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -338,7 +327,7 @@ Attributes entry = attributesFactory.getAttributes( oid, normalizerRegistry.lookup( oid ) ); dn.add( "m-oid=" + oid ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -365,7 +354,7 @@ Attributes entry = attributesFactory.getAttributes( syntax ); dn.add( "m-oid=" + syntax.getOid() ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -392,7 +381,7 @@ Attributes entry = attributesFactory.getAttributes( syntaxChecker ); dn.add( "m-oid=" + syntaxChecker.getSyntaxOid() ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - partition.add( dn, entry ); + store.add( dn, entry ); } getLog().info( "" ); } @@ -406,16 +395,17 @@ */ private void initializePartition() throws MojoFailureException { - // start up the schema partition - MutableStartupConfiguration msConf = new MutableStartupConfiguration(); - msConf.setWorkingDirectory( outputDirectory ); + JdbmStoreConfiguration storeConfig = new JdbmStoreConfiguration(); + storeConfig.setAttributeTypeRegistry( registries.getAttributeTypeRegistry() ); + storeConfig.setCacheSize( 1000 ); + storeConfig.setEnableOptimizer( false ); + storeConfig.setName( "schema" ); + storeConfig.setOidRegistry( registries.getOidRegistry() ); + storeConfig.setSuffixDn( "ou=schema" ); + storeConfig.setSyncOnWrite( false ); - MojoDSConfig dsConfig = new MojoDSConfig( registries, msConf ); - MutablePartitionConfiguration mpConfig = new MutablePartitionConfiguration(); - mpConfig.setCacheSize( 1000 ); - BasicAttributes rootEntry = new BasicAttributes( "objectClass", "organizationalUnit", true ); - rootEntry.put( "ou", "schema" ); - mpConfig.setContextEntry( rootEntry ); + File workingDirectory = new File( outputDirectory, "schema" ); + storeConfig.setWorkingDirectory( workingDirectory ); // add the indices Set indexSet = new HashSet(); @@ -423,23 +413,15 @@ { indexSet.add( index ); } - - mpConfig.setIndexedAttributes( indexSet ); - try - { - mpConfig.setSuffix( "ou=schema" ); - } - catch ( NamingException e1 ) - { - e1.printStackTrace(); - throw new MojoFailureException( "Failed to setup parition configuration: " + e1.getMessage() ); - } - - mpConfig.setName( "schema" ); + storeConfig.setIndexedAttributes( indexSet ); + + BasicAttributes rootEntry = new BasicAttributes( "objectClass", "organizationalUnit", true ); + rootEntry.put( "ou", "schema" ); + storeConfig.setContextEntry( rootEntry ); try { - partition.init( dsConfig, mpConfig ); + store.init( storeConfig ); } catch ( NamingException e ) { @@ -515,26 +497,9 @@ } - private void listEntries() throws NamingException - { - LdapDN dn = new LdapDN( "ou=schema" ); - dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - ExprNode filter = new PresenceNode( registries.getOidRegistry().getOid( "objectClass" ) ); - SearchControls searchCtls = new SearchControls(); - searchCtls.setSearchScope( SearchControls.SUBTREE_SCOPE ); - - NamingEnumeration list = partition.search( dn, new HashMap(), filter, searchCtls ); - while ( list.hasMore() ) - { - SearchResult sr = ( SearchResult ) list.next(); - getLog().info( "Found entry " + sr.getName() ); - } - } - - private void checkCreateContainer( LdapDN dn ) throws NamingException { - if ( partition.hasEntry( dn ) ) + if ( hasEntry( dn ) ) { return; } @@ -543,7 +508,7 @@ entry.put( "objectClass", "top" ); entry.get( "objectClass" ).add( "organizationalUnit" ); entry.put( "ou", dn.getRdn().getValue() ); - partition.add( dn, entry ); + store.add( dn, entry ); } @@ -552,7 +517,7 @@ LdapDN dn = new LdapDN( "cn=" + schemaName + ",ou=schema" ); dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() ); - if ( partition.hasEntry( dn ) ) + if ( hasEntry( dn ) ) { return dn; } @@ -562,7 +527,7 @@ entry.get( "objectClass" ).add( "metaTop" ); entry.get( "objectClass" ).add( "metaSchema" ); entry.put( "cn", schemaName ); - partition.add( dn, entry ); + store.add( dn, entry ); return dn; } @@ -574,7 +539,7 @@ ModificationItem mod = new ModificationItem( DirContext.ADD_ATTRIBUTE, new LockableAttributeImpl( M_DISABLED_AT, "TRUE" ) ); ModificationItem[] mods = new ModificationItem[] { mod }; - partition.modify( dn, mods ); + store.modify( dn, mods ); } @@ -587,5 +552,16 @@ } return object.getOid(); + } + + + private final boolean hasEntry( LdapDN dn ) throws NamingException + { + BigInteger id = store.getEntryId( dn.toNormName() ); + if ( id == null ) + { + return false; + } + return true; } } Propchange: directory/branches/trunks/schema/apacheds/btree-base/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Dec 13 17:23:58 2006 @@ -0,0 +1,17 @@ +target +.clover +.wtpmodules +.settings +.deployables +apache.org +.metadata +*.md5 +*.log +*.iml +*.ipr +*.iws +.project +.classpath + +nbproject + Propchange: directory/branches/trunks/schema/apacheds/constants/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Dec 13 17:23:58 2006 @@ -0,0 +1,17 @@ +target +.clover +.wtpmodules +.settings +.deployables +apache.org +.metadata +*.md5 +*.log +*.iml +*.ipr +*.iws +.project +.classpath + +nbproject + Propchange: directory/branches/trunks/schema/apacheds/core/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Dec 13 17:23:58 2006 @@ -12,5 +12,4 @@ *.iws .project .classpath - nbproject Modified: directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java (original) +++ directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java Wed Dec 13 17:23:58 2006 @@ -205,14 +205,6 @@ typeName = "ProducerTypeEnum.SYNTAX_PRODUCER"; break; - case STATE_FACTORY_PRODUCER : - typeName = "ProducerTypeEnum.STATE_FACTORY_PRODUCER"; - break; - - case OBJECT_FACTORY_PRODUCER : - typeName = "ProducerTypeEnum.OBJECT_FACTORY_PRODUCER"; - break; - default: throw new IllegalStateException( "Unexpected producer: " + type.getName() ); } Modified: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java (original) +++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java Wed Dec 13 17:23:58 2006 @@ -76,13 +76,7 @@ NAME_FORM_PRODUCER( 9 ), /** value for DitStructureRule BootstrapProducers */ - DIT_STRUCTURE_RULE_PRODUCER( 10 ), - - /** value for StateFactory BootstrapProducers */ - STATE_FACTORY_PRODUCER( 11 ), - - /** value for ObjectFactory BootstrapProducers */ - OBJECT_FACTORY_PRODUCER( 12 ); + DIT_STRUCTURE_RULE_PRODUCER( 10 ); private int value; @@ -136,8 +130,6 @@ list.add(DIT_CONTENT_RULE_PRODUCER ); list.add(NAME_FORM_PRODUCER ); list.add(DIT_STRUCTURE_RULE_PRODUCER ); - list.add(STATE_FACTORY_PRODUCER ); - list.add(OBJECT_FACTORY_PRODUCER ); return list; } @@ -178,12 +170,6 @@ case DIT_STRUCTURE_RULE_PRODUCER : return "DitStructureRuleProducer"; - - case STATE_FACTORY_PRODUCER : - return "StateFactoryProducer"; - - case OBJECT_FACTORY_PRODUCER : - return "ObjectFactoryProducer"; default : return ""; Modified: directory/branches/trunks/schema/apacheds/core-unit/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-unit/pom.xml?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/core-unit/pom.xml (original) +++ directory/branches/trunks/schema/apacheds/core-unit/pom.xml Wed Dec 13 17:23:58 2006 @@ -35,7 +35,7 @@ org.apache.directory.server - apacheds-bootstrap-schema + apacheds-schema-extras ${pom.version} test Modified: directory/branches/trunks/schema/apacheds/core/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/pom.xml?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/core/pom.xml (original) +++ directory/branches/trunks/schema/apacheds/core/pom.xml Wed Dec 13 17:23:58 2006 @@ -26,55 +26,47 @@ provided - jdbm - jdbm + org.apache.directory.server + apacheds-schema-bootstrap + ${pom.version} + + + org.apache.directory.server + apacheds-schema-registries + ${pom.version} org.apache.directory.server apacheds-core-shared ${pom.version} + + org.apache.directory.server + apacheds-utils + ${pom.version} + + + org.apache.directory.server + apacheds-jdbm-store + ${pom.version} + + + org.apache.directory.server + apacheds-constants + ${pom.version} + + + org.apache.directory.server + apacheds-btree-base + ${pom.version} + + + org.apache.directory.server + apacheds-bootstrap-partition + ${pom.version} + - - - org.apache.directory.server - apacheds-core-plugin - - src/main/schema - - - apache - - system - - - - apachemeta - - system - - - - core - - system - - - - system - - - - - - - generate - - - - - src/main/resources Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=486923&r1=486922&r2=486923 ============================================================================== --- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original) +++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Wed Dec 13 17:23:58 2006 @@ -63,13 +63,10 @@ { private static final Logger log = LoggerFactory.getLogger( BTreePartition.class ); - /** - * the search engine used to search the database - */ + /** the search engine used to search the database */ private SearchEngine searchEngine = null; private Optimizer optimizer = new NoOpOptimizer(); - protected BTreePartitionConfiguration btpConfig; protected AttributeTypeRegistry attributeTypeRegistry = null; protected OidRegistry oidRegistry = null; @@ -94,7 +91,22 @@ * * @param registries the schema entity registries */ - public void setRegistries( Registries registries ) + public void initRegistries( Registries registries ) + { + initRegistries1( registries ); + } + + + /** + * This should be called second after initializing the optimizer with + * initOptimizer0. This is the same as calling initRegistries() + * (initRegistries actually calls initRegistries1) except it is protected + * to hide the '1' at the end of the method name. The '1' indicates it + * is the 2nd thing that must be executed during initialization. + * + * @param registries the schema entity registries + */ + protected void initRegistries1( Registries registries ) { attributeTypeRegistry = registries.getAttributeTypeRegistry(); oidRegistry = registries.getOidRegistry(); @@ -103,19 +115,17 @@ this.searchEngine = new DefaultSearchEngine( this, evaluator, enumerator, optimizer ); } - - public void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg ) - throws NamingException + + /** + * Use this method to initialize the indices. Only call this after + * the registries and the optimizer have been enabled. The '2' at the end + * shows this is the 3rd init method called in the init sequence. + * + * @param indices + * @throws NamingException + */ + protected void initIndices2(Set indices ) throws NamingException { - this.btpConfig = BTreePartitionConfiguration.convert( cfg ); - if ( this.btpConfig.isOptimizerEnabled() ) - { - optimizer = new DefaultOptimizer( this ); - } - - // Call this ONLY after trying to override the optimizer default above - setRegistries( factoryCfg.getRegistries() ); - Set sysOidSet = new HashSet(); sysOidSet.add( Oid.EXISTANCE ); sysOidSet.add( Oid.HIERARCHY ); @@ -128,7 +138,7 @@ // Used to calculate the system indices we must automatically add Set customAddedSystemIndices = new HashSet(); - for ( Iterator ii = cfg.getIndexedAttributes().iterator(); ii.hasNext(); /**/ ) + for ( Iterator ii = indices.iterator(); ii.hasNext(); /**/ ) { /* * NOTE @@ -299,15 +309,54 @@ } } } + } + + /** + * Called last (4th) to check if the suffix entry has been created on disk, + * and if not it is created. + * + * @param suffix + * @param entry + * @throws NamingException + */ + protected void initSuffixEntry3( String suffix, Attributes entry ) throws NamingException + { // add entry for context, if it does not exist Attributes suffixOnDisk = getSuffixEntry(); if ( suffixOnDisk == null ) { - LdapDN suffix = new LdapDN( cfg.getSuffix() ); - LdapDN normalizedSuffix = LdapDN.normalize( suffix, attributeTypeRegistry.getNormalizerMapping() ); - add( normalizedSuffix, cfg.getContextEntry() ); + LdapDN dn = new LdapDN( suffix ); + LdapDN normalizedSuffix = LdapDN.normalize( dn, attributeTypeRegistry.getNormalizerMapping() ); + add( normalizedSuffix, entry ); } + } + + + /** + * Call this first in the init sequence to initialize the optimizer. + * + * @param cfg + */ + protected void initOptimizer0( PartitionConfiguration cfg ) + { + if ( cfg instanceof BTreePartitionConfiguration ) + { + if ( ( ( BTreePartitionConfiguration ) cfg ).isOptimizerEnabled() ) + { + optimizer = new DefaultOptimizer( this ); + } + } + } + + + public void init( DirectoryServiceConfiguration factoryCfg, PartitionConfiguration cfg ) + throws NamingException + { + initOptimizer0( cfg ); + initRegistries1( factoryCfg.getRegistries() ); + initIndices2( cfg.getIndexedAttributes() ); + initSuffixEntry3( cfg.getSuffix(), cfg.getContextEntry() ); }