You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/12 23:35:39 UTC
[2/6] incubator-usergrid git commit: Merge remote-tracking branch
'upstream/two-dot-o-dev' into two-dot-o-dev
Merge remote-tracking branch 'upstream/two-dot-o-dev' 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/dc9dafea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dc9dafea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dc9dafea
Branch: refs/heads/two-dot-o-dev
Commit: dc9dafea53f72fd2125410bc7cf634224b7c9845
Parents: 7253ce5 9427b4c
Author: Mike Dunker <md...@apigee.com>
Authored: Tue Aug 4 16:46:32 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Tue Aug 4 16:46:32 2015 -0700
----------------------------------------------------------------------
stack/awscluster/gatling-cluster-cf.json | 28 +-
.../main/resources/usergrid-default.properties | 4 +
.../corepersistence/ApplicationIdCacheFig.java | 2 +
.../corepersistence/ApplicationIdCacheImpl.java | 14 +-
.../corepersistence/CpEntityManager.java | 35 +-
.../corepersistence/CpRelationManager.java | 6 -
.../corepersistence/EntityManagerFig.java | 4 +-
.../asyncevents/AmazonAsyncEventService.java | 270 ++++++-----
.../asyncevents/AsyncIndexProvider.java | 11 +-
.../asyncevents/EventBuilder.java | 11 +-
.../asyncevents/EventBuilderImpl.java | 21 +-
.../asyncevents/InMemoryAsyncEventService.java | 16 +-
.../asyncevents/model/AsyncEvent.java | 153 +-----
.../asyncevents/model/EdgeDeleteEvent.java | 36 +-
.../asyncevents/model/EdgeIndexEvent.java | 39 +-
.../asyncevents/model/EntityDeleteEvent.java | 18 +-
.../asyncevents/model/EntityIndexEvent.java | 30 +-
.../model/InitializeApplicationIndexEvent.java | 21 +-
.../corepersistence/index/CoreIndexFig.java | 2 +
.../index/IndexProcessorFig.java | 9 +-
.../corepersistence/util/CpEntityMapUtils.java | 284 +-----------
.../org/apache/usergrid/persistence/Query.java | 2 +
.../org/apache/usergrid/persistence/Schema.java | 18 +-
.../persistence/entities/Notification.java | 116 ++++-
.../index/AmazonAsyncEventServiceTest.java | 8 +-
.../index/AsyncIndexServiceTest.java | 14 +-
.../org/apache/usergrid/persistence/GeoIT.java | 6 +-
.../collection/cache/EntityCacheFig.java | 2 +
.../data/DataMigrationManagerImpl.java | 1 +
.../persistence/core/rx/RxSchedulerFig.java | 2 +
.../persistence/core/rx/OrderedMergeTest.java | 57 ++-
.../usergrid/persistence/graph/GraphFig.java | 2 +
stack/corepersistence/model/pom.xml | 7 +
.../model/collection/SchemaManager.java | 35 ++
.../model/entity/EntityToMapConverter.java | 61 +--
.../model/entity/MapToEntityConverter.java | 155 ++++---
.../persistence/model/field/FieldTypeName.java | 1 +
.../model/field/SerializedObjectField.java | 51 ++
stack/corepersistence/pom.xml | 5 +-
.../index/IndexLocationStrategy.java | 4 +-
.../index/impl/EntityMappingParser.java | 14 +-
.../index/impl/EsEntityIndexImpl.java | 17 +-
.../index/impl/EsIndexBufferConsumerImpl.java | 24 +-
.../index/impl/EntityToMapConverterTest.java | 12 +-
stack/corepersistence/queue/pom.xml | 20 +-
.../queue/impl/UsergridAwsCredentials.java | 7 +
.../impl/UsergridAwsCredentialsProvider.java | 5 +-
.../queue/util/AmazonNotificationUtils.java | 230 ++++-----
.../persistence/queue/QueueManagerTest.java | 2 +-
stack/pom.xml | 6 +-
.../rest/applications/ApplicationResource.java | 4 +-
.../rest/applications/ServiceResource.java | 137 ++++--
.../applications/assets/AssetsResource.java | 37 +-
.../rest/applications/users/UsersResource.java | 4 +-
.../AwsPropertiesNotFoundExceptionMapper.java | 37 ++
.../main/resources/usergrid-rest-context.xml | 11 +-
.../applications/assets/AssetResourceIT.java | 23 +-
.../applications/assets/AwsAssetResourceIT.java | 463 +++++++++++++++++++
.../applications/assets/aws/NoAWSCredsRule.java | 127 +++++
.../collection/groups/GroupResourceIT.java | 4 +-
.../collection/users/PermissionsResourceIT.java | 40 +-
.../events/ApplicationRequestCounterIT.java | 14 +-
.../rest/management/RegistrationIT.java | 27 --
.../rest/test/resource/AbstractRestIT.java | 36 +-
.../test/resources/usergrid-test-context.xml | 8 -
stack/rest_integration_tests/config/default.js | 2 +-
stack/rest_integration_tests/lib/connections.js | 7 +-
.../rest_integration_tests/lib/notifications.js | 36 +-
stack/rest_integration_tests/package.json | 7 +-
.../test/notifications/create.js | 2 +-
stack/scripts/migrate_entity_data.py | 315 +++++++++++++
stack/services/pom.xml | 12 +-
.../management/AccountCreationProps.java | 2 +
.../services/AbstractCollectionService.java | 8 +-
.../assets/data/AwsSdkS3BinaryStore.java | 189 ++++++--
.../services/assets/data/BinaryStore.java | 8 +-
.../AwsPropertiesNotFoundException.java | 40 ++
.../notifications/NotificationsService.java | 45 +-
.../impl/ApplicationQueueManagerImpl.java | 2 +-
.../usergrid/services/CollectionServiceIT.java | 5 +-
.../test/resources/usergrid-test-context.xml | 2 +-
81 files changed, 2431 insertions(+), 1121 deletions(-)
----------------------------------------------------------------------