usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [01/50] [abbrv] usergrid git commit: Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid into SSO2-Usergrid
Date Mon, 01 Aug 2016 16:53:36 GMT
Repository: usergrid
Updated Branches:
  refs/heads/master 1e11464c7 -> 1d65496c0


Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid into SSO2-Usergrid


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

Branch: refs/heads/master
Commit: 87dad4977d5541ebe31ef120eba399b2eb17f9b1
Parents: 6756035 6c36882
Author: Ayesha Dastagiri <ayesha.amrin@gmail.com>
Authored: Fri Jun 24 17:03:10 2016 -0700
Committer: Ayesha Dastagiri <ayesha.amrin@gmail.com>
Committed: Fri Jun 24 17:03:10 2016 -0700

----------------------------------------------------------------------
 stack/README.md                                 |   2 +-
 .../main/resources/usergrid-default.properties  |   8 +-
 .../rest/management/ManagementResource.java     |  56 +++-
 .../security/sso/ApigeeSSO2Provider.java        | 167 ++++++++++++
 .../security/sso/ExternalSSOProvider.java       |  22 ++
 .../security/sso/SSOProviderFactory.java        |  57 ++++
 .../security/sso/UsergridExternalProvider.java  | 263 +++++++++++++++++++
 .../tokens/cassandra/TokenServiceImpl.java      |  74 ++++--
 .../externalProviders/ApigeeSSO2Provider.java   | 108 --------
 .../ExternalTokenProvider.java                  |  17 --
 .../externalProviders/UsergridCentral.java      | 259 ------------------
 .../resources/usergrid-services-context.xml     |  13 +-
 12 files changed, 624 insertions(+), 422 deletions(-)
----------------------------------------------------------------------



Mime
View raw message