Merge commit 'refs/pull/542/head' of github.com:apache/usergrid into apigee-sso-provider
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b21e4778 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b21e4778 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b21e4778 Branch: refs/heads/apigee-sso-provider Commit: b21e477807ea11e167bdd3ad2cd53e8d8d21c1c8 Parents: ead9e89 c60aaa7 Author: Michael Russo <[email protected]> Authored: Fri Jun 24 11:06:31 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Jun 24 11:06:31 2016 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 30 ++- .../rest/management/ManagementResource.java | 7 +- .../organizations/OrganizationsResource.java | 6 +- .../rest/management/users/UserResource.java | 25 +- .../rest/management/users/UsersResource.java | 7 +- .../rest/management/ManagementResourceIT.java | 10 +- stack/services/pom.xml | 7 + .../tokens/cassandra/TokenServiceImpl.java | 255 +++--------------- .../externalProviders/ApigeeSSO2Provider.java | 108 ++++++++ .../ExternalTokenProvider.java | 17 ++ .../externalProviders/UsergridCentral.java | 259 +++++++++++++++++++ .../resources/usergrid-services-context.xml | 7 + 12 files changed, 486 insertions(+), 252 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/b21e4778/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java ----------------------------------------------------------------------
