Merge commit 'refs/pull/560/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/04e49da5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/04e49da5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/04e49da5 Branch: refs/heads/usergrid-1318-queue Commit: 04e49da589ec303efd03939a6faf21fb3aee0760 Parents: 9c5f599 a30e1a5 Author: Michael Russo <mru...@apigee.com> Authored: Thu Oct 20 10:21:53 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Thu Oct 20 10:21:53 2016 -0700 ---------------------------------------------------------------------- .../exceptions/AbstractExceptionMapper.java | 2 +- .../PasswordPolicyViolationExceptionMapper.java | 48 ++++++ .../collection/users/PermissionsResourceIT.java | 4 +- .../collection/users/UserResourceIT.java | 38 ++++- .../usergrid/rest/management/AdminUsersIT.java | 51 ++++++ .../rest/management/ManagementResourceIT.java | 4 +- .../rest/management/RegistrationIT.java | 6 +- .../cassandra/ManagementServiceImpl.java | 73 +++++++-- .../usergrid/security/PasswordPolicy.java | 53 ++++++ .../usergrid/security/PasswordPolicyFig.java | 79 +++++++++ .../usergrid/security/PasswordPolicyImpl.java | 156 ++++++++++++++++++ .../PasswordPolicyViolationException.java | 46 ++++++ .../services/guice/ServiceModuleImpl.java | 8 + .../usergrid/security/PasswordPolicyTest.java | 47 ++++++ .../security/PasswordPolicyTestFig.java | 161 +++++++++++++++++++ 15 files changed, 750 insertions(+), 26 deletions(-) ----------------------------------------------------------------------