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 2019/04/09 22:15:57 UTC

[directory-server] 01/01: Merge pull request #14 from apache/caffeine

This is an automated email from the ASF dual-hosted git repository.

seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git

commit 0f043fb8bdaf81982ad36641a8dbb64bd2035933
Merge: 05a5ab7 f9c25f9
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Wed Apr 10 00:15:51 2019 +0200

    Merge pull request #14 from apache/caffeine
    
    Replace ehcache with caffeine

 .../server/core/factory/DSAnnotationProcessor.java |   3 -
 .../factory/DefaultDirectoryServiceFactory.java    |   6 -
 core-api/pom.xml                                   |  18 +-
 .../directory/server/core/api/CacheService.java    | 219 -----------------
 .../server/core/api/DirectoryService.java          |  14 --
 .../core/api/partition/AbstractPartition.java      |  14 --
 .../server/core/api/partition/Partition.java       |   8 -
 .../server/core/api/schema/SchemaPartition.java    |   9 -
 .../src/main/resources/directory-cacheservice.xml  | 268 ---------------------
 .../server/core/api/MockDirectoryService.java      |  15 --
 core-shared/pom.xml                                |   7 +-
 .../server/core/shared/DefaultDnFactory.java       |  14 +-
 .../shared/partition/DefaultPartitionNexus.java    |   1 -
 .../server/core/DefaultDirectoryService.java       |  38 +--
 interceptors/authz/pom.xml                         |   5 -
 .../directory/server/core/authz/GroupCache.java    |  55 ++---
 interceptors/subtree/pom.xml                       |   7 +-
 .../server/core/subtree/SubtreeEvaluatorTest.java  |  13 +-
 jdbm-partition/pom.xml                             |   2 +-
 .../partition/impl/btree/jdbm/JdbmPartition.java   |  26 +-
 .../partition/impl/btree/jdbm/JdbmStoreTest.java   |   9 +-
 .../core/partition/tree/PartitionTreeTest.java     |   6 +-
 kerberos-codec/pom.xml                             |   6 +-
 .../kerberos/shared/replay/ReplayCacheImpl.java    |  38 +--
 .../shared/replay/ReplayCacheImplTest.java         | 100 ++++----
 .../core/partition/ldif/LdifPartitionTest.java     |   8 +-
 ...SingleFileLdifPartitionSingeValueAttribute.java |   9 +-
 .../ldif/SingleFileLdifPartitionTest.java          |   9 +-
 mavibot-partition/pom.xml                          |   2 +-
 .../impl/btree/mavibot/MavibotPartition.java       |  19 +-
 .../impl/btree/mavibot/MavibotStoreTest.java       |   9 +-
 .../osgi/integ/ServerCoreAnnotationsOsgiTest.java  |   1 +
 .../server/osgi/integ/ServerCoreApiOsgiTest.java   |   2 -
 .../osgi/integ/ServerCoreSharedOsgiTest.java       |   9 +-
 .../osgi/integ/ServerJdbmPartitionOsgiTest.java    |   2 +-
 .../osgi/integ/ServerMavibotPartitionOsgiTest.java |   2 +-
 pom.xml                                            |  19 +-
 .../server/changepw/ChangePasswordServer.java      |   2 -
 protocol-kerberos/pom.xml                          |   6 +-
 .../kerberos/changepwd/ChangePasswordServer.java   |   5 +-
 .../directory/server/kerberos/kdc/KdcServer.java   |   5 +-
 .../server/config/ConfigPartitionInitializer.java  |   7 +-
 .../config/ChangePasswordConfigReaderTest.java     |   8 +-
 .../server/config/ConfigPartitionReaderTest.java   |   8 +-
 .../directory/server/config/ConfigWriterTest.java  |   8 +-
 .../server/config/HttpServerConfigReaderTest.java  |   8 +-
 .../config/KerberosServerConfigReaderTest.java     |   8 +-
 .../server/config/LdapServerConfigReaderTest.java  |   8 +-
 .../server/replication/ClientInitialRefreshIT.java |   2 +-
 .../apache/directory/server/ApacheDsService.java   |  36 +--
 xdbm-partition/pom.xml                             |   3 +-
 .../impl/btree/AbstractBTreePartition.java         |  49 ++--
 .../org/apache/directory/server/xdbm/Store.java    |   4 +-
 .../search/evaluator/SubtreeScopeEvaluator.java    |   2 +-
 .../xdbm/search/impl/DefaultSearchEngine.java      |   2 +-
 .../directory/server/xdbm/PartitionTest.java       |   6 -
 .../server/xdbm/impl/avl/AvlPartitionTest.java     |   8 +-
 .../server/xdbm/search/impl/AndCursorTest.java     |   6 -
 .../server/xdbm/search/impl/EqualityTest.java      |   8 +-
 .../xdbm/search/impl/GreaterEqNotIndexedTest.java  |   8 +-
 .../server/xdbm/search/impl/GreaterEqTest.java     |   9 +-
 .../server/xdbm/search/impl/LessEqTest.java        |   9 +-
 .../server/xdbm/search/impl/NestedFilterTest.java  |   5 -
 .../server/xdbm/search/impl/NotCursorTest.java     |   5 -
 .../server/xdbm/search/impl/OrCursorTest.java      |   5 -
 .../server/xdbm/search/impl/PresenceTest.java      |  12 +-
 .../server/xdbm/search/impl/SubstringTest.java     |   9 +-
 67 files changed, 219 insertions(+), 1034 deletions(-)