directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1164667 [1/6] - in /directory/apacheds/branches/one-sub-level-index-removal: ./ all/ core-annotations/ core-annotations/src/test/java/org/apache/directory/server/core/factory/ core-api/ core-api/src/main/java/org/apache/directory/server/co...
Date Fri, 02 Sep 2011 18:31:02 GMT
Author: seelmann
Date: Fri Sep  2 18:30:57 2011
New Revision: 1164667

URL: http://svn.apache.org/viewvc?rev=1164667&view=rev
Log:
Merge with trunk

Added:
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/
      - copied from r1164660, directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlNode.java
      - copied unchanged from r1164660, directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlNode.java
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java
      - copied unchanged from r1164660, directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java
      - copied unchanged from r1164660, directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/test/java/org/apache/directory/server/core/avltree/avl/
      - copied from r1164660, directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/avl/
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/test/java/org/apache/directory/server/core/avltree/avl/AvlTreePerfTest.java
      - copied unchanged from r1164660, directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/avl/AvlTreePerfTest.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/ActionRecordManager.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/ActionRecordManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/ActionContext.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ActionContext.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/ActionVersioning.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ActionVersioning.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/EntryIO.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/EntryIO.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/ExplicitList.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ExplicitList.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/LRUCache.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/LRUCache.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/BlockView.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/BlockView.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/FileHeader.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/FileHeader.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/SnapshotRecordManager.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/SnapshotRecordManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/btree/TestBTreeBrowser.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestBTreeBrowser.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/btree/TestSnapshotBTree.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestSnapshotBTree.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/btree/TestStreamCorrupted.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/btree/TestStreamCorrupted.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/helper/
      - copied from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/helper/
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/helper/TestActionVersioning.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/helper/TestActionVersioning.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/helper/TestVersionedCache.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/helper/TestVersionedCache.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/recman/BlockIoTest.java
      - copied unchanged from r1164660, directory/apacheds/trunk/jdbm/src/test/java/jdbm/recman/BlockIoTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
      - copied unchanged from r1164660, directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/IndexTest.java
      - copied unchanged from r1164660, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexTest.java
Modified:
    directory/apacheds/branches/one-sub-level-index-removal/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/all/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-annotations/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/ReferralHandlingMode.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/replication/
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
    directory/apacheds/branches/one-sub-level-index-removal/core-avl/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-constants/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-integ/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
    directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
    directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
    directory/apacheds/branches/one-sub-level-index-removal/core-jndi/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ControlEnum.java
    directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyConfiguration.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/replication/
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/branches/one-sub-level-index-removal/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java
    directory/apacheds/branches/one-sub-level-index-removal/http-integration/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/i18n/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/installers/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/pom.xml
    directory/apacheds/branches/one-sub-level-index-removal/installers/pom.xml
    directory/apacheds/branches/one-sub-level-index-removal/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/btree/BPage.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/btree/BTree.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/TupleBrowser.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/BaseRecordManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/BlockIo.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/DataPage.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/FreeLogicalRowIdPage.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/FreeLogicalRowIdPageManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/FreePhysicalRowIdPage.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/FreePhysicalRowIdPageManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/Location.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/LogicalRowIdManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/PageCursor.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/PageHeader.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/PageManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/PhysicalRowIdManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/Provider.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/RecordFile.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/TransactionManager.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/recman/TranslationPage.java
    directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/btree/StreamCorrupted.java
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/EncryptionType.java
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/test/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/VendorHelper.java
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredInfoDecoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-test/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
    directory/apacheds/branches/one-sub-level-index-removal/ldap-client-test/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/ldif-partition/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/branches/one-sub-level-index-removal/pom.xml
    directory/apacheds/branches/one-sub-level-index-removal/protocol-changepw/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dhcp/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordModifier.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/CanonicalNameRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/MailExchangeRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/NameServerRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/PointerRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/ServerSelectionRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/StartOfAuthorityRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/TextRecordEncoderTest.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-kerberos/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessageSerializer.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/SyncReplConsumer.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java
    directory/apacheds/branches/one-sub-level-index-removal/protocol-ntp/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/protocol-shared/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-annotations/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
    directory/apacheds/branches/one-sub-level-index-removal/server-config/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
    directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
    directory/apacheds/branches/one-sub-level-index-removal/server-jndi/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
    directory/apacheds/branches/one-sub-level-index-removal/server-replication/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/server-tools/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/service/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/service-builder/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
    directory/apacheds/branches/one-sub-level-index-removal/test-framework/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
    directory/apacheds/branches/one-sub-level-index-removal/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java
    directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/   (props changed)
    directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/   (props changed)

Propchange: directory/apacheds/branches/one-sub-level-index-removal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree:965203-965686
 /directory/apacheds/branches/milestones:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk:1067786-1067997

Propchange: directory/apacheds/branches/one-sub-level-index-removal/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
 /directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/all:1067786-1067997

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -2,7 +2,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core:982369-987590
 /directory/apacheds/branches/apacheds-config/core:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core:1160768-1164072
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
 /directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core:1067786-1067997

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -2,7 +2,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-annotations:982369-987590
 /directory/apacheds/branches/apacheds-config/core-annotations:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core-annotations:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-annotations:1067786-1067997

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java Fri Sep  2 18:30:57 2011
@@ -34,7 +34,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.annotations.CreatePartition;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.junit.Test;
 
 
@@ -116,7 +115,6 @@ public class DirectoryServiceAnnotationT
             {
                 assertTrue( partition.isInitialized() );
                 assertEquals( "dc=example,dc=com", partition.getSuffixDn().getName() );
-                assertTrue( partition instanceof JdbmPartition );
             }
             else if ( "schema".equalsIgnoreCase( partition.getId() ) )
             {

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,7 +1,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-api:982369-987590
 /directory/apacheds/branches/apacheds-config/core-api:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core-api:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
 /directory/apacheds/branches/milestones/core-api:1072812-1075328
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-api:1067786-1067997

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Fri Sep  2 18:30:57 2011
@@ -35,7 +35,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.journal.Journal;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.replication.ReplicationConfiguration;
 import org.apache.directory.server.core.schema.SchemaPartition;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.csn.Csn;
@@ -488,20 +487,6 @@ public interface DirectoryService extend
 
 
     /**
-     * Sets the replication configuration in the server.
-     *
-     * @param replicationConfiguration the replication configuration to be used in the server.
-     */
-    void setReplicationConfiguration( ReplicationConfiguration replicationConfig );
-    
-    
-    /**
-     * @return the replication configuration for this DirectoryService
-     */
-    ReplicationConfiguration getReplicationConfiguration();
-    
-    
-    /**
      * Associates a SchemaManager to the service
      * 
      * @param schemaManager The SchemaManager to associate

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/ReferralHandlingMode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/ReferralHandlingMode.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/ReferralHandlingMode.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/ReferralHandlingMode.java Fri Sep  2 18:30:57 2011
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
 import javax.naming.Context;
 
 import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.util.Strings;
 
 
 /**
@@ -79,7 +80,7 @@ public enum ReferralHandlingMode
      */
     public static final ReferralHandlingMode getModeFromJndi( String jndiValue )
     {
-        jndiValue = jndiValue.trim().toLowerCase();
+        jndiValue = Strings.toLowerCase( Strings.trim( jndiValue ) );
         
         if ( jndiValue.equals( "throw" ) )
         {

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Fri Sep  2 18:30:57 2011
@@ -160,7 +160,7 @@ public class TestServerEntryUtils
             {
                 if ( value.isHumanReadable() )
                 {
-                    return new StringValue( value.getString().toLowerCase() );
+                    return new StringValue( Strings.toLowerCase( value.getString() ) );
                 }
 
                 throw new IllegalStateException( I18n.err( I18n.ERR_473 ) );
@@ -169,7 +169,7 @@ public class TestServerEntryUtils
             
             public String normalize( String value ) throws LdapException
             {
-                return value.toLowerCase();
+                return Strings.toLowerCase( value );
             }
         };
         

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Fri Sep  2 18:30:57 2011
@@ -66,6 +66,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.NumericOidSyntaxChecker;
 import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory;
 import org.apache.directory.shared.util.DateUtils;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -233,7 +234,7 @@ public class SchemaPartitionDaoImpl impl
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( Strings.toLowerCase( oid ) ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -285,7 +286,7 @@ public class SchemaPartitionDaoImpl impl
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( Strings.toLowerCase( oid ) ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -337,7 +338,7 @@ public class SchemaPartitionDaoImpl impl
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( Strings.toLowerCase( oid ) ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -389,7 +390,7 @@ public class SchemaPartitionDaoImpl impl
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( Strings.toLowerCase( oid ) ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -441,7 +442,7 @@ public class SchemaPartitionDaoImpl impl
         }
         else
         {
-            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( oid.toLowerCase() ) ) );
+            filter.addNode( new EqualityNode<String>( M_NAME_AT, new StringValue( Strings.toLowerCase( oid ) ) ) );
         }
 
         SearchControls searchControls = new SearchControls();
@@ -519,9 +520,9 @@ public class SchemaPartitionDaoImpl impl
     {
         BranchNode filter = new OrNode();
         SimpleNode<String> nameAVA = new EqualityNode<String>( M_NAME_AT,
-            new StringValue( entityName.toLowerCase() ) );
+            new StringValue( Strings.toLowerCase( entityName ) ) );
         SimpleNode<String> oidAVA = new EqualityNode<String>( M_OID_AT,
-            new StringValue( entityName.toLowerCase() ) );
+            new StringValue( Strings.toLowerCase( entityName ) ) );
         filter.addNode( nameAVA );
         filter.addNode( oidAVA );
         SearchControls searchControls = new SearchControls();
@@ -610,12 +611,12 @@ public class SchemaPartitionDaoImpl impl
         // subfilter for (| (objectClass=metaMatchingRule) (objectClass=metaAttributeType))
         BranchNode or = new OrNode();
         or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT,
-            new StringValue( MetaSchemaConstants.META_MATCHING_RULE_OC.toLowerCase() ) ) );
+            new StringValue( Strings.toLowerCase( MetaSchemaConstants.META_MATCHING_RULE_OC ) ) ) );
         or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT,
-            new StringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+            new StringValue( Strings.toLowerCase( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC ) ) ) );
 
         filter.addNode( or );
-        filter.addNode( new EqualityNode<String>( M_SYNTAX_AT, new StringValue( numericOid.toLowerCase() ) ) );
+        filter.addNode( new EqualityNode<String>( M_SYNTAX_AT, new StringValue( Strings.toLowerCase( numericOid ) ) ) );
 
         SearchControls searchControls = new SearchControls();
         searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -656,7 +657,7 @@ public class SchemaPartitionDaoImpl impl
 
         // ( objectClass = metaAttributeType )
         filter.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
-            MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+            Strings.toLowerCase( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC ) ) ) );
 
         BranchNode or = new OrNode();
         or.addNode( new EqualityNode<String>( M_ORDERING_AT, new StringValue( mr.getOid() ) ) );
@@ -670,9 +671,9 @@ public class SchemaPartitionDaoImpl impl
         {
             for ( String name : names )
             {
-                or.addNode( new EqualityNode<String>( M_ORDERING_AT, new StringValue( name.toLowerCase() ) ) );
-                or.addNode( new EqualityNode<String>( M_SUBSTRING_AT, new StringValue( name.toLowerCase() ) ) );
-                or.addNode( new EqualityNode<String>( M_EQUALITY_AT, new StringValue( name.toLowerCase() ) ) );
+                or.addNode( new EqualityNode<String>( M_ORDERING_AT, new StringValue( Strings.toLowerCase( name ) ) ) );
+                or.addNode( new EqualityNode<String>( M_SUBSTRING_AT, new StringValue( Strings.toLowerCase( name ) ) ) );
+                or.addNode( new EqualityNode<String>( M_EQUALITY_AT, new StringValue( Strings.toLowerCase( name ) ) ) );
             }
         }
 
@@ -755,9 +756,9 @@ public class SchemaPartitionDaoImpl impl
         // ( objectClass = metaAttributeType )
         BranchNode or = new OrNode();
         or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT,
-            new StringValue( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC.toLowerCase() ) ) );
+            new StringValue( Strings.toLowerCase( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC ) ) ) );
         or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT,
-            new StringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC.toLowerCase() ) ) );
+            new StringValue( Strings.toLowerCase( MetaSchemaConstants.META_OBJECT_CLASS_OC ) ) ) );
         filter.addNode( or );
 
         or = new OrNode();
@@ -810,9 +811,9 @@ public class SchemaPartitionDaoImpl impl
         BranchNode filter = new AndNode();
 
         filter.addNode( new EqualityNode<String>( OBJECT_CLASS_AT,
-            new StringValue( MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
+            new StringValue( Strings.toLowerCase( MetaSchemaConstants.META_SCHEMA_OC ) ) ) );
         filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_AT,
-            new StringValue( schemaName.toLowerCase() ) ) );
+            new StringValue( Strings.toLowerCase( schemaName ) ) ) );
 
         SearchControls searchControls = new SearchControls();
         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -852,9 +853,9 @@ public class SchemaPartitionDaoImpl impl
         BranchNode filter = new AndNode();
 
         filter.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
-            MetaSchemaConstants.META_SCHEMA_OC.toLowerCase() ) ) );
+            Strings.toLowerCase( MetaSchemaConstants.META_SCHEMA_OC ) ) ) );
         filter.addNode( new EqualityNode<String>( M_DEPENDENCIES_AT, new StringValue(
-            schemaName.toLowerCase() ) ) );
+            Strings.toLowerCase( schemaName ) ) ) );
 
         SearchControls searchControls = new SearchControls();
         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -928,12 +929,12 @@ public class SchemaPartitionDaoImpl impl
         BranchNode filter = new AndNode();
 
         BranchNode or = new OrNode();
-        or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue( MetaSchemaConstants.META_NAME_FORM_OC
-            .toLowerCase() ) ) );
-        or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue( MetaSchemaConstants.META_OBJECT_CLASS_OC
-            .toLowerCase() ) ) );
+        or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue( 
+            Strings.toLowerCase( MetaSchemaConstants.META_NAME_FORM_OC ) ) ) );
+        or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue( 
+            Strings.toLowerCase( MetaSchemaConstants.META_OBJECT_CLASS_OC ) ) ) );
         or.addNode( new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
-            MetaSchemaConstants.META_DIT_CONTENT_RULE_OC.toLowerCase() ) ) );
+            Strings.toLowerCase( MetaSchemaConstants.META_DIT_CONTENT_RULE_OC ) ) ) );
         filter.addNode( or );
 
         or = new OrNode();

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Fri Sep  2 18:30:57 2011
@@ -48,6 +48,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.registries.ObjectClassRegistry;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,17 +106,17 @@ public class RegistrySynchronizerAdaptor
 
     static 
     {
-        VALID_OU_VALUES.add( SchemaConstants.NORMALIZERS_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.COMPARATORS_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.SYNTAX_CHECKERS_AT.toLowerCase() );
-        VALID_OU_VALUES.add( "syntaxes".toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULES_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULE_USE_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.ATTRIBUTE_TYPES_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.OBJECT_CLASSES_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.NAME_FORMS_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.DIT_CONTENT_RULES_AT.toLowerCase() );
-        VALID_OU_VALUES.add( SchemaConstants.DIT_STRUCTURE_RULES_AT.toLowerCase() );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.NORMALIZERS_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.COMPARATORS_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.SYNTAX_CHECKERS_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( "syntaxes" ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.MATCHING_RULES_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.MATCHING_RULE_USE_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.OBJECT_CLASSES_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.NAME_FORMS_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.DIT_CONTENT_RULES_AT ) );
+        VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
     }
 
 
@@ -197,7 +198,7 @@ public class RegistrySynchronizerAdaptor
             }
             
             String ouValue = addContext.getDn().getRdn().getNormValue().getString();
-            ouValue = ouValue.trim().toLowerCase();
+            ouValue = Strings.toLowerCase( Strings.trim( ouValue ) );
             
             if ( ! VALID_OU_VALUES.contains( ouValue ) )
             {
@@ -253,7 +254,7 @@ public class RegistrySynchronizerAdaptor
             }
             
             String ouValue = deleteContext.getDn().getRdn().getNormValue().getString();
-            ouValue = ouValue.trim().toLowerCase();
+            ouValue = Strings.toLowerCase( Strings.trim( ouValue ) );
             
             if ( ! VALID_OU_VALUES.contains( ouValue ) )
             {

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Fri Sep  2 18:30:57 2011
@@ -588,7 +588,7 @@ public class SchemaSynchronizer implemen
             {
                 String dependency = value.getString();
 
-                if ( schemaManager.getLoadedSchema( Strings.toLowerCase(dependency) ) == null )
+                if ( schemaManager.getLoadedSchema( Strings.toLowerCase( dependency ) ) == null )
                 {
                     throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
                         I18n.err( I18n.ERR_385, dependency ) );

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Fri Sep  2 18:30:57 2011
@@ -38,7 +38,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.journal.Journal;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.replication.ReplicationConfiguration;
 import org.apache.directory.server.core.schema.SchemaPartition;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.csn.Csn;
@@ -459,15 +458,6 @@ public class MockDirectoryService implem
     {
     }
 
-    public void setReplicationConfiguration( ReplicationConfiguration replicationConfig )
-    {
-    }
-
-    public ReplicationConfiguration getReplicationConfiguration()
-    {
-        return null;
-    }
-
     public String getContextCsn()
     {
         return null;

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,7 +1,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-avl:982369-987590
 /directory/apacheds/branches/apacheds-config/core-avl:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core-avl:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
 /directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-avl:1067786-1067997

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,7 +1,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-constants:982369-987590
 /directory/apacheds/branches/apacheds-config/core-constants:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core-constants:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
 /directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-constants:1067786-1067997

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,7 +1,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-integ:982369-987590
 /directory/apacheds/branches/apacheds-config/core-integ:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core-integ:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
 /directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-integ:1067786-1067997

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,6 +1,7 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:982369-987590
 /directory/apacheds/branches/apacheds-config/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1040956-1043765
 /directory/apacheds/branches/apacheds-replication/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:806623-896441
@@ -8,5 +9,5 @@
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Fri Sep  2 18:30:57 2011
@@ -46,6 +46,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.model.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
+import org.bouncycastle.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -116,7 +117,7 @@ public class UniqueMemberIT extends Abst
                 
                 while ( values.hasMoreElements() )
                 {
-                    String value = ( (String)values.nextElement() ).toLowerCase();
+                    String value = Strings.toLowerCase( ( (String)values.nextElement() ) );
                     assertTrue( expectedValues.contains( value ) );
                     expectedValues.remove( value );
                 }
@@ -188,7 +189,7 @@ public class UniqueMemberIT extends Abst
                 
                 while ( values.hasMoreElements() )
                 {
-                    String value = ( (String)values.nextElement() ).toLowerCase();
+                    String value = Strings.toLowerCase( ( (String)values.nextElement() ) );
                     assertTrue( expectedValues.contains( value ) );
                     expectedValues.remove( value );
                 }
@@ -312,7 +313,7 @@ public class UniqueMemberIT extends Abst
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
-            map.put( result.getName().toLowerCase(), result.getAttributes() );
+            map.put( Strings.toLowerCase( result.getName() ), result.getAttributes() );
         }
 
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
@@ -364,7 +365,7 @@ public class UniqueMemberIT extends Abst
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
-            map.put( result.getName().toLowerCase(), result.getAttributes() );
+            map.put( Strings.toLowerCase( result.getName() ), result.getAttributes() );
         }
 
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
@@ -455,7 +456,7 @@ public class UniqueMemberIT extends Abst
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
-            map.put( result.getName().toLowerCase(), result.getAttributes() );
+            map.put( Strings.toLowerCase( result.getName() ), result.getAttributes() );
         }
 
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java Fri Sep  2 18:30:57 2011
@@ -71,7 +71,7 @@ public class RenamePerfIT extends Abstra
     {
         LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
-        String oldDn ="cn=test0,ou=system";
+        String oldDn ="cn=test,ou=system";
 
         Dn dn = new Dn( oldDn );
         Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java Fri Sep  2 18:30:57 2011
@@ -57,7 +57,7 @@ public abstract class AbstractMetaSchema
         for ( Rdn rdn : dn )
         {
             sb.append( '/' );
-            sb.append( Strings.toLowerCase(rdn.getName()) );
+            sb.append( Strings.toLowerCase( rdn.getName() ) );
         }
 
         sb.append( ".ldif" );

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,7 +1,8 @@
 /directory/apacheds/branches/apacheds-codec-merge/core-jndi:982369-987590
 /directory/apacheds/branches/apacheds-config/core-jndi:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
+/directory/apacheds/branches/apacheds-jdbm/core-jndi:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1164660
 /directory/studio/trunk/core-jndi:1067786-1067997

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ControlEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ControlEnum.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ControlEnum.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ControlEnum.java Fri Sep  2 18:30:57 2011
@@ -36,7 +36,6 @@ public enum ControlEnum
     PERSISTENT_SEARCH_CONTROL, 
     SUBENTRIES_CONTROL, 
     SYNC_INFO_VALUE_CONTROL, 
-    SYNC_MODIFY_DN_CONTROL, 
     SYNC_REQUEST_VALUE_CONTROL, 
     SYNC_STATE_VALUE_CONTROL
 }

Modified: directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Fri Sep  2 18:30:57 2011
@@ -81,7 +81,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn;
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
@@ -90,7 +89,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyResponseImpl;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator;
 import org.apache.directory.shared.ldap.model.constants.JndiPropertyConstants;
@@ -184,7 +182,6 @@ public abstract class ServerContext impl
         ADS_CONTROLS.put( Subentries.OID, ControlEnum.SUBENTRIES_CONTROL );
         ADS_CONTROLS.put( SyncDoneValue.OID, ControlEnum.SYNC_DONE_VALUE_CONTROL );
         ADS_CONTROLS.put( SyncInfoValue.OID, ControlEnum.SYNC_INFO_VALUE_CONTROL );
-        ADS_CONTROLS.put( SyncModifyDn.OID, ControlEnum.SYNC_MODIFY_DN_CONTROL );
         ADS_CONTROLS.put( SyncRequestValue.OID, ControlEnum.SYNC_REQUEST_VALUE_CONTROL );
         ADS_CONTROLS.put( SyncStateValue.OID, ControlEnum.SYNC_STATE_VALUE_CONTROL );
     }
@@ -437,11 +434,6 @@ public abstract class ServerContext impl
 
                 break;
 
-            case SYNC_MODIFY_DN_CONTROL:
-                control = new SyncModifyDnDecorator( getDirectoryService().getLdapCodecService() );
-
-                break;
-
             case SYNC_REQUEST_VALUE_CONTROL:
                 control = new SyncRequestValueDecorator( getDirectoryService().getLdapCodecService() );
 

Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Sep  2 18:30:57 2011
@@ -72,7 +72,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.referral.ReferralInterceptor;
-import org.apache.directory.server.core.replication.ReplicationConfiguration;
 import org.apache.directory.server.core.schema.SchemaInterceptor;
 import org.apache.directory.server.core.schema.SchemaPartition;
 import org.apache.directory.server.core.security.TlsKeyGenerator;
@@ -169,9 +168,6 @@ public class DefaultDirectoryService imp
     /** The directory instance replication ID */
     private int replicaId;
 
-    /** The replication configuration structure */
-    private ReplicationConfiguration replicationConfig;
-
     /** remove me after implementation is completed */
     private static final String PARTIAL_IMPL_WARNING =
             "WARNING: the changelog is only partially operational and will revert\n" +
@@ -988,7 +984,9 @@ public class DefaultDirectoryService imp
         // load the last stored valid CSN value
         LookupOperationContext loc = new LookupOperationContext( getAdminSession() );
         loc.setDn( systemPartition.getSuffixDn() );
-        loc.setAttrsId( new String[]{ SchemaConstants.CONTEXT_CSN_AT } );
+        
+        // get back all the attributes
+        loc.setAttrsId( SchemaConstants.ALL_ATTRIBUTES_ARRAY );
         Entry entry = systemPartition.lookup( loc );
 
         Attribute cntextCsnAt = entry.get( SchemaConstants.CONTEXT_CSN_AT );
@@ -1791,22 +1789,6 @@ public class DefaultDirectoryService imp
     }
 
 
-    public void setReplicationConfiguration( ReplicationConfiguration replicationConfig )
-    {
-        this.replicationConfig = replicationConfig;
-
-    }
-
-
-    /**
-     * @return the replication configuration for this DirectoryService
-     */
-    public ReplicationConfiguration getReplicationConfiguration()
-    {
-        return replicationConfig;
-    }
-
-
     /**
      * {@inheritDoc}
      */

Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Fri Sep  2 18:30:57 2011
@@ -113,21 +113,21 @@ public class AdministrativePointIntercep
     // Initialize the ROLES field
     static
     {
-        ROLES.add( SchemaConstants.AUTONOMOUS_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.AUTONOMOUS_AREA ) );
         ROLES.add( SchemaConstants.AUTONOMOUS_AREA_OID );
-        ROLES.add( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA ) );
         ROLES.add( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA_OID );
-        ROLES.add( SchemaConstants.ACCESS_CONTROL_INNER_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.ACCESS_CONTROL_INNER_AREA ) );
         ROLES.add( SchemaConstants.ACCESS_CONTROL_INNER_AREA_OID );
-        ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA ) );
         ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA_OID );
-        ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA ) );
         ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA_OID );
-        ROLES.add( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA ) );
         ROLES.add( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA_OID );
-        ROLES.add( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA ) );
         ROLES.add( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA_OID );
-        ROLES.add( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA.toLowerCase() );
+        ROLES.add( Strings.toLowerCase( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA ) );
         ROLES.add( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA_OID );
     }
 
@@ -137,20 +137,20 @@ public class AdministrativePointIntercep
     // Initialize the roles/oid map
     static
     {
-        ROLES_OID.put( SchemaConstants.AUTONOMOUS_AREA.toLowerCase(), SchemaConstants.AUTONOMOUS_AREA_OID );
-        ROLES_OID.put( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.AUTONOMOUS_AREA ), SchemaConstants.AUTONOMOUS_AREA_OID );
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA ),
             SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA_OID );
-        ROLES_OID.put( SchemaConstants.ACCESS_CONTROL_INNER_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.ACCESS_CONTROL_INNER_AREA ),
             SchemaConstants.ACCESS_CONTROL_INNER_AREA_OID );
-        ROLES_OID.put( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA ),
             SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA_OID );
-        ROLES_OID.put( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA ),
             SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA_OID );
-        ROLES_OID.put( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA ),
             SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA_OID );
-        ROLES_OID.put( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA ),
             SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA_OID );
-        ROLES_OID.put( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA.toLowerCase(),
+        ROLES_OID.put( Strings.toLowerCase( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA ),
             SchemaConstants.TRIGGER_EXECUTION_INNER_AREA_OID );
     }
 
@@ -159,11 +159,11 @@ public class AdministrativePointIntercep
 
     static
     {
-        INNER_AREA_ROLES.add( SchemaConstants.ACCESS_CONTROL_INNER_AREA.toLowerCase() );
+        INNER_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.ACCESS_CONTROL_INNER_AREA ) );
         INNER_AREA_ROLES.add( SchemaConstants.ACCESS_CONTROL_INNER_AREA_OID );
-        INNER_AREA_ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA.toLowerCase() );
+        INNER_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA ) );
         INNER_AREA_ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_INNER_AREA_OID );
-        INNER_AREA_ROLES.add( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA.toLowerCase() );
+        INNER_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA ) );
         INNER_AREA_ROLES.add( SchemaConstants.TRIGGER_EXECUTION_INNER_AREA_OID );
     }
 
@@ -172,13 +172,13 @@ public class AdministrativePointIntercep
 
     static
     {
-        SPECIFIC_AREA_ROLES.add( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA.toLowerCase() );
+        SPECIFIC_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA ) );
         SPECIFIC_AREA_ROLES.add( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA_OID );
-        SPECIFIC_AREA_ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA.toLowerCase() );
+        SPECIFIC_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA ) );
         SPECIFIC_AREA_ROLES.add( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA_OID );
-        SPECIFIC_AREA_ROLES.add( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA.toLowerCase() );
+        SPECIFIC_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA ) );
         SPECIFIC_AREA_ROLES.add( SchemaConstants.SUB_SCHEMA_ADMIN_SPECIFIC_AREA_OID );
-        SPECIFIC_AREA_ROLES.add( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA.toLowerCase() );
+        SPECIFIC_AREA_ROLES.add( Strings.toLowerCase( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA ) );
         SPECIFIC_AREA_ROLES.add( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA_OID );
     }
 
@@ -603,7 +603,7 @@ public class AdministrativePointIntercep
      */
     private void checkAddRole( Value<?> role, Attribute adminPoint, Dn dn ) throws LdapException
     {
-        String roleStr = Strings.toLowerCase(Strings.trim(role.getString()));
+        String roleStr = Strings.toLowerCase( Strings.trim( role.getString() ) );
 
         // Check that the added AdministrativeRole is valid
         if ( !ROLES.contains( roleStr ) )
@@ -658,7 +658,7 @@ public class AdministrativePointIntercep
      */
     private void checkDelRole( Value<?> role, Attribute adminPoint, Dn dn ) throws LdapException
     {
-        String roleStr = Strings.toLowerCase(Strings.trim(role.getString()));
+        String roleStr = Strings.toLowerCase( Strings.trim( role.getString() ) );
 
         // Check that the removed AdministrativeRole is valid
         if ( !ROLES.contains( roleStr ) )
@@ -802,7 +802,7 @@ public class AdministrativePointIntercep
      */
     private boolean isValidRole( String role )
     {
-        return ROLES.contains( Strings.toLowerCase(Strings.trim(role)) );
+        return ROLES.contains( Strings.toLowerCase( Strings.trim( role ) ) );
     }
 
 

Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java Fri Sep  2 18:30:57 2011
@@ -101,7 +101,7 @@ public class PasswordUtil
                     return null;
                 }
 
-                String algorithm = new String( credentials, 1, pos - 1 ).toLowerCase();
+                String algorithm = Strings.toLowerCase( new String( credentials, 1, pos - 1 ) );
 
                 return LdapSecurityConstants.getAlgorithm( algorithm );
             }

Propchange: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 18:30:57 2011
@@ -1,12 +1,13 @@
 /directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:982369-987590
 /directory/apacheds/branches/apacheds-config/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:980138-980934
+/directory/apacheds/branches/apacheds-jdbm/core/src/main/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyConfiguration.java:1160768-1164072
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1040956-1043765
 /directory/apacheds/branches/apacheds-replication/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
 /directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347
-/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyConfiguration.java:1158399-1161268
+/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyConfiguration.java:1158399-1164660
 /directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072800-1075329
 /directory/studio/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1067786-1067997

Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Fri Sep  2 18:30:57 2011
@@ -568,7 +568,7 @@ public class DefaultPartitionNexus exten
             Entry retval = new ClonedServerEntry( rootDSE );
             Set<AttributeType> attributeTypes = rootDSE.getAttributeTypes();
 
-            if ( lookupContext.getAttrsId() != null && !lookupContext.getAttrsId().isEmpty() )
+            if ( ( lookupContext.getAttrsId() != null ) && !lookupContext.getAttrsId().isEmpty() )
             {
                 for ( AttributeType attributeType : attributeTypes )
                 {

Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Fri Sep  2 18:30:57 2011
@@ -313,7 +313,7 @@ public class ReferralInterceptor extends
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
     {
         // Check if the entry is a referral itself
-        boolean isReferral = isReferral( moveAndRenameContext.getEntry() );
+        boolean isReferral = isReferral( moveAndRenameContext.getOriginalEntry() );
 
         next.moveAndRename( moveAndRenameContext );
 
@@ -325,7 +325,7 @@ public class ReferralInterceptor extends
             referralManager.lockWrite();
 
             referralManager.addReferral( newEntry );
-            referralManager.removeReferral( moveAndRenameContext.getEntry() );
+            referralManager.removeReferral( moveAndRenameContext.getOriginalEntry() );
 
             referralManager.unlock();
         }
@@ -338,7 +338,7 @@ public class ReferralInterceptor extends
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
     {
         // Check if the entry is a referral itself
-        boolean isReferral = isReferral( renameContext.getEntry() );
+        boolean isReferral = isReferral( renameContext.getOriginalEntry() );
 
         next.rename( renameContext );
 

Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1164667&r1=1164666&r2=1164667&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Fri Sep  2 18:30:57 2011
@@ -94,6 +94,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
+import org.bouncycastle.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -889,7 +890,7 @@ public class SchemaInterceptor extends B
 
             if ( !ocName.equalsIgnoreCase( SchemaConstants.TOP_OC ) )
             {
-                String ocLowerName = ocName.toLowerCase();
+                String ocLowerName = Strings.toLowerCase( ocName );
 
                 ObjectClass objectClass = schemaManager.lookupObjectClassRegistry( ocLowerName );
 
@@ -905,7 +906,7 @@ public class SchemaInterceptor extends B
                 {
                     for ( ObjectClass oc : ocSuperiors )
                     {
-                        if ( !objectClasses.contains( oc.getName().toLowerCase() ) )
+                        if ( !objectClasses.contains( Strings.toLowerCase( oc.getName() ) ) )
                         {
                             objectClasses.add( oc.getName() );
                             objectClassesUP.add( oc.getName() );



Mime
View raw message