Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into 
usergrid-1318-queue

* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid:
  allow no password when creating admin users when SSO-enabled
  Load properties into Guice by using the getProperty method instead of generic 
putAll from Map superclass as it getProperty could be overridden
  add count to paged organizations get, and fix limit=1000
  Refactor superuser authentication/login such that permissions are handled 
more appropriately, allowing access to all parts of the system.
  Enhance superuser basic auth filter to login to shiro with a token just like 
the sysadmin tokens.
  Adding paging to get all orgs endpoint.  Enhance Akka cluster so it properly 
downs nodes that are restarted but still ok on the network. Don't load all orgs 
when validating sysadmin creds.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/447b60d4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/447b60d4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/447b60d4

Branch: refs/heads/usergrid-1318-queue
Commit: 447b60d4364c9f705a1350f11288dbad6ed3673c
Parents: 483ca0f 9947d48
Author: Dave Johnson <snoopd...@apache.org>
Authored: Fri Sep 16 07:49:02 2016 -0400
Committer: Dave Johnson <snoopd...@apache.org>
Committed: Fri Sep 16 07:49:02 2016 -0400

----------------------------------------------------------------------
 .../actorsystem/ActorSystemManagerImpl.java     |  15 ++-
 .../actorsystem/ClusterListener.java            | 107 +++++++++++++++++++
 .../organizations/OrganizationsResource.java    |  48 +++++++--
 .../security/SecuredResourceFilterFactory.java  |  35 +++---
 .../shiro/filters/BasicAuthSecurityFilter.java  |  54 ++++++++--
 .../rest/applications/ApplicationDeleteIT.java  |   1 -
 .../usergrid/rest/applications/SecurityIT.java  |  31 ++++++
 .../activities/ActivityResourceIT.java          |   5 -
 .../test/resource/endpoints/NamedResource.java  |   9 ++
 .../cassandra/ManagementServiceImpl.java        |   5 +-
 .../AbstractPasswordCredentials.java            |   3 +-
 .../shiro/credentials/AdminUserPassword.java    |   2 +
 .../shiro/principals/AdminUserPrincipal.java    |  25 +----
 .../usergrid/services/AbstractService.java      |   8 ++
 14 files changed, 284 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


Reply via email to