You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2011/10/09 19:03:58 UTC
svn commit: r1180652 [1/6] - in
/directory/apacheds/branches/one-sub-level-index-removal: ./ all/
benchmarks/ core-annotations/
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-api/ core-api/src/main/java/org/apache/directo...
Author: seelmann
Date: Sun Oct 9 17:03:52 2011
New Revision: 1180652
URL: http://svn.apache.org/viewvc?rev=1180652&view=rev
Log:
Merge from trunk
Added:
directory/apacheds/branches/one-sub-level-index-removal/http-directory-bridge/src/site/
- copied from r1180497, directory/apacheds/trunk/http-directory-bridge/src/site/
directory/apacheds/branches/one-sub-level-index-removal/http-directory-bridge/src/site/site.xml
- copied unchanged from r1180497, directory/apacheds/trunk/http-directory-bridge/src/site/site.xml
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/resources/
- copied from r1180637, directory/apacheds/trunk/jdbm/src/test/resources/
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/resources/log4j.properties
- copied unchanged from r1180637, directory/apacheds/trunk/jdbm/src/test/resources/log4j.properties
directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/site/
- copied from r1180497, directory/apacheds/trunk/kerberos-codec/src/site/
directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/src/site/site.xml
- copied unchanged from r1180497, directory/apacheds/trunk/kerberos-codec/src/site/site.xml
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/
- copied from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/BindIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/BindIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java
- copied unchanged from r1180497, directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java
directory/apacheds/branches/one-sub-level-index-removal/service-builder/src/site/
- copied from r1180497, directory/apacheds/trunk/service-builder/src/site/
directory/apacheds/branches/one-sub-level-index-removal/service-builder/src/site/site.xml
- copied unchanged from r1180497, directory/apacheds/trunk/service-builder/src/site/site.xml
directory/apacheds/branches/one-sub-level-index-removal/service/src/site/
- copied from r1180497, directory/apacheds/trunk/service/src/site/
directory/apacheds/branches/one-sub-level-index-removal/service/src/site/site.xml
- copied unchanged from r1180497, directory/apacheds/trunk/service/src/site/site.xml
directory/apacheds/branches/one-sub-level-index-removal/wrapper/src/site/
- copied from r1180497, directory/apacheds/trunk/wrapper/src/site/
directory/apacheds/branches/one-sub-level-index-removal/wrapper/src/site/site.xml
- copied unchanged from r1180497, directory/apacheds/trunk/wrapper/src/site/site.xml
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/
- copied from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/InvalidLogException.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/InvalidLogException.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/Log.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/Log.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/LogAnchor.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/LogAnchor.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/LogAnchorComparator.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/LogAnchorComparator.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/LogScanner.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/LogScanner.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/UserLogRecord.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/UserLogRecord.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/
- copied from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/DefaultLogFileManager.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/DefaultLogFileManager.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/DefaultLogScanner.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/DefaultLogScanner.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFileManager.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFileManager.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFileRecords.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFileRecords.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogManager.java
- copied unchanged from r1180497, directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogManager.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/all/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/benchmarks/pom.xml
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/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
directory/apacheds/branches/one-sub-level-index-removal/core-api/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/core-api/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/AbstractLayout.java
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/entry/ClonedServerEntry.java
directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/resources/log4j.properties
directory/apacheds/branches/one-sub-level-index-removal/core-avl/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/core-avl/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
directory/apacheds/branches/one-sub-level-index-removal/core-constants/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/core-constants/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/core-integ/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/core-integ/pom.xml
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/resources/AliasSearchIT.ldif
directory/apacheds/branches/one-sub-level-index-removal/core-jndi/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/core-jndi/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
directory/apacheds/branches/one-sub-level-index-removal/core/pom.xml
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/authn/AuthenticationInterceptor.java
directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.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/authz/AciAuthorizationInterceptor.java
directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
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/schema/SchemaInterceptor.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/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
directory/apacheds/branches/one-sub-level-index-removal/http-directory-bridge/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/http-integration/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/http-integration/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/i18n/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/i18n/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
directory/apacheds/branches/one-sub-level-index-removal/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
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-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control
directory/apacheds/branches/one-sub-level-index-removal/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
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/interceptor-kerberos/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
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/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/EntrySerializer.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/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.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/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/examples/FamousPeople.java
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/examples/FruitBasket.java
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/examples/Primes.java
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/ActionContext.java
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/ActionVersioning.java
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/ExplicitList.java
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/main/java/jdbm/helper/LRUCache.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/CacheRecordManager.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/SnapshotRecordManager.java
directory/apacheds/branches/one-sub-level-index-removal/jdbm/src/test/java/jdbm/btree/TestSnapshotBTree.java
directory/apacheds/branches/one-sub-level-index-removal/kerberos-codec/pom.xml
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/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-test/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/kerberos-test/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/kerberos-test/src/test/resources/org/apache/directory/server/kerberos/kdc/KerberosIT.ldif
directory/apacheds/branches/one-sub-level-index-removal/ldap-client-test/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/ldap-client-test/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/ldif-partition/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/ldif-partition/pom.xml
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/ldif-partition/src/main/resources/ads-2.ldif
directory/apacheds/branches/one-sub-level-index-removal/ldif-partition/src/main/resources/sample-config.ldif
directory/apacheds/branches/one-sub-level-index-removal/osgi/pom.xml
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-changepw/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/protocol-dhcp/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/protocol-dhcp/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/protocol-dns/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/protocol-kerberos/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/protocol-kerberos/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java
directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/branches/one-sub-level-index-removal/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.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/consumer/ReplicationConsumerImpl.java (contents, props changed)
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-ntp/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/protocol-shared/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/protocol-shared/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/server-annotations/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/server-annotations/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/server-config/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/server-config/pom.xml
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/java/org/apache/directory/server/config/LdifConfigExtractor.java
directory/apacheds/branches/one-sub-level-index-removal/server-config/src/main/java/org/apache/directory/server/config/ReadOnlyConfigurationPartition.java
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-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/server-integ/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.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/schema/SchemaIT.java
directory/apacheds/branches/one-sub-level-index-removal/server-jndi/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/server-jndi/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/server-replication/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/server-replication/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/server-tools/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/server-tools/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/server-tools/src/main/resources/config/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=launchdiagnosticuihandler.ldif
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/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/service/ApacheDS.launch
directory/apacheds/branches/one-sub-level-index-removal/service/apacheds.bat
directory/apacheds/branches/one-sub-level-index-removal/service/apacheds.sh
directory/apacheds/branches/one-sub-level-index-removal/service/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/service/src/main/java/org/apache/directory/server/ApacheDsService.java
directory/apacheds/branches/one-sub-level-index-removal/syncrepl/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/test-framework/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/test-framework/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/test-framework/src/test/resources/test-entry.ldif
directory/apacheds/branches/one-sub-level-index-removal/wrapper/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/pom.xml
directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/ (props changed)
directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/pom.xml
Propchange: directory/apacheds/branches/one-sub-level-index-removal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 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-1164660
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk:1067786-1067997
Propchange: directory/apacheds/branches/one-sub-level-index-removal/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 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-1164660
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/all:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/all/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/all/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/all/pom.xml Sun Oct 9 17:03:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-all</artifactId>
@@ -169,8 +169,6 @@
<goal>shade</goal>
</goals>
<configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>app</shadedClassifierName>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<filters>
<filter>
Modified: directory/apacheds/branches/one-sub-level-index-removal/benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/benchmarks/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/benchmarks/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/benchmarks/pom.xml Sun Oct 9 17:03:52 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>1.5.8-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
</parent>
<artifactId>apacheds-benchmarks</artifactId>
<name>ApacheDS Benchmarks</name>
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -5,5 +5,5 @@
/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-1164660
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core:1067786-1067997
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -5,5 +5,5 @@
/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-1164660
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core-annotations:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-annotations/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-annotations/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-annotations/pom.xml Sun Oct 9 17:03:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-annotations</artifactId>
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Sun Oct 9 17:03:52 2011
@@ -248,10 +248,12 @@ public class DSAnnotationProcessor
if ( instance != null )
{
dsBuilder = (CreateDS)instance;
- }
- // Ok, we have found a CreateDS annotation. Process it now.
- return createDS( dsBuilder );
+ // Ok, we have found a CreateDS annotation. Process it now.
+ return createDS( dsBuilder );
+ }
+
+ throw new LdapException( I18n.err( I18n.ERR_114 ) );
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Sun Oct 9 17:03:52 2011
@@ -117,7 +117,7 @@ public class DefaultDirectoryServiceFact
/**
* Build the working directory
*/
- private void buildInstanceDirectory( String name )
+ private void buildInstanceDirectory( String name ) throws IOException
{
String instanceDirectory = System.getProperty( "workingDirectory" );
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -4,5 +4,5 @@
/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-1164660
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core-api:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/pom.xml Sun Oct 9 17:03:52 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-api</artifactId>
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/AbstractLayout.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/AbstractLayout.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/AbstractLayout.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/AbstractLayout.java Sun Oct 9 17:03:52 2011
@@ -21,7 +21,9 @@ package org.apache.directory.server.core
import java.io.File;
+import java.io.IOException;
+import org.apache.directory.server.i18n.I18n;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -110,13 +112,16 @@ public abstract class AbstractLayout
/**
* Creates the required directories (if they don't already exist).
*/
- public void mkdirs()
+ public void mkdirs() throws IOException
{
for ( File requiredDirectory : requiredDirectories )
{
if ( !requiredDirectory.exists() )
{
- requiredDirectory.mkdirs();
+ if ( !requiredDirectory.mkdirs() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, requiredDirectory ) );
+ }
}
}
}
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=1180652&r1=1180651&r2=1180652&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 Sun Oct 9 17:03:52 2011
@@ -20,6 +20,7 @@
package org.apache.directory.server.core;
+import java.io.IOException;
import java.util.List;
import java.util.Set;
@@ -360,8 +361,9 @@ public interface DirectoryService extend
/**
* Sets the InstanceLayout used by the DirectoryService to store the files
* @param instanceLayout The InstanceLayout to set
+ * @throws IOException If the layout could not be created
*/
- void setInstanceLayout( InstanceLayout instanceLayout );
+ void setInstanceLayout( InstanceLayout instanceLayout ) throws IOException;
/**
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.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/ClonedServerEntry.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java Sun Oct 9 17:03:52 2011
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -158,9 +159,12 @@ public class ClonedServerEntry implement
}
- public Set<AttributeType> getAttributeTypes()
+ /**
+ * {@inheritDoc}
+ */
+ public Collection<Attribute> getAttributes()
{
- return clonedEntry.getAttributeTypes();
+ return clonedEntry.getAttributes();
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.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/ServerEntryUtils.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Sun Oct 9 17:03:52 2011
@@ -98,8 +98,9 @@ public class ServerEntryUtils
Attributes attributes = new BasicAttributes( true );
- for ( AttributeType attributeType:entry.getAttributeTypes() )
+ for ( Attribute attribute:entry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
Attribute attr = entry.get( attributeType );
// Deal with a special case : an entry without any ObjectClass
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.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/filtering/BaseEntryFilteringCursor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java Sun Oct 9 17:03:52 2011
@@ -33,6 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.CursorIterator;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.exception.OperationAbandonedException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -373,9 +374,10 @@ public class BaseEntryFilteringCursor im
if ( getOperationContext().isNoAttributes() )
{
- for ( AttributeType at : originalEntry.getAttributeTypes() )
+ for ( Attribute attribute : originalEntry.getAttributes() )
{
- entry.remove( entry.get( at ) );
+ AttributeType attributeType = attribute.getAttributeType();
+ entry.remove( entry.get( attributeType ) );
}
return;
@@ -384,28 +386,30 @@ public class BaseEntryFilteringCursor im
if ( getOperationContext().isAllUserAttributes() )
{
- for ( AttributeType at : originalEntry.getAttributeTypes() )
+ for ( Attribute attribute : originalEntry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
boolean isNotRequested = true;
for ( AttributeTypeOptions attrOptions:getOperationContext().getReturningAttributes() )
{
- if ( attrOptions.getAttributeType().equals( at ) || attrOptions.getAttributeType().isAncestorOf( at ) )
+ if ( attrOptions.getAttributeType().equals( attributeType ) ||
+ attrOptions.getAttributeType().isAncestorOf( attributeType ) )
{
isNotRequested = false;
break;
}
}
- boolean isNotUserAttribute = at.getUsage() != UsageEnum.USER_APPLICATIONS;
+ boolean isNotUserAttribute = attributeType.getUsage() != UsageEnum.USER_APPLICATIONS;
if ( isNotRequested && isNotUserAttribute )
{
- entry.removeAttributes( at );
+ entry.removeAttributes( attributeType );
}
else if( typesOnly )
{
- entry.get( at ).clear();
+ entry.get( attributeType ).clear();
}
}
@@ -414,28 +418,30 @@ public class BaseEntryFilteringCursor im
if ( getOperationContext().isAllOperationalAttributes() )
{
- for ( AttributeType at : originalEntry.getAttributeTypes() )
+ for ( Attribute attribute : originalEntry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
boolean isNotRequested = true;
for ( AttributeTypeOptions attrOptions:getOperationContext().getReturningAttributes() )
{
- if ( attrOptions.getAttributeType().equals( at ) || attrOptions.getAttributeType().isAncestorOf( at ) )
+ if ( attrOptions.getAttributeType().equals( attributeType ) ||
+ attrOptions.getAttributeType().isAncestorOf( attributeType ) )
{
isNotRequested = false;
break;
}
}
- boolean isUserAttribute = at.getUsage() == UsageEnum.USER_APPLICATIONS;
+ boolean isUserAttribute = attributeType.getUsage() == UsageEnum.USER_APPLICATIONS;
if ( isNotRequested && isUserAttribute )
{
- entry.removeAttributes( at );
+ entry.removeAttributes( attributeType );
}
else if( typesOnly )
{
- entry.get( at ).clear();
+ entry.get( attributeType ).clear();
}
}
@@ -444,13 +450,15 @@ public class BaseEntryFilteringCursor im
if ( getOperationContext().getReturningAttributes() != null )
{
- for ( AttributeType at : originalEntry.getAttributeTypes() )
+ for ( Attribute attribute : originalEntry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
boolean isNotRequested = true;
for ( AttributeTypeOptions attrOptions:getOperationContext().getReturningAttributes() )
{
- if ( attrOptions.getAttributeType().equals( at ) || attrOptions.getAttributeType().isAncestorOf( at ) )
+ if ( attrOptions.getAttributeType().equals( attributeType ) ||
+ attrOptions.getAttributeType().isAncestorOf( attributeType ) )
{
isNotRequested = false;
break;
@@ -459,11 +467,11 @@ public class BaseEntryFilteringCursor im
if ( isNotRequested )
{
- entry.removeAttributes( at );
+ entry.removeAttributes( attributeType );
}
else if( typesOnly )
{
- entry.get( at ).clear();
+ entry.get( attributeType ).clear();
}
}
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.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/entry/SchemaAwareEntryTest.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Sun Oct 9 17:03:52 2011
@@ -30,6 +30,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -1669,7 +1670,7 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- assertEquals( 0, entry.getAttributeTypes().size() );
+ assertEquals( 0, entry.getAttributes().size() );
Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
@@ -1678,14 +1679,22 @@ public class SchemaAwareEntryTest
entry.add( attrOC, attrCN, attrSN, attrPWD );
- Set<AttributeType> attributeTypes = entry.getAttributeTypes();
+ Collection<Attribute> attributes = entry.getAttributes();
- assertEquals( 4, attributeTypes.size() );
- assertTrue( attributeTypes.contains( atOC ) );
- assertTrue( attributeTypes.contains( atCN ) );
- assertTrue( attributeTypes.contains( atSN ) );
- assertTrue( attributeTypes.contains( atPwd ) );
- assertFalse( attributeTypes.contains( atC ) );
+ assertEquals( 4, attributes.size() );
+ Set<AttributeType> expected = new HashSet<AttributeType>();
+ expected.add( atOC );
+ expected.add( atCN );
+ expected.add( atSN );
+ expected.add( atPwd );
+ expected.add( atC );
+
+ for ( Attribute attribute : attributes )
+ {
+ AttributeType attributeType = attribute.getAttributeType();
+
+ assertTrue( expected.contains( attributeType ) );
+ }
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/resources/log4j.properties?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/resources/log4j.properties (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-api/src/test/resources/log4j.properties Sun Oct 9 17:03:52 2011
@@ -17,7 +17,7 @@
log4j.rootCategory=OFF, stdout
log4j.appender.stdout=org.apache.log4j.RollingFileAppender
-log4j.appender.stdout.File=apacheds-rolling.log
+log4j.appender.stdout.File=target/apacheds-rolling.log
log4j.appender.stdout.MaxFileSize=1024KB
# Keep some backup files
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -4,5 +4,5 @@
/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-1164660
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core-avl:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-avl/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-avl/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-avl/pom.xml Sun Oct 9 17:03:52 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-avl</artifactId>
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java Sun Oct 9 17:03:52 2011
@@ -181,7 +181,7 @@ public class ArrayMarshaller<E> implemen
{
byte[] bytes = new byte[ dataSize ];
- din.read( bytes );
+ din.readFully( bytes );
E key = keyMarshaller.deserialize( bytes );
nodes[i] = key;
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java Sun Oct 9 17:03:52 2011
@@ -231,7 +231,7 @@ public class AvlTreeMarshaller<E> implem
byte[] data = new byte[ dLen ];
//noinspection ResultOfMethodCallIgnored
- in.read( data );
+ in.readFully( data );
E key = keyMarshaller.deserialize( data );
node = new LinkedAvlNode( key );
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -4,5 +4,5 @@
/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-1164660
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core-constants:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-constants/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-constants/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-constants/pom.xml Sun Oct 9 17:03:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-constants</artifactId>
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -4,5 +4,5 @@
/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-1164660
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core-integ:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-integ/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-integ/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-integ/pom.xml Sun Oct 9 17:03:52 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-integ</artifactId>
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 Sun Oct 9 17:03:52 2011
@@ -9,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-1164660
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/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/resources/AliasSearchIT.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/resources/AliasSearchIT.ldif?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/resources/AliasSearchIT.ldif (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-integ/src/test/resources/AliasSearchIT.ldif Sun Oct 9 17:03:52 2011
@@ -1,3 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# EXAMPLE.COM is reserved for testing according to this RFC:
+#
+# http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
dn: dc=example,dc=com
objectClass: domain
objectClass: top
Propchange: directory/apacheds/branches/one-sub-level-index-removal/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 17:03:52 2011
@@ -4,5 +4,5 @@
/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-1164660
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1180637
/directory/studio/trunk/core-jndi:1067786-1067997
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core-jndi/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-jndi/pom.xml Sun Oct 9 17:03:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-jndi</artifactId>
Modified: directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/DeadContext.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/DeadContext.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core-jndi/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java Sun Oct 9 17:03:52 2011
@@ -55,7 +55,7 @@ import javax.naming.Binding;
*/
public class DeadContext implements LdapContext, EventDirContext
{
- private final String EXCEPTION_MSG = "Context operation unavailable when "
+ private static final String EXCEPTION_MSG = "Context operation unavailable when "
+ "invoked after directory service core provider has been shutdown";
Modified: directory/apacheds/branches/one-sub-level-index-removal/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/pom.xml?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/pom.xml (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/pom.xml Sun Oct 9 17:03:52 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-parent</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
+ <version>2.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core</artifactId>
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=1180652&r1=1180651&r2=1180652&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 Sun Oct 9 17:03:52 2011
@@ -509,34 +509,49 @@ public class DefaultDirectoryService imp
/**
* {@inheritDoc}
*/
- public void setInstanceLayout( InstanceLayout instanceLayout )
+ public void setInstanceLayout( InstanceLayout instanceLayout ) throws IOException
{
this.instanceLayout = instanceLayout;
// Create the directories if they are missing
if ( !instanceLayout.getInstanceDirectory().exists() )
{
- instanceLayout.getInstanceDirectory().mkdirs();
+ if ( !instanceLayout.getInstanceDirectory().mkdirs() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, instanceLayout.getInstanceDirectory() ) );
+ }
}
if ( !instanceLayout.getLogDirectory().exists() )
{
- instanceLayout.getLogDirectory().mkdirs();
+ if ( !instanceLayout.getLogDirectory().mkdirs() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, instanceLayout.getLogDirectory() ) );
+ }
}
if ( !instanceLayout.getRunDirectory().exists() )
{
- instanceLayout.getRunDirectory().mkdirs();
+ if ( !instanceLayout.getRunDirectory().mkdirs() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, instanceLayout.getRunDirectory() ) );
+ }
}
if ( !instanceLayout.getPartitionsDirectory().exists() )
{
- instanceLayout.getPartitionsDirectory().mkdirs();
+ if ( !instanceLayout.getPartitionsDirectory().mkdirs() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, instanceLayout.getPartitionsDirectory() ) );
+ }
}
if ( !instanceLayout.getConfDirectory().exists() )
{
- instanceLayout.getConfDirectory().mkdirs();
+ if ( !instanceLayout.getConfDirectory().mkdirs() )
+ {
+ throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, instanceLayout.getConfDirectory() ) );
+ }
}
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.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/AuthenticationInterceptor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sun Oct 9 17:03:52 2011
@@ -511,19 +511,16 @@ public class AuthenticationInterceptor e
}
// handle the case where pwdPolicySubentry AT is about to be deleted in thid modify()
- PasswordPolicyConfiguration policyConfig = getPwdPolicy( modifyContext.getOriginalEntry() );
+ PasswordPolicyConfiguration policyConfig = getPwdPolicy( modifyContext.getEntry() );
boolean isPPolicyReqCtrlPresent = modifyContext.hasRequestControl( PasswordPolicy.OID );
Dn userDn = modifyContext.getSession().getAuthenticatedPrincipal().getDn();
PwdModDetailsHolder pwdModDetails = null;
- if ( policyConfig.isPwdSafeModify() || pwdResetSet.contains( userDn ) || ( policyConfig.getPwdMinAge() > 0 ) )
- {
- pwdModDetails = getPwdModDetails( modifyContext, policyConfig );
- }
+ pwdModDetails = getPwdModDetails( modifyContext, policyConfig );
- if ( ( pwdModDetails != null ) && pwdModDetails.isPwdModPresent() )
+ if ( pwdModDetails.isPwdModPresent() )
{
if ( pwdResetSet.contains( userDn ) )
{
@@ -622,6 +619,11 @@ public class AuthenticationInterceptor e
if ( histSize > 0 )
{
Attribute pwdHistoryAt = entry.get( PWD_HISTORY_AT );
+ if ( pwdHistoryAt == null )
+ {
+ pwdHistoryAt = new DefaultAttribute( AT_PWD_HISTORY );
+ }
+
Set<PasswordHistory> pwdHistSet = new TreeSet<PasswordHistory>();
for ( Value<?> value : pwdHistoryAt )
@@ -650,13 +652,12 @@ public class AuthenticationInterceptor e
PasswordHistory newPwdHist = new PasswordHistory( pwdChangedTime, newPassword );
pwdHistSet.add( newPwdHist );
- pwdHistoryAt = new DefaultAttribute( pwdHistoryAt.getAttributeType() );
+ pwdHistoryAt.clear();
pwdHistoryAt.add( newPwdHist.getHistoryValue() );
pwdAddHistMod = new DefaultModification( ADD_ATTRIBUTE, pwdHistoryAt );
if ( pwdHistSet.size() > histSize )
{
- pwdHistoryAt = new DefaultAttribute( pwdHistoryAt.getAttributeType() );
PasswordHistory remPwdHist = ( PasswordHistory ) pwdHistSet.toArray()[histSize - 1];
pwdHistoryAt.add( remPwdHist.getHistoryValue() );
pwdRemHistMod = new DefaultModification( REMOVE_ATTRIBUTE, pwdHistoryAt );
@@ -1285,12 +1286,15 @@ public class AuthenticationInterceptor e
}
Attribute pwdChangedTimeAt = userEntry.get( PWD_CHANGED_TIME_AT );
- long changedTime = DateUtils.getDate( pwdChangedTimeAt.getString() ).getTime();
- changedTime += policyConfig.getPwdMinAge() * 1000;
-
- if ( changedTime > System.currentTimeMillis() )
+ if ( pwdChangedTimeAt != null )
{
- return true;
+ long changedTime = DateUtils.getDate( pwdChangedTimeAt.getString() ).getTime();
+ changedTime += policyConfig.getPwdMinAge() * 1000;
+
+ if ( changedTime > System.currentTimeMillis() )
+ {
+ return true;
+ }
}
return false;
@@ -1385,7 +1389,7 @@ public class AuthenticationInterceptor e
}
- private class PwdModDetailsHolder
+ private static class PwdModDetailsHolder
{
private boolean pwdModPresent = false;
Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.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/Authenticator.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Sun Oct 9 17:03:52 2011
@@ -61,7 +61,7 @@ public interface Authenticator
* Called by {@link AuthenticationInterceptor} to indicate that this
* authenticator is being placed into service.
*/
- public void init( DirectoryService directoryService ) throws LdapException;
+ void init( DirectoryService directoryService ) throws LdapException;
/**
@@ -84,8 +84,11 @@ public interface Authenticator
/**
* Performs authentication and returns the principal if succeeded.
+ *
+ * @param bindContext The Bind context
+ * @exception If the authentication failed
*/
- public LdapPrincipal authenticate( BindOperationContext bindContext ) throws Exception;
+ LdapPrincipal authenticate( BindOperationContext bindContext ) throws Exception;
/**
@@ -95,4 +98,13 @@ public interface Authenticator
* @throws PasswordPolicyException
*/
void checkPwdPolicy( Entry userEntry ) throws LdapException;
+
+
+ /**
+ * Performs an unbind on the given context
+ *
+ * @param unbindContext The Unbind context
+ * @exception If the unbind failed
+ */
+ //void unbind( UnbindOperationContext unbindContext ) throws Exception;
}
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 Sun Oct 9 17:03:52 2011
@@ -8,6 +8,6 @@
/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-1164660
+/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyConfiguration.java:1158399-1180637
/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/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sun Oct 9 17:03:52 2011
@@ -1343,9 +1343,10 @@ public class AciAuthorizationInterceptor
*/
List<AttributeType> attributeToRemove = new ArrayList<AttributeType>();
- for ( AttributeType attributeType : clonedEntry.getAttributeTypes() )
+ for ( Attribute attribute : clonedEntry.getAttributes() )
{
// if attribute type scope access is not allowed then remove the attribute and continue
+ AttributeType attributeType = attribute.getAttributeType();
Attribute attr = clonedEntry.get( attributeType );
aciContext = new AciContext( schemaManager, opContext );
Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sun Oct 9 17:03:52 2011
@@ -20,6 +20,7 @@ package org.apache.directory.server.core
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -117,10 +118,9 @@ public class ChangeLogInterceptor extend
forward.setChangeType( ChangeType.Add );
forward.setDn( addContext.getDn() );
- Set<AttributeType> list = addEntry.getAttributeTypes();
-
- for ( AttributeType attributeType:list )
+ for ( Attribute attribute:addEntry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
forward.addAttribute( addEntry.get( attributeType).clone() );
}
Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Sun Oct 9 17:03:52 2011
@@ -290,10 +290,10 @@ public class CollectiveAttributeIntercep
*/
private boolean containsAnyCollectiveAttributes( Entry entry ) throws LdapException
{
- Set<AttributeType> attributeTypes = entry.getAttributeTypes();
-
- for ( AttributeType attributeType : attributeTypes )
+ for ( Attribute attribute : entry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
+
if ( attributeType.isCollective() )
{
return true;
@@ -408,8 +408,9 @@ public class CollectiveAttributeIntercep
Entry subentry = opContext.lookup( subentryDn, ByPassConstants.LOOKUP_COLLECTIVE_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY );
- for ( AttributeType attributeType : subentry.getAttributeTypes() )
+ for ( Attribute attribute : subentry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
String attrId = attributeType.getName();
if ( !attributeType.isCollective() )
Modified: directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=1180652&r1=1180651&r2=1180652&view=diff
==============================================================================
--- directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original)
+++ directory/apacheds/branches/one-sub-level-index-removal/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Sun Oct 9 17:03:52 2011
@@ -31,6 +31,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -114,10 +115,9 @@ public class JournalInterceptor extends
ldif.setChangeType( ChangeType.Add );
ldif.setDn( addContext.getDn() );
- Set<AttributeType> list = addEntry.getAttributeTypes();
-
- for ( AttributeType attributeType:list )
+ for ( Attribute attribute:addEntry.getAttributes() )
{
+ AttributeType attributeType = attribute.getAttributeType();
ldif.addAttribute( addEntry.get( attributeType).clone() );
}