Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Ensure the admin invited to org email is sent even when external SSO is enabled. Configurable Password Policy and 5 supporting JUnit tests. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cb0dc69d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cb0dc69d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cb0dc69d Branch: refs/heads/asf-site Commit: cb0dc69da29f578c06fd5a7bea7da302756ffd56 Parents: 1abafe7 48d306f Author: Dave Johnson <snoopd...@apache.org> Authored: Thu Oct 20 16:45:26 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Thu Oct 20 16:45:26 2016 -0400 ---------------------------------------------------------------------- .../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 | 77 ++++++--- .../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, 751 insertions(+), 29 deletions(-) ----------------------------------------------------------------------