Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b0fbf14e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b0fbf14e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b0fbf14e Branch: refs/heads/master Commit: b0fbf14eb6b62f6a316b8165038759136553bdbe Parents: f212608 e982ba4 Author: Michael Russo <[email protected]> Authored: Fri Jun 24 10:52:38 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Jun 24 10:52:38 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 36 ++- .../corepersistence/CpRelationManager.java | 32 ++- .../usergrid/persistence/EntityManager.java | 2 +- .../collection/EntityCollectionManager.java | 3 +- .../impl/EntityCollectionManagerImpl.java | 36 ++- .../mvcc/stage/write/WriteUniqueVerify.java | 44 ++- .../UniqueValueSerializationStrategy.java | 3 +- .../UniqueValueSerializationStrategyImpl.java | 139 ++++++++-- .../collection/EntityCollectionManagerIT.java | 5 +- ...niqueValueSerializationStrategyImplTest.java | 218 ++++++++++++++- .../graph/impl/GraphManagerImpl.java | 4 + stack/pom.xml | 2 - .../rest/management/ManagementResource.java | 4 +- .../security/SecuredResourceFilterFactory.java | 72 ++++- .../shiro/filters/BasicAuthSecurityFilter.java | 19 +- .../collection/devices/DevicesResourceIT.java | 3 +- .../usergrid/rest/management/AdminUsersIT.java | 80 ++++++ .../management/AccountCreationProps.java | 3 +- .../usergrid/management/ManagementService.java | 6 +- .../cassandra/AccountCreationPropsImpl.java | 17 +- .../cassandra/ManagementServiceImpl.java | 65 ++--- .../apache/usergrid/security/shiro/Realm.java | 6 + .../shiro/principals/AdminUserPrincipal.java | 4 +- .../services/AbstractCollectionService.java | 49 ++-- .../services/AbstractConnectionsService.java | 6 +- .../services/devices/DevicesService.java | 2 + .../usergrid/management/OrganizationIT.java | 2 +- .../cassandra/ManagementServiceIT.java | 6 +- stack/tools/pom.xml | 1 + .../org/apache/usergrid/tools/ToolBase.java | 28 +- .../usergrid/tools/UniqueValueScanner.java | 276 +++++++++++++++++++ .../main/resources/toolsApplicationContext.xml | 7 + 32 files changed, 1010 insertions(+), 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/b0fbf14e/stack/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/b0fbf14e/stack/tools/pom.xml ----------------------------------------------------------------------
