Merge branch 'master' into jpa
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/a2441c5e Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/a2441c5e Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/a2441c5e Branch: refs/heads/master Commit: a2441c5e4186ee18ec1a907cec193c327ece1a6f Parents: 8fd7112 78d822d Author: Martin Stockhammer <marti...@apache.org> Authored: Sun Oct 16 20:09:01 2016 +0200 Committer: Martin Stockhammer <marti...@apache.org> Committed: Sun Oct 16 20:09:01 2016 +0200 ---------------------------------------------------------------------- .../DefaultAuthenticationManager.java | 138 ++++++++----------- .../users/UserManagerAuthenticator.java | 6 + .../ldap/connection/DefaultLdapConnection.java | 20 +-- .../keystore/KeyStoreAuthenticator.java | 6 + .../redback/keys/KeyManagerTestCase.java | 4 - 5 files changed, 75 insertions(+), 99 deletions(-) ----------------------------------------------------------------------