Merge commit 'refs/pull/573/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/375814e0 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/375814e0 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/375814e0 Branch: refs/heads/master Commit: 375814e00330f28b4209c7595ed591187abbb245 Parents: d8a7e10 c0ba710 Author: Michael Russo <russomich...@google.com> Authored: Mon Jun 19 12:58:30 2017 -0700 Committer: Michael Russo <russomich...@google.com> Committed: Mon Jun 19 12:58:30 2017 -0700 ---------------------------------------------------------------------- .../src/test/resources/usergrid-test.properties | 2 - stack/core/pom.xml | 6 + .../usergrid/corepersistence/CoreModule.java | 3 +- .../usergrid/corepersistence/CpSetup.java | 11 - .../persistence/cassandra/CassandraService.java | 3 - .../map/impl/MapSerializationImpl.java | 35 +- stack/corepersistence/pom.xml | 1 + stack/corepersistence/token/pom.xml | 70 ++ .../persistence/token/TokenSerialization.java | 50 ++ .../persistence/token/guice/TokenModule.java | 44 + .../token/impl/TokenSerializationImpl.java | 451 ++++++++++ .../persistence/token/TestTokenModule.java | 38 + .../token/TokenSerializationTest.java | 202 +++++ .../token/src/test/resources/log4j.properties | 38 + .../resources/usergrid-standalone.properties | 2 - .../rest/management/ManagementResource.java | 4 +- .../rest/management/users/UserResource.java | 2 +- .../rest/management/users/UsersResource.java | 3 +- .../rest/management/ManagementResourceIT.java | 8 +- .../security/sso/SSOProviderFactory.java | 2 +- .../tokens/cassandra/TokenServiceImpl.java | 848 ------------------- .../security/tokens/impl/TokenServiceImpl.java | 748 ++++++++++++++++ .../notifications/InactiveDeviceManager.java | 6 - .../resources/usergrid-services-context.xml | 3 +- .../security/tokens/TokenServiceIT.java | 2 +- .../test/resources/testApplicationContext.xml | 2 +- 26 files changed, 1680 insertions(+), 904 deletions(-) ----------------------------------------------------------------------
