Merge commit 'refs/pull/459/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/ce31acd7 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ce31acd7 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ce31acd7 Branch: refs/heads/master Commit: ce31acd7203e8bb0ee4055fb840d6d59aa417dcc Parents: 5bca094 35ff17f Author: Michael Russo <[email protected]> Authored: Fri Jan 8 20:20:49 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Jan 8 20:20:49 2016 -0800 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 4 + .../corepersistence/CpEntityManagerFactory.java | 2 +- .../corepersistence/util/CpNamingUtils.java | 23 +- .../org/apache/usergrid/utils/MapUtils.java | 6 + .../organizations/OrganizationResource.java | 72 +++- .../organizations/users/UsersResource.java | 4 +- .../rest/management/users/UserResource.java | 6 +- .../rest/management/users/UsersResource.java | 4 +- .../usergrid/management/ManagementService.java | 26 +- .../usergrid/management/OrganizationConfig.java | 201 +++++++--- .../management/OrganizationConfigProps.java | 45 +++ .../cassandra/ManagementServiceImpl.java | 400 ++++++++++++------- .../cassandra/OrganizationConfigPropsImpl.java | 109 +++++ .../usergrid/security/tokens/TokenInfo.java | 19 + .../usergrid/security/tokens/TokenService.java | 9 +- .../tokens/cassandra/TokenServiceImpl.java | 43 +- .../migration/AppInfoMigrationPluginTest.java | 2 +- .../management/OrganizationConfigIT.java | 109 +++++ .../usergrid/management/OrganizationIT.java | 4 +- .../cassandra/ManagementServiceIT.java | 2 +- .../management/importer/ImportServiceIT.java | 2 +- .../security/providers/FacebookProviderIT.java | 2 +- .../providers/PingIdentityProviderIT.java | 2 +- 23 files changed, 831 insertions(+), 265 deletions(-) ----------------------------------------------------------------------
