You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/01/23 07:20:59 UTC
[directory-server] 04/05: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/directory-server
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
commit f62c7167b65c453230dcba79bfb0c6a8874bb813
Merge: be82b0c 6ae7af2
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Wed Jan 10 07:06:06 2018 +0100
Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
NOTICE | 2 +-
README.txt | 1 -
all/pom.xml | 2 +-
apache-felix/ApacheDS-OSGI.launch | 2 -
benchmarks/installers-maven-plugin/.classpath | 31 +
benchmarks/installers-maven-plugin/.project | 28 +
.../.settings/org.eclipse.core.resources.prefs | 4 +
.../.settings/org.eclipse.jdt.core.prefs | 5 +
.../.settings/org.eclipse.m2e.core.prefs | 4 +
.../server/installers/AbstractMojoCommand.class | Bin 0 -> 7057 bytes
.../directory/server/installers/GenerateMojo.class | Bin 0 -> 6838 bytes
.../org/apache/directory/server/installers/LICENSE | 364 +++++++++
.../server/installers/LinuxInstallerCommand.class | Bin 0 -> 3757 bytes
.../server/installers/MojoHelperUtils.class | Bin 0 -> 8173 bytes
.../org/apache/directory/server/installers/NOTICE | 4 +-
.../server/installers/ReflectionProperties.class | Bin 0 -> 1768 bytes
.../directory/server/installers/Target.class | Bin 0 -> 2442 bytes
.../apache/directory/server/installers/apacheds | 590 +++++++++++++++
.../archive/ArchiveInstallerCommand.class | Bin 0 -> 9552 bytes
.../server/installers/archive/ArchiveTarget.class | Bin 0 -> 754 bytes
.../server/installers/archive/ArchiveType.class | Bin 0 -> 1875 bytes
.../server/installers/archive/apacheds.bat | 41 +
.../server/installers/archive/apacheds.sh | 32 -
.../server/installers/archive/cpappend.bat | 36 +
.../server/installers/archive/log4j.properties | 43 ++
.../installers/bin/BinInstallerCommand.class | Bin 0 -> 7188 bytes
.../server/installers/bin/BinTarget.class | Bin 0 -> 479 bytes
.../directory/server/installers/bin/bootstrap.sh | 281 +++++++
.../server/installers/bin/createInstaller.sh | 35 +
.../directory/server/installers/bin/functions.sh | 127 ++++
.../directory/server/installers/bin/install.sh | 163 ++++
.../directory/server/installers/bin/variables.sh | 25 +
.../installers/deb/DebInstallerCommand.class | Bin 0 -> 8155 bytes
.../server/installers/deb/DebTarget.class | Bin 0 -> 482 bytes
.../apache/directory/server/installers/deb/control | 13 +
.../directory/server/installers/deb/postinst | 40 +
.../apache/directory/server/installers/deb/prerm | 38 +
.../directory/server/installers/etc-initd-script | 36 +
.../directory/server/installers/log4j.properties | 47 ++
.../directory/server/installers/macosxpkg/DS_Store | Bin 0 -> 12292 bytes
.../server/installers/macosxpkg/Info.plist | 58 ++
.../server/installers/macosxpkg/License.rtf | 80 ++
.../macosxpkg/MacOsXPkgInstallerCommand.class | Bin 0 -> 13317 bytes
.../installers/macosxpkg/MacOsXPkgTarget.class | Bin 0 -> 515 bytes
.../installers/macosxpkg/apacheds-usr-bin.sh | 20 +
.../server/installers/macosxpkg/dmg-background.png | Bin 0 -> 12138 bytes
.../macosxpkg/org.apache.directory.server.plist | 42 ++
.../installers/macosxpkg/pkg-background.tiff | Bin 0 -> 162064 bytes
.../server/installers/macosxpkg/postflight | 30 +
.../server/installers/macosxpkg/preflight | 32 +
.../server/installers/nsis/Manage ApacheDS.exe | Bin 0 -> 26112 bytes
.../installers/nsis/NsisInstallerCommand.class | Bin 0 -> 7359 bytes
.../server/installers/nsis/NsisTarget.class | Bin 0 -> 486 bytes
.../directory/server/installers/nsis/header.bmp | Bin 0 -> 25818 bytes
.../directory/server/installers/nsis/installer.ico | Bin 0 -> 26694 bytes
.../directory/server/installers/nsis/installer.nsi | 659 ++++++++++++++++
.../server/installers/nsis/uninstaller.ico | Bin 0 -> 17542 bytes
.../directory/server/installers/nsis/welcome.bmp | Bin 0 -> 154542 bytes
.../installers/rpm/RpmInstallerCommand.class | Bin 0 -> 8990 bytes
.../server/installers/rpm/RpmTarget.class | Bin 0 -> 480 bytes
.../directory/server/installers/rpm/apacheds.spec | 100 +++
.../server/installers/wrapper-installation.conf | 115 +++
.../server/installers/wrapper-instance.conf | 40 +
.../installers/wrapper/bin/wrapper-linux-ppc-64 | Bin 0 -> 140198 bytes
.../installers/wrapper/bin/wrapper-linux-x86-32 | Bin 0 -> 99401 bytes
.../installers/wrapper/bin/wrapper-linux-x86-64 | Bin 0 -> 111027 bytes
.../installers/wrapper/bin/wrapper-macosx-ppc-32 | Bin 0 -> 114052 bytes
.../wrapper/bin/wrapper-macosx-universal-32 | Bin 0 -> 233604 bytes
.../wrapper/bin/wrapper-macosx-universal-64 | Bin 0 -> 129136 bytes
.../wrapper/bin/wrapper-solaris-sparc-32 | Bin 0 -> 112536 bytes
.../wrapper/bin/wrapper-solaris-sparc-64 | Bin 0 -> 148512 bytes
.../installers/wrapper/bin/wrapper-solaris-x86-32 | Bin 0 -> 110992 bytes
.../wrapper/bin/wrapper-windows-x86-32.exe | Bin 0 -> 204800 bytes
.../server/installers/wrapper/conf/wrapper.conf | 118 +++
.../wrapper/lib/libwrapper-linux-ppc-64.so | Bin 0 -> 23839 bytes
.../wrapper/lib/libwrapper-linux-x86-32.so | Bin 0 -> 11887 bytes
.../wrapper/lib/libwrapper-linux-x86-64.so | Bin 0 -> 15248 bytes
.../wrapper/lib/libwrapper-macosx-ppc-32.jnilib | Bin 0 -> 15400 bytes
.../lib/libwrapper-macosx-universal-32.jnilib | Bin 0 -> 35332 bytes
.../lib/libwrapper-macosx-universal-64.jnilib | Bin 0 -> 15168 bytes
.../wrapper/lib/libwrapper-solaris-sparc-32.so | Bin 0 -> 13760 bytes
.../wrapper/lib/libwrapper-solaris-sparc-64.so | Bin 0 -> 21032 bytes
.../wrapper/lib/libwrapper-solaris-x86-32.so | Bin 0 -> 12572 bytes
.../wrapper/lib/wrapper-windows-x86-32.dll | Bin 0 -> 81920 bytes
.../server/installers/wrapper/src/App.bat.in | 72 ++
.../installers/wrapper/src/AppCommand.bat.in | 114 +++
.../installers/wrapper/src/AppNoWrapper.bat.in | 29 +
.../installers/wrapper/src/InstallApp-NT.bat.in | 67 ++
.../installers/wrapper/src/PauseApp-NT.bat.in | 67 ++
.../installers/wrapper/src/ResumeApp-NT.bat.in | 67 ++
.../server/installers/wrapper/src/SimpleApp.bat.in | 32 +
.../wrapper/src/SimpleInstallApp-NT.bat.in | 32 +
.../wrapper/src/SimpleUninstallApp-NT.bat.in | 32 +
.../installers/wrapper/src/StartApp-NT.bat.in | 67 ++
.../installers/wrapper/src/StopApp-NT.bat.in | 67 ++
.../installers/wrapper/src/UninstallApp-NT.bat.in | 67 ++
.../server/installers/wrapper/src/sh.script.in | 617 +++++++++++++++
.../directory/mavibot/btree/LdifDataLoader.java | 2 +-
core-annotations/pom.xml | 44 +-
.../factory/DefaultDirectoryServiceFactory.java | 2 +-
.../server/core/factory/JdbmPartitionFactory.java | 2 +-
core-api/pom.xml | 54 +-
.../server/core/api/LdapCoreSessionConnection.java | 127 +++-
.../directory/server/core/api/LdapPrincipal.java | 20 +-
.../directory/server/core/api/ReferralManager.java | 2 +-
.../server/core/api/entry/ClonedServerEntry.java | 20 +-
.../server/core/api/entry/ServerEntryUtils.java | 19 +-
.../server/core/api/event/LeafEvaluator.java | 30 +-
.../core/api/event/NotificationCriteria.java | 11 +-
.../server/core/api/event/RegistrationEntry.java | 5 +-
.../server/core/api/event/SubstringEvaluator.java | 4 +-
.../context/AbstractChangeOperationContext.java | 3 +
.../context/AbstractOperationContext.java | 33 +-
.../context/CompareOperationContext.java | 13 +-
.../core/api/interceptor/context/ModDnAva.java | 89 +++
.../context/MoveAndRenameOperationContext.java | 42 +-
.../interceptor/context/MoveOperationContext.java | 42 +-
.../normalization/FilterNormalizingVisitor.java | 267 ++-----
.../core/api/partition/AbstractPartition.java | 22 +-
.../server/core/api/partition/PartitionNexus.java | 2 +-
.../server/core/api/schema/DescriptionParsers.java | 76 +-
.../AbstractRegistrySynchronizer.java | 14 +-
.../synchronizers/AttributeTypeSynchronizer.java | 20 +-
.../synchronizers/ComparatorSynchronizer.java | 28 +-
.../synchronizers/MatchingRuleSynchronizer.java | 22 +-
.../synchronizers/NormalizerSynchronizer.java | 22 +-
.../synchronizers/ObjectClassSynchronizer.java | 56 +-
.../synchronizers/RegistrySynchronizerAdaptor.java | 41 +-
.../synchronizers/SchemaSynchronizer.java | 30 +-
.../synchronizers/SyntaxCheckerSynchronizer.java | 18 +-
.../synchronizers/SyntaxSynchronizer.java | 43 +-
.../server/core/api/sp/LdapClassLoader.java | 24 +-
.../core/api/sp/StoredProcExecutionManager.java | 6 +-
.../server/core/api/sp/StoredProcUtils.java | 8 +-
.../core/api/sp/java/JavaStoredProcEngine.java | 9 +-
.../api/sp/java/JavaStoredProcEngineConfig.java | 2 +
.../api/sp/java/LdapJavaStoredProcClassLoader.java | 4 +
.../core/api/subtree/RefinementLeafEvaluator.java | 2 +-
.../server/core/api/subtree/SubentryUtils.java | 8 +-
.../directory/server/core/api/MockCoreSession.java | 14 +-
.../core/api/entry/SchemaAwareEntryTest.java | 288 ++++---
.../FilterNormalizingVisitorTest.java | 6 +-
core-avl/pom.xml | 12 +-
.../server/core/avltree/AvlTreeMapImpl.java | 53 +-
core-constants/pom.xml | 4 +-
.../server/constants/ServerDNConstants.java | 4 +-
core-integ/pom.xml | 46 +-
.../server/core/integ/IntegrationUtils.java | 2 +-
.../server/core/authn/SimpleAuthenticationIT.java | 20 +-
.../core/authz/AuthorizationServiceAsAdminIT.java | 5 +-
.../server/core/authz/ModifyAuthorizationIT.java | 38 +-
.../server/core/exception/ExceptionServiceIT.java | 12 +-
.../server/core/jndi/ObjStateFactoryIT.java | 4 +-
.../operational/OperationalAttributeServiceIT.java | 12 +
.../server/core/operations/add/AddIT.java | 8 +-
.../server/core/operations/lookup/LookupIT.java | 1 -
.../core/operations/lookup/LookupPerfIT.java | 2 +-
.../server/core/operations/modify/ModifyAddIT.java | 2 +-
.../server/core/operations/move/MoveIT.java | 50 +-
.../operations/moveAndRename/MoveAndRenameIT.java | 211 +++++-
.../server/core/operations/rename/RenameIT.java | 277 ++++++-
.../server/core/operations/search/SearchIT.java | 85 ++-
.../operations/search/SearchWithIndicesIT.java | 28 +-
.../server/core/schema/SubschemaSubentryIT.java | 42 +-
.../server/core/subtree/BadSubentryServiceIT.java | 9 +-
.../server/core/schema/DummyNormalizer.bytecode | Bin 1695 -> 1629 bytes
core-jndi/pom.xml | 46 +-
.../directory/server/core/jndi/ServerContext.java | 15 +-
.../server/core/jndi/ServerDirContext.java | 13 +-
.../server/core/jndi/ServerLdapContext.java | 12 +-
core-shared/pom.xml | 44 +-
.../server/core/shared/DefaultCoreSession.java | 167 ++--
.../server/core/shared/DefaultDnFactory.java | 17 +-
.../server/core/shared/ReferralManagerImpl.java | 18 +-
.../server/core/shared/SchemaService.java | 4 +-
.../server/core/shared/SortedEntryComparator.java | 88 ++-
.../server/core/shared/SortedEntryCursor.java | 2 +-
.../server/core/shared/SortedEntrySerializer.java | 4 +-
.../shared/partition/DefaultPartitionNexus.java | 146 ++--
core/pom.xml | 56 +-
.../server/core/DefaultDirectoryService.java | 66 +-
.../server/core/DefaultOperationManager.java | 116 ++-
http-directory-bridge/pom.xml | 10 +-
http-integration/pom.xml | 22 +-
.../server/integration/http/HttpServer.java | 3 +-
i18n/pom.xml | 4 +-
.../org/apache/directory/server/i18n/I18n.java | 4 +-
installers-maven-plugin/pom.xml | 2 +-
.../server/installers/archive/apacheds.sh | 1 +
.../server/installers/archive/cpappend.bat.orig | 36 +
installers/pom.xml | 2 +-
interceptor-kerberos/pom.xml | 24 +-
.../core/kerberos/KeyDerivationInterceptor.java | 19 +-
interceptors/admin/pom.xml | 24 +-
.../core/admin/AdministrativePointInterceptor.java | 71 +-
interceptors/authn/pom.xml | 32 +-
.../server/core/authn/AbstractAuthenticator.java | 20 +-
.../server/core/authn/AnonymousAuthenticator.java | 1 +
.../core/authn/AuthenticationInterceptor.java | 105 +--
.../directory/server/core/authn/Authenticator.java | 8 -
.../server/core/authn/DelegatingAuthenticator.java | 3 +
.../server/core/authn/PasswordHistory.java | 16 +
.../server/core/authn/SimpleAuthenticator.java | 8 +-
.../server/core/authn/StrongAuthenticator.java | 1 +
.../core/authn/ppolicy/PpolicyConfigContainer.java | 4 +-
interceptors/authz/pom.xml | 32 +-
.../core/authz/AciAuthorizationInterceptor.java | 181 ++---
.../authz/DefaultAuthorizationInterceptor.java | 23 +-
.../directory/server/core/authz/GroupCache.java | 141 ++--
.../directory/server/core/authz/TupleCache.java | 39 +-
.../server/core/authz/support/ACDFEngine.java | 4 +-
.../server/core/authz/support/AciContext.java | 12 +-
.../authz/support/HighestPrecedenceFilter.java | 4 +
.../server/core/authz/support/MaxImmSubFilter.java | 6 +-
.../core/authz/support/MaxValueCountFilter.java | 6 +-
.../core/authz/support/MicroOperationFilter.java | 6 +-
.../support/MostSpecificProtectedItemFilter.java | 10 +-
.../authz/support/MostSpecificUserClassFilter.java | 12 +-
.../server/core/authz/support/OperationScope.java | 1 +
.../authz/support/RelatedProtectedItemFilter.java | 15 +-
.../core/authz/support/RelatedUserClassFilter.java | 19 +-
.../core/authz/support/RestrictedByFilter.java | 4 +-
.../support/MostSpecificUserClassFilterTest.java | 3 +-
.../support/RelatedProtectedItemFilterTest.java | 8 +-
.../authz/support/RelatedUserClassFilterTest.java | 16 +-
.../core/authz/support/RestrictedByFilterTest.java | 8 +-
interceptors/changelog/pom.xml | 26 +-
.../core/changelog/ChangeLogInterceptor.java | 15 +-
.../server/core/changelog/DefaultChangeLog.java | 32 +-
.../core/changelog/MemoryChangeLogStore.java | 59 +-
.../core/changelog/MemoryChangeLogStoreTest.java | 3 -
interceptors/collective/pom.xml | 19 +-
.../collective/CollectiveAttributeInterceptor.java | 21 +-
interceptors/event/pom.xml | 21 +-
.../server/core/event/DefaultEventService.java | 12 +-
.../server/core/event/EventInterceptor.java | 16 +-
interceptors/exception/pom.xml | 18 +-
.../core/exception/ExceptionInterceptor.java | 14 +-
interceptors/hash/pom.xml | 16 +-
.../core/hash/ConfigurableHashingInterceptor.java | 7 +-
.../core/hash/PasswordHashingInterceptor.java | 16 +-
interceptors/journal/pom.xml | 15 +-
.../server/core/journal/DefaultJournal.java | 11 +
.../server/core/journal/DefaultJournalStore.java | 9 +
.../server/core/journal/JournalInterceptor.java | 15 +-
interceptors/logger/pom.xml | 14 +-
.../server/core/logger/TimerInterceptor.java | 19 +-
interceptors/normalization/pom.xml | 21 +-
.../core/normalization/ExpandingVisitor.java | 18 +-
.../normalization/NormalizationInterceptor.java | 174 ++++-
.../normalization/NormalizationVisitorTest.java | 4 +-
interceptors/number/pom.xml | 17 +-
.../core/number/NumberIncrementingInterceptor.java | 17 +-
interceptors/operational/pom.xml | 23 +-
.../OperationalAttributeInterceptor.java | 45 +-
interceptors/pom.xml | 2 +-
interceptors/referral/pom.xml | 21 +-
.../server/core/referral/ReferralInterceptor.java | 42 +-
interceptors/schema/pom.xml | 34 +-
.../server/core/schema/SchemaInterceptor.java | 441 +++++++----
.../schema/SchemaLdifToPartitionExtractor.java | 27 +-
.../server/core/schema/SchemaSubentryManager.java | 50 +-
.../server/core/schema/SchemaSubentryModifier.java | 4 +-
interceptors/subtree/pom.xml | 27 +-
.../server/core/subtree/SubentryInterceptor.java | 117 ++-
.../core/subtree/RefinementEvaluatorTest.java | 22 +-
.../core/subtree/RefinementLeafEvaluatorTest.java | 26 +-
interceptors/trigger/pom.xml | 28 +-
.../AbstractStoredProcedureParameterInjector.java | 57 +-
.../AddStoredProcedureParameterInjector.java | 1 +
.../ModifyDNStoredProcedureParameterInjector.java | 4 +-
.../trigger/StoredProcedureParameterInjector.java | 2 +-
.../server/core/trigger/TriggerInterceptor.java | 54 +-
.../server/core/trigger/TriggerSpecCache.java | 32 +-
jdbm-partition/pom.xml | 36 +-
.../impl/btree/jdbm/DnSerializerComparator.java | 21 +-
.../partition/impl/btree/jdbm/JdbmPartition.java | 49 +-
.../partition/impl/btree/jdbm/JdbmIndexTest.java | 134 ++--
.../partition/impl/btree/jdbm/JdbmStoreTest.java | 35 +-
kerberos-client/pom.xml | 2 +-
.../directory/kerberos/client/KdcConnection.java | 4 +-
.../directory/kerberos/client/KerberosChannel.java | 10 +-
.../credentials/cache/CredentialsCache.java | 2 +-
kerberos-codec/pom.xml | 41 +-
.../server/kerberos/shared/keytab/Keytab.java | 4 +-
.../shared/store/PrincipalStoreEntryModifier.java | 5 +-
.../principalName/actions/StoreNameString.java | 3 +-
kerberos-test/pom.xml | 2 +-
ldap-client-test/pom.xml | 2 +-
.../shared/client/api/LdapConnectionTest.java | 4 +-
.../shared/client/api/LdapSSLConnectionTest.java | 12 +-
.../api/operations/ClientAddRequestTest.java | 12 +-
.../api/operations/ClientModifyDnRequestTest.java | 2 +-
.../api/operations/bind/BogusNtlmProvider.java | 64 --
.../client/api/operations/bind/SaslBindIT.java | 832 --------------------
.../api/operations/bind/SimpleBindRequestTest.java | 1 +
.../shared/client/api/operations/bind/Test.java | 15 +
.../search/AnonymousClientSearchRequestTest.java | 490 ++++++------
.../operations/search/ClientSearchRequestTest.java | 4 +-
ldif-partition/pom.xml | 24 +-
.../server/core/partition/ldif/LdifPartition.java | 16 +-
.../partition/ldif/SingleFileLdifPartition.java | 33 +-
.../core/partition/ldif/LdifPartitionTest.java | 76 +-
...SingleFileLdifPartitionSingeValueAttribute.java | 76 +-
.../ldif/SingleFileLdifPartitionTest.java | 65 +-
{mavibot-partition => lmdb-partation}/pom.xml | 17 +-
mavibot-partition/pom.xml | 33 +-
.../partition/impl/btree/mavibot/DnSerializer.java | 21 +-
.../impl/btree/mavibot/LdifTupleComparator.java | 6 +-
.../impl/btree/mavibot/MavibotPartition.java | 2 +-
.../impl/btree/mavibot/MavibotStoreTest.java | 35 +-
osgi-integ/pom.xml | 12 +-
.../server/osgi/integ/ServerOsgiTestBase.java | 9 +-
pom.xml | 13 +-
protocol-dhcp/pom.xml | 28 +-
protocol-dns/pom.xml | 37 +-
protocol-kerberos/pom.xml | 60 +-
.../kerberos/kdc/DirectoryPrincipalStore.java | 2 +-
protocol-ldap/pom.xml | 101 ++-
.../apache/directory/server/ldap/LdapServer.java | 5 +-
.../ldap/handlers/controls/PagedSearchContext.java | 11 +-
.../ldap/handlers/extended/PwdModifyHandler.java | 9 +-
.../ldap/handlers/request/BindRequestHandler.java | 18 +
.../handlers/request/ModifyDnRequestHandler.java | 2 +-
.../handlers/request/SearchRequestHandler.java | 38 +-
.../ldap/handlers/sasl/ntlm/NtlmSaslServer.java | 11 +-
.../ldap/handlers/sasl/plain/PlainSaslServer.java | 13 +-
.../consumer/ReplicationConsumerImpl.java | 9 +-
.../replication/provider/ReplConsumerManager.java | 8 +-
.../ldap/replication/provider/ReplicaEventLog.java | 2 +-
.../provider/SyncReplRequestHandler.java | 18 +-
protocol-ntp/pom.xml | 19 +-
protocol-shared/pom.xml | 32 +-
.../protocol/shared/kerberos/StoreUtils.java | 3 +-
server-annotations/pom.xml | 29 +-
server-config/pom.xml | 30 +-
.../server/config/ConfigPartitionReader.java | 65 +-
.../directory/server/config/ConfigWriter.java | 4 +-
.../server/config/beans/AuthenticatorBean.java | 2 +-
.../config/ChangePasswordConfigReaderTest.java | 2 +-
.../server/config/ConfigPartitionReaderTest.java | 2 +-
.../directory/server/config/ConfigWriterTest.java | 4 +-
.../server/config/HttpServerConfigReaderTest.java | 2 +-
.../config/KerberosServerConfigReaderTest.java | 2 +-
.../server/config/LdapServerConfigReaderTest.java | 2 +-
server-integ/pom.xml | 100 +--
.../test/java/org/apache/directory/IndexIT.java | 7 +-
.../directory/server/operations/add/AddIT.java | 65 +-
.../AddingEntriesWithSpecialCharactersInRDNIT.java | 8 +-
.../server/operations/extended/PwdModifyIT.java | 4 +-
.../directory/server/operations/ldapsdk/AddIT.java | 2 +-
.../server/operations/modifydn/ModifyRdnIT.java | 30 +-
.../server/operations/search/SearchIT.java | 60 --
.../directory/server/ppolicy/PasswordPolicyIT.java | 4 +-
.../server/replication/MockSyncReplConsumer.java | 8 +-
.../server/ssl/BogusSSLContextFactory.java | 73 +-
.../org/apache/directory/server/ssl/bogus.cert | Bin 2247 -> 0 bytes
server-jndi/pom.xml | 30 +-
service-builder/pom.xml | 48 +-
.../server/config/builder/ServiceBuilder.java | 2 +-
.../config/listener/ConfigChangeListener.java | 3 +-
service/ApacheDS.launch | 2 -
service/pom.xml | 2 +-
.../apache/directory/server/ApacheDsService.java | 15 +-
.../org/apache/directory/server/UberjarMain.java | 25 +-
src/site/site.xml | 34 +-
test-framework/pom.xml | 36 +-
.../server/core/integ/FrameworkRunner.java | 4 +-
.../server/core/integ/TestClassServer.java | 6 +-
wrapper/pom.xml | 2 +-
.../server/wrapper/ApacheDsTanukiWrapper.java | 22 +-
xdbm-partition/pom.xml | 46 +-
.../impl/btree/AbstractBTreePartition.java | 838 ++++++++++-----------
.../directory/server/xdbm/ParentIdAndRdn.java | 29 +-
.../org/apache/directory/server/xdbm/Store.java | 24 +-
.../xdbm/search/cursor/ApproximateCursor.java | 4 +-
.../server/xdbm/search/cursor/EqualityCursor.java | 5 +-
.../server/xdbm/search/cursor/GreaterEqCursor.java | 3 +-
.../server/xdbm/search/cursor/LessEqCursor.java | 6 +-
.../server/xdbm/search/cursor/SubstringCursor.java | 5 +-
.../server/xdbm/search/evaluator/AndEvaluator.java | 72 +-
.../search/evaluator/ApproximateEvaluator.java | 9 +-
.../xdbm/search/evaluator/EqualityEvaluator.java | 71 +-
.../xdbm/search/evaluator/GreaterEqEvaluator.java | 21 +-
.../xdbm/search/evaluator/LessEqEvaluator.java | 24 +-
.../xdbm/search/evaluator/SubstringEvaluator.java | 40 +-
.../search/evaluator/SubtreeScopeEvaluator.java | 2 +-
.../server/xdbm/search/impl/CursorBuilder.java | 81 +-
.../server/xdbm/search/impl/DefaultOptimizer.java | 47 +-
.../xdbm/search/impl/DefaultSearchEngine.java | 31 +-
.../directory/server/xdbm/ParentIdAndRdnTest.java | 49 +-
.../directory/server/xdbm/PartitionTest.java | 49 +-
.../apache/directory/server/xdbm/StoreUtils.java | 112 ++-
.../server/xdbm/impl/avl/AvlPartitionTest.java | 33 +-
.../server/xdbm/search/impl/AndCursorTest.java | 2 +
.../server/xdbm/search/impl/EqualityTest.java | 29 +-
.../xdbm/search/impl/FilterNormalizingVisitor.java | 46 +-
...terEqTest.java => GreaterEqNotIndexedTest.java} | 325 +-------
.../server/xdbm/search/impl/GreaterEqTest.java | 50 +-
.../server/xdbm/search/impl/LessEqTest.java | 53 +-
.../server/xdbm/search/impl/NestedFilterTest.java | 2 +
.../server/xdbm/search/impl/NotCursorTest.java | 2 +
.../server/xdbm/search/impl/OrCursorTest.java | 2 +
.../server/xdbm/search/impl/PresenceTest.java | 23 +-
.../server/xdbm/search/impl/SubstringTest.java | 121 +--
405 files changed, 11461 insertions(+), 4794 deletions(-)
diff --cc core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
index 74cf1db,57b444c..9d7f5a9
--- a/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
+++ b/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
@@@ -1206,10 -1294,17 +1294,17 @@@ public class LdapCoreSessionConnection
int newId = messageId.incrementAndGet();
- BindOperationContext bindContext = new BindOperationContext( null );
+ BindOperationContext bindContext = new BindOperationContext( directoryService, null );
bindContext.setCredentials( bindRequest.getCredentials() );
- bindContext.setDn( bindRequest.getDn().apply( directoryService.getSchemaManager() ) );
+ Dn bindDn = bindRequest.getDn();
+
+ if ( !bindDn.isSchemaAware() )
+ {
+ bindDn = new Dn( directoryService.getSchemaManager(), bindDn );
+ }
+
+ bindContext.setDn( bindDn );
bindContext.setInterceptors( directoryService.getInterceptors( OperationEnum.BIND ) );
for ( Control control : bindRequest.getControls().values() )
diff --cc core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
index 5237313,9300d79..845715b
--- a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
+++ b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
@@@ -994,9 -993,17 +993,18 @@@ public class DefaultDirectoryService im
}
BindOperationContext bindContext = new BindOperationContext( null );
+ bindContext.setTransaction( partitionNexus.beginReadTransaction() );
bindContext.setCredentials( credentials );
- bindContext.setDn( principalDn.apply( schemaManager ) );
+
+ if ( principalDn.isSchemaAware() )
+ {
+ bindContext.setDn( principalDn );
+ }
+ else
+ {
+ bindContext.setDn( new Dn( schemaManager, principalDn ) );
+ }
+
bindContext.setInterceptors( getInterceptors( OperationEnum.BIND ) );
operationManager.bind( bindContext );
@@@ -1021,9 -1028,17 +1029,18 @@@
}
BindOperationContext bindContext = new BindOperationContext( null );
+ bindContext.setTransaction( partitionNexus.beginReadTransaction() );
bindContext.setCredentials( credentials );
- bindContext.setDn( principalDn.apply( schemaManager ) );
+
+ if ( principalDn.isSchemaAware() )
+ {
+ bindContext.setDn( principalDn );
+ }
+ else
+ {
+ bindContext.setDn( new Dn( schemaManager, principalDn ) );
+ }
+
bindContext.setSaslMechanism( saslMechanism );
bindContext.setInterceptors( getInterceptors( OperationEnum.BIND ) );
diff --cc protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
index 7192302,47e5276..43587ee
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
@@@ -108,9 -108,26 +108,27 @@@ public class BindRequestHandler extend
// create a new Bind context, with a null session, as we don't have
// any context yet.
BindOperationContext bindContext = new BindOperationContext( null );
+ bindContext.setTransaction( ldapServer.getDirectoryService().getPartitionNexus().beginReadTransaction() );
// Stores the Dn of the user to check, and its password
+ Dn bindDn = bindRequest.getDn();
+
+ if ( bindDn == null )
+ {
+ String name = bindRequest.getName();
+
+ try
+ {
+ bindDn = new Dn( directoryService.getSchemaManager(), name );
+ bindRequest.setDn( bindDn );
+ }
+ catch ( LdapInvalidDnException e )
+ {
+ // This might still be a valid DN (Windows AD binding for instance)
+ LOG.debug( "Unable to convert the name to a DN." );
+ }
+ }
+
bindContext.setDn( bindRequest.getDn() );
bindContext.setCredentials( bindRequest.getCredentials() );
bindContext.setIoSession( ldapSession.getIoSession() );
--
To stop receiving notification emails like this one, please contact
elecharny@apache.org.