You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/04 01:40:58 UTC
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
github.com:apache/incubator-usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of github.com:apache/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a7ca17ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a7ca17ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a7ca17ff
Branch: refs/heads/two-dot-o-dev
Commit: a7ca17ff1af6fe847aa01ccefba482c38da84645
Parents: 7d448b0 2a7ace7
Author: Jeff West <jw...@apigee.com>
Authored: Wed Jun 3 14:04:24 2015 -0700
Committer: Jeff West <jw...@apigee.com>
Committed: Wed Jun 3 14:04:24 2015 -0700
----------------------------------------------------------------------
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 +-
.../corepersistence/CpEntityManager.java | 113 +++--
.../corepersistence/CpEntityManagerFactory.java | 80 ++--
.../corepersistence/CpRelationManager.java | 219 +++++----
.../asyncevents/AmazonAsyncEventService.java | 426 ++++++++++++++++++
.../asyncevents/AsyncIndexProvider.java | 38 +-
.../asyncevents/EventBuilderImpl.java | 23 +-
.../asyncevents/InMemoryAsyncEventService.java | 1 -
.../asyncevents/SQSAsyncEventService.java | 356 ---------------
.../asyncevents/model/AsyncEvent.java | 117 +++++
.../asyncevents/model/EdgeDeleteEvent.java | 45 ++
.../asyncevents/model/EdgeIndexEvent.java | 46 ++
.../asyncevents/model/EntityDeleteEvent.java | 36 ++
.../asyncevents/model/EntityIndexEvent.java | 39 ++
.../index/IndexProcessorFig.java | 13 +-
.../corepersistence/index/IndexService.java | 5 +-
.../corepersistence/index/IndexServiceImpl.java | 120 +++--
.../corepersistence/index/ReIndexService.java | 4 +-
.../index/ReIndexServiceImpl.java | 2 +-
.../corepersistence/pipeline/Pipeline.java | 93 ++--
.../pipeline/PipelineBuilderFactory.java | 39 --
.../pipeline/PipelineModule.java | 20 +-
.../pipeline/PipelineOperation.java | 2 +-
.../pipeline/PipelineOperations.java | 30 ++
.../pipeline/builder/CandidateBuilder.java | 67 +++
.../pipeline/builder/ConnectionRefBuilder.java | 53 +++
.../pipeline/builder/EntityBuilder.java | 54 +++
.../pipeline/builder/IdBuilder.java | 151 +++++++
.../pipeline/builder/PipelineBuilder.java | 100 +++++
.../builder/PipelineBuilderFactory.java | 35 ++
.../pipeline/read/AbstractFilter.java | 2 +-
.../pipeline/read/AbstractPathFilter.java | 2 +-
.../pipeline/read/Collector.java | 38 --
.../pipeline/read/CollectorFactory.java | 38 --
.../corepersistence/pipeline/read/Filter.java | 31 --
.../pipeline/read/FilterFactory.java | 74 +--
.../pipeline/read/ReadFilterFactoryImpl.java | 136 ------
.../pipeline/read/ReadPipelineBuilder.java | 104 -----
.../pipeline/read/ReadPipelineBuilderImpl.java | 296 ------------
.../pipeline/read/ResultsPage.java | 10 +-
.../read/collect/AbstractCollector.java | 46 --
.../read/collect/ConnectionRefFilter.java | 68 +++
.../read/collect/ConnectionRefResumeFilter.java | 86 ++++
.../pipeline/read/collect/EntityFilter.java | 68 ---
.../read/collect/EntityResumeFilter.java | 67 +++
.../pipeline/read/collect/IdResumeFilter.java | 61 +++
.../read/collect/ResultsPageCollector.java | 35 +-
.../AbstractElasticSearchFilter.java | 171 -------
.../pipeline/read/elasticsearch/Candidate.java | 55 ---
.../elasticsearch/CandidateEntityFilter.java | 234 ----------
.../read/elasticsearch/CandidateIdFilter.java | 201 ---------
.../ElasticSearchCollectionFilter.java | 77 ----
.../ElasticSearchConnectionFilter.java | 73 ---
.../ElasticsearchCursorSerializer.java | 42 --
.../read/elasticsearch/Elasticsearchdiagram.jpg | Bin 316655 -> 0 bytes
.../graph/AbstractReadGraphEdgeByIdFilter.java | 82 ----
.../read/graph/AbstractReadGraphFilter.java | 147 ------
.../read/graph/EdgeCursorSerializer.java | 42 --
.../pipeline/read/graph/EntityIdFilter.java | 54 ---
.../pipeline/read/graph/EntityLoadFilter.java | 155 -------
.../pipeline/read/graph/GraphDiagram.jpg | Bin 347711 -> 0 bytes
.../graph/ReadGraphCollectionByIdFilter.java | 49 --
.../read/graph/ReadGraphCollectionFilter.java | 53 ---
.../graph/ReadGraphConnectionByIdFilter.java | 50 ---
.../graph/ReadGraphConnectionByTypeFilter.java | 100 -----
.../read/graph/ReadGraphConnectionFilter.java | 53 ---
.../search/AbstractElasticSearchFilter.java | 168 +++++++
.../pipeline/read/search/Candidate.java | 64 +++
.../read/search/CandidateEntityFilter.java | 250 +++++++++++
.../pipeline/read/search/CandidateIdFilter.java | 190 ++++++++
.../search/ElasticsearchCursorSerializer.java | 40 ++
.../read/search/Elasticsearchdiagram.jpg | Bin 0 -> 316655 bytes
.../read/search/SearchCollectionFilter.java | 77 ++++
.../read/search/SearchConnectionFilter.java | 72 +++
.../AbstractReadGraphEdgeByIdFilter.java | 82 ++++
.../read/traverse/AbstractReadGraphFilter.java | 146 ++++++
.../read/traverse/EdgeCursorSerializer.java | 42 ++
.../pipeline/read/traverse/EntityIdFilter.java | 53 +++
.../read/traverse/EntityLoadVerifyFilter.java | 154 +++++++
.../pipeline/read/traverse/GraphDiagram.jpg | Bin 0 -> 347711 bytes
.../traverse/ReadGraphCollectionByIdFilter.java | 49 ++
.../traverse/ReadGraphCollectionFilter.java | 53 +++
.../traverse/ReadGraphConnectionByIdFilter.java | 50 +++
.../ReadGraphConnectionByTypeFilter.java | 99 ++++
.../traverse/ReadGraphConnectionFilter.java | 53 +++
.../results/ConnectionRefQueryExecutor.java | 60 +++
.../results/EntityQueryExecutor.java | 84 ++++
.../results/ObservableQueryExecutor.java | 52 +--
.../corepersistence/results/QueryExecutor.java | 1 +
.../corepersistence/util/CpNamingUtils.java | 18 +-
.../org/apache/usergrid/persistence/Query.java | 8 +-
.../persistence/cassandra/CassandraService.java | 54 +--
.../org/apache/usergrid/utils/JsonUtils.java | 2 +-
.../org/apache/usergrid/utils/UUIDUtils.java | 32 +-
.../corepersistence/StaleIndexCleanupTest.java | 8 +-
.../index/AmazonAsyncEventServiceTest.java | 84 ++++
.../corepersistence/index/IndexServiceTest.java | 202 ++++++++-
.../index/SQSAsyncEventServiceTest.java | 84 ----
.../pipeline/cursor/CursorTest.java | 4 +-
.../apache/usergrid/persistence/CounterIT.java | 6 +
.../usergrid/persistence/EntityManagerIT.java | 67 ++-
.../org/apache/usergrid/persistence/GeoIT.java | 4 +-
.../apache/usergrid/persistence/IndexIT.java | 44 +-
.../cassandra/EntityManagerFactoryImplIT.java | 66 +--
.../apache/usergrid/utils/UUIDUtilsTest.java | 26 +-
stack/core/src/test/resources/log4j.properties | 1 +
.../mvcc/stage/delete/UniqueCleanup.java | 18 +-
.../persistence/model/field/AbstractField.java | 1 +
.../usergrid/persistence/model/field/Field.java | 13 +-
.../persistence/model/util/UUIDGenerator.java | 58 +--
stack/corepersistence/pom.xml | 2 +-
.../index/ApplicationEntityIndex.java | 23 +
.../persistence/index/CandidateResults.java | 4 +-
.../SearchRequestBuilderStrategyV2.java | 69 +++
.../usergrid/persistence/index/IndexEdge.java | 6 +
.../index/impl/EntityToMapConverter.java | 11 +-
.../impl/EsApplicationEntityIndexImpl.java | 194 +++++++-
.../index/impl/EsIndexBufferConsumerImpl.java | 5 +-
.../persistence/index/impl/IndexOperation.java | 1 -
.../persistence/index/impl/IndexingUtils.java | 153 +++++--
.../impl/SearchRequestBuilderStrategy.java | 50 +--
.../index/migration/LegacyIndexIdentifier.java | 78 ----
.../persistence/index/impl/EntityIndexTest.java | 55 ++-
.../index/impl/EntityToMapConverterTest.java | 6 +-
.../index/impl/IndexingUtilsTest.java | 141 ++++++
.../persistence/queue/DefaultQueueManager.java | 6 +-
.../usergrid/persistence/queue/QueueFig.java | 23 +
.../persistence/queue/QueueManager.java | 4 +-
.../queue/QueueManagerInternalFactory.java | 28 ++
.../persistence/queue/guice/QueueModule.java | 15 +-
.../queue/impl/QueueManagerFactoryImpl.java | 47 ++
.../queue/impl/SNSQueueManagerImpl.java | 370 +++++++++++++++
.../queue/impl/SQSQueueManagerImpl.java | 243 ++++++----
.../queue/util/AmazonNotificationUtils.java | 177 ++++++++
.../persistence/queue/QueueManagerTest.java | 8 +-
stack/pom.xml | 37 +-
.../rest/applications/ServiceResource.java | 2 +-
.../exceptions/AbstractExceptionMapper.java | 9 +
.../rest/management/ManagementResource.java | 403 ++++++++++++++++-
.../organizations/OrganizationsResource.java | 20 +-
.../rest/management/users/UserResource.java | 42 ++
.../rest/management/users/UsersResource.java | 45 +-
.../OAuth2AccessTokenSecurityFilter.java | 4 +
.../apache/usergrid/rest/NotificationsIT.java | 29 +-
.../rest/applications/ApplicationCreateIT.java | 53 +--
.../applications/ApplicationResourceIT.java | 8 +-
.../applications/assets/AssetResourceIT.java | 308 ++++++++-----
.../collection/CollectionsResourceIT.java | 11 +-
.../collection/devices/DevicesResourceIT.java | 3 +-
.../collection/paging/PagingResourceIT.java | 14 +-
.../collection/users/PermissionsResourceIT.java | 20 +-
.../collection/users/RetrieveUsersTest.java | 5 +-
.../collection/users/UserResourceIT.java | 21 +-
.../events/ApplicationRequestCounterIT.java | 64 +--
.../applications/queries/AndOrQueryTest.java | 4 +-
.../applications/queries/GeoPagingTest.java | 7 +-
.../rest/applications/queries/OrderByTest.java | 8 +-
.../rest/applications/utils/UserRepo.java | 36 +-
.../rest/filters/ContentTypeResourceIT.java | 177 +++-----
.../usergrid/rest/management/AccessTokenIT.java | 4 +-
.../usergrid/rest/management/AdminUsersIT.java | 30 +-
.../rest/management/ExportResourceIT.java | 50 +--
.../rest/management/ManagementResourceIT.java | 448 +++++++++++++++++--
.../rest/management/OrganizationsIT.java | 34 +-
.../rest/management/RegistrationIT.java | 410 +++++++----------
.../organizations/AdminEmailEncodingIT.java | 2 +-
.../rest/test/PropertiesResourceIT.java | 25 +-
.../test/resource2point0/AbstractRestIT.java | 17 +-
.../rest/test/resource2point0/ClientSetup.java | 28 +-
.../rest/test/resource2point0/RestClient.java | 9 +-
.../endpoints/CollectionEndpoint.java | 2 +-
.../endpoints/NamedResource.java | 139 +++---
.../endpoints/OrganizationResource.java | 6 -
.../endpoints/SetupResource.java | 2 +-
.../endpoints/TokenResource.java | 4 +-
.../endpoints/mgmt/CredentialsResource.java | 4 +-
.../endpoints/mgmt/FeedResource.java | 5 +-
.../endpoints/mgmt/ManagementResource.java | 4 +
.../endpoints/mgmt/MeResource.java | 4 +
.../endpoints/mgmt/OrgResource.java | 2 +-
.../endpoints/mgmt/TokenResource.java | 10 +-
.../resource2point0/model/Organization.java | 4 +-
.../src/test/resources/cat-larger-than-6mb.jpg | Bin 0 -> 9799257 bytes
stack/rest/src/test/resources/log4j.properties | 3 +-
.../resources/usergrid-custom-test.properties | 1 +
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 ++++++++++
.../assets/data/LocalFileBinaryStore.java | 39 +-
.../services/assets/data/S3BinaryStore.java | 268 +++++++----
.../notifications/NotificationsService.java | 4 +-
.../services/notifications/QueueListener.java | 159 +++----
.../services/queues/ImportQueueManager.java | 5 +-
.../usergrid/services/queues/QueueListener.java | 75 ++--
.../migration/AppInfoMigrationPluginTest.java | 6 +-
.../usergrid/management/importer/S3Upload.java | 9 +-
.../security/tokens/TokenServiceIT.java | 42 ++
.../usergrid/services/ConnectionsServiceIT.java | 1 +
.../apns/NotificationsServiceIT.java | 1 -
.../gcm/NotificationsServiceIT.java | 4 -
.../resources/usergrid-custom-test.properties | 2 +-
.../setup/ConcurrentProcessSingleton.java | 8 +-
ugc/README.md | 2 +-
212 files changed, 8381 insertions(+), 4866 deletions(-)
----------------------------------------------------------------------