Merge branch 'master' into datastax-cass-driver
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5095891d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5095891d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5095891d Branch: refs/heads/datastax-cass-driver Commit: 5095891dd3882adb33a5b50eeab1748c6e3d9df1 Parents: 32782a3 f9196037 Author: Michael Russo <[email protected]> Authored: Wed Aug 17 14:16:35 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Aug 17 14:16:35 2016 -0700 ---------------------------------------------------------------------- .../Usergrid.Sdk.IntegrationTests/BaseTest.cs | 23 +- .../EntityPagingTests.cs | 2 +- .../Usergrid.Sdk.IntegrationTests/GroupTests.cs | 4 +- .../Usergrid.Sdk.IntegrationTests/LoginTests.cs | 12 +- .../Usergrid.Sdk.IntegrationTests.dll.config | 1 + .../usergrid/java/client/UsergridClient.java | 2 + .../java/client/UsergridRequestManager.java | 13 +- .../usergrid/java/client/auth/UsergridAuth.java | 1 + .../java/client/auth/UsergridUserAuth.java | 16 +- .../java/client/model/UsergridEntity.java | 2 +- .../java/client/query/UsergridQuery.java | 11 +- sdks/python/.gitignore | 57 + sdks/python/GUIDE.md | 2 + sdks/python/LICENSE | 202 ++ sdks/python/README.md | 16 + sdks/python/README.rst | 20 + sdks/python/sample_app.py | 77 + sdks/python/setup.py | 51 + sdks/python/usergrid/UsergridApplication.py | 65 + sdks/python/usergrid/UsergridAuth.py | 105 + sdks/python/usergrid/UsergridClient.py | 401 ++++ sdks/python/usergrid/UsergridCollection.py | 82 + sdks/python/usergrid/UsergridConnection.py | 30 + sdks/python/usergrid/UsergridError.py | 21 + sdks/python/usergrid/UsergridOrganization.py | 35 + sdks/python/usergrid/UsergridQueryIterator.py | 157 ++ sdks/python/usergrid/__init__.py | 37 + sdks/python/usergrid/app_templates.py | 38 + sdks/python/usergrid/management_templates.py | 27 + stack/README.md | 2 +- .../main/resources/usergrid-default.properties | 37 +- .../batch/service/JobSchedulerService.java | 4 +- .../corepersistence/CpEntityManager.java | 33 +- .../corepersistence/CpEntityManagerFactory.java | 13 +- .../corepersistence/CpRelationManager.java | 55 +- .../pipeline/builder/IdBuilder.java | 20 +- .../pipeline/read/FilterFactory.java | 8 + .../AbstractReadReverseGraphFilter.java | 291 +++ .../ReadGraphReverseConnectionFilter.java | 53 + .../service/ConnectionSearch.java | 8 +- .../service/ConnectionServiceImpl.java | 9 +- .../usergrid/mq/cassandra/CassandraMQUtils.java | 4 +- .../usergrid/persistence/PersistenceModule.java | 12 +- .../org/apache/usergrid/persistence/Query.java | 39 +- .../corepersistence/index/IndexServiceTest.java | 4 - .../persistence/EntityConnectionsIT.java | 65 +- .../actorsystem/ActorSystemManager.java | 9 +- .../actorsystem/ActorSystemManagerImpl.java | 40 +- .../persistence/actorsystem/RouterProducer.java | 28 +- .../actorsystem/ActorServiceServiceTest.java | 8 +- .../uniquevalues/UniqueValuesFig.java | 19 +- .../uniquevalues/UniqueValuesServiceImpl.java | 127 +- .../collection/AbstractUniqueValueTest.java | 4 - .../index/impl/EsEntityIndexImpl.java | 53 +- .../persistence/index/impl/EntityIndexTest.java | 12 +- stack/pom.xml | 2 +- stack/query-validator/pom.xml | 32 +- .../query/validator/ApiServerRunner.java | 103 +- .../query/validator/AbstractQueryIT.java | 26 +- .../usergrid/query/validator/QueryITSuite.java | 12 +- .../query/validator/users/UserQueryIT.java | 56 +- .../test/resources/usergrid-test-context.xml | 5 +- stack/rest/pom.xml | 8 + .../usergrid/rest/AbstractContextResource.java | 16 + .../applications/events/EventsResource.java | 6 +- .../usergrid/rest/exceptions/AuthErrorInfo.java | 1 + .../rest/exceptions/RuntimeExceptionMapper.java | 43 + .../rest/management/ManagementResource.java | 180 +- .../organizations/OrganizationsResource.java | 46 +- .../organizations/users/UsersResource.java | 59 +- .../rest/management/users/UserResource.java | 86 +- .../rest/management/users/UsersResource.java | 54 +- .../organizations/OrganizationsResource.java | 24 + .../security/SecuredResourceFilterFactory.java | 16 +- .../shiro/filters/BasicAuthSecurityFilter.java | 3 + .../ClientCredentialsSecurityFilter.java | 4 + .../OAuth2AccessTokenSecurityFilter.java | 10 +- .../security/shiro/filters/SecurityFilter.java | 12 + .../java/org/apache/usergrid/rest/ITSetup.java | 56 +- .../applications/events/EventsResourceIT.java | 32 +- .../rest/management/ExternalSSOEnabledIT.java | 175 ++ .../rest/management/ManagementResourceIT.java | 38 +- stack/services/pom.xml | 7 + .../usergrid/management/ManagementService.java | 19 +- .../cassandra/AccountCreationPropsImpl.java | 4 +- .../cassandra/ManagementServiceImpl.java | 77 +- ...alSSOProviderAdminUserNotFoundException.java | 28 + .../security/shiro/utils/SubjectUtils.java | 32 +- .../security/sso/ApigeeSSO2Provider.java | 220 ++ .../security/sso/ExternalSSOProvider.java | 42 + .../security/sso/SSOProviderFactory.java | 85 + .../security/sso/UsergridExternalProvider.java | 291 +++ .../usergrid/security/tokens/TokenService.java | 10 +- .../tokens/cassandra/TokenServiceImpl.java | 284 +-- .../services/AbstractConnectionsService.java | 37 +- .../AbstractPathBasedCollectionService.java | 153 ++ .../AbstractPathBasedColllectionService.java | 153 -- .../usergrid/services/assets/AssetsService.java | 4 +- .../usergrid/services/groups/GroupsService.java | 4 +- .../resources/usergrid-services-context.xml | 14 + .../usergrid/services/ConnectionsServiceIT.java | 74 +- utils/usergrid-util-python/.gitignore | 61 + utils/usergrid-util-python/LICENSE | 202 ++ utils/usergrid-util-python/README.md | 15 + .../es_tools/alias_mover.py | 72 + .../es_tools/cluster_shard_allocation.py | 111 + .../es_tools/command_sender.py | 52 + .../es_tools/es_index_iterator_reindexer.py | 128 + .../es_tools/es_searcher.py | 45 + .../es_tools/index_deleter.py | 98 + .../es_tools/index_prefix_checker.py | 100 + .../es_tools/index_replica_setter.py | 124 + .../es_tools/index_shard_allocator.py | 149 ++ .../es_tools/mapping_deleter.py | 53 + .../es_tools/mapping_retriever.py | 64 + .../es_tools/monitor_tasks.py | 61 + utils/usergrid-util-python/index_test/README.md | 1 + .../index_test/document_creator.py | 276 +++ .../index_test/index_test_mixed_batch.py | 552 +++++ .../index_test/index_test_single_type_batch.py | 555 +++++ utils/usergrid-util-python/requirements.txt | 4 + .../activity_streams/activity_streams.py | 154 ++ .../samples/beacon-event-example.py | 238 ++ .../samples/counter_test.py | 52 + utils/usergrid-util-python/setup.py | 59 + .../usergrid_tools/__init__.py | 4 + .../usergrid_tools/general/__init__.py | 21 + .../usergrid_tools/general/deleter.py | 170 ++ .../general/duplicate_name_checker.py | 47 + .../usergrid_tools/general/queue_monitor.py | 138 ++ .../usergrid_tools/general/url_tester.py | 108 + .../general/user_confirm_activate.py | 51 + .../usergrid_tools/groups/__init__.py | 2 + .../usergrid_tools/groups/big_group_creater.py | 100 + .../usergrid_tools/indexing/README.md | 22 + .../usergrid_tools/indexing/__init__.py | 21 + .../usergrid_tools/indexing/batch_index_test.py | 362 +++ .../indexing/entity_index_test.py | 339 +++ .../usergrid_tools/iterators/README.md | 8 + .../usergrid_tools/iterators/__init__.py | 18 + .../usergrid_tools/iterators/simple_iterator.py | 101 + .../iterators/usergrid_cross_region_iterator.py | 425 ++++ .../iterators/usergrid_iterator.py | 504 ++++ .../usergrid_tools/library_check.py | 45 + .../usergrid_tools/migration/README.md | 234 ++ .../usergrid_tools/migration/__init__.py | 24 + .../migration/usergrid_data_exporter.py | 943 ++++++++ .../migration/usergrid_data_migrator.py | 2186 ++++++++++++++++++ .../usergrid_tools/parse_importer/README.md | 90 + .../usergrid_tools/parse_importer/__init__.py | 21 + .../parse_importer/parse_importer.py | 404 ++++ .../usergrid_tools/permissions/README.md | 3 + .../usergrid_tools/permissions/permissions.py | 168 ++ .../usergrid_tools/queue/README.md | 1 + .../queue/dlq-iterator-checker.py | 162 ++ .../usergrid_tools/queue/dlq_requeue.py | 192 ++ .../queue/queue-config-sample.json | 22 + .../usergrid_tools/queue/queue_cleaner.py | 174 ++ .../usergrid_tools/redis/redis_iterator.py | 52 + .../usergrid_tools/redis/redisscan.py | 37 + 160 files changed, 14501 insertions(+), 1034 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/5095891d/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/5095891d/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/5095891d/stack/pom.xml ----------------------------------------------------------------------
