merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b85ff25e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b85ff25e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b85ff25e Branch: refs/heads/two-dot-o-dev Commit: b85ff25ecec5f1ba7d8046297006ca76ff59695e Parents: 6b3a877 db425d5 Author: Shawn Feldman <sfeld...@apache.org> Authored: Thu May 28 15:44:57 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Thu May 28 15:44:57 2015 -0600 ---------------------------------------------------------------------- README.md | 2 +- docs/file-storage-configuration.md | 39 ++ docs/get_2.0_running_locally.md | 165 ++++++ docs/index.md | 3 +- .../main/resources/usergrid-default.properties | 24 +- .../persistence/cassandra/CassandraService.java | 54 +- .../org/apache/usergrid/utils/JsonUtils.java | 2 +- stack/pom.xml | 28 +- .../rest/applications/ServiceResource.java | 2 +- .../rest/management/ManagementResource.java | 403 ++++++++++++++- .../organizations/OrganizationsResource.java | 20 +- .../rest/management/users/UserResource.java | 42 ++ .../rest/management/users/UsersResource.java | 45 +- .../OAuth2AccessTokenSecurityFilter.java | 4 + .../applications/assets/AssetResourceIT.java | 302 +++++++---- .../rest/applications/utils/UserRepo.java | 36 +- .../rest/filters/ContentTypeResourceIT.java | 177 +++---- .../rest/management/ManagementResourceIT.java | 513 ++++++++++++++++++- .../rest/management/RegistrationIT.java | 441 ++++++++-------- .../rest/test/PropertiesResourceIT.java | 23 +- .../test/resource2point0/AbstractRestIT.java | 2 - .../rest/test/resource2point0/ClientSetup.java | 19 +- .../src/test/resources/cat-larger-than-6mb.jpg | Bin 0 -> 9799257 bytes stack/rest/src/test/resources/log4j.properties | 3 +- stack/services/pom.xml | 21 + .../usergrid/management/ManagementService.java | 5 +- .../cassandra/ManagementServiceImpl.java | 7 + .../management/export/S3ExportImpl.java | 7 + .../apache/usergrid/security/shiro/Realm.java | 10 +- .../usergrid/security/tokens/TokenService.java | 3 + .../tokens/cassandra/TokenServiceImpl.java | 44 +- .../assets/data/AwsSdkS3BinaryStore.java | 230 +++++++++ .../services/assets/data/S3BinaryStore.java | 268 +++++++--- .../usergrid/management/importer/S3Upload.java | 9 +- .../security/tokens/TokenServiceIT.java | 42 ++ .../setup/ConcurrentProcessSingleton.java | 8 +- ugc/README.md | 2 +- 37 files changed, 2313 insertions(+), 692 deletions(-) ----------------------------------------------------------------------
