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/07/14 20:14:12 UTC
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
observable-query-fix
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into observable-query-fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7256ea73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7256ea73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7256ea73
Branch: refs/heads/two-dot-o-dev
Commit: 7256ea731520ebf42e0c343a907410af35776411
Parents: 208332d a9c9581
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Jul 14 11:09:57 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Jul 14 11:09:57 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 4 +-
.../asyncevents/AmazonAsyncEventService.java | 46 +++++--
.../asyncevents/AsyncEventService.java | 8 ++
.../asyncevents/AsyncIndexProvider.java | 14 +-
.../asyncevents/InMemoryAsyncEventService.java | 8 ++
.../asyncevents/model/AsyncEvent.java | 29 +++-
.../model/InitializeApplicationIndexEvent.java | 38 +++++
.../index/ApplicationIndexLocationStrategy.java | 7 -
.../index/IndexLocationStrategyFactoryImpl.java | 2 +-
.../index/ReplicatedIndexLocationStrategy.java | 137 +++++++++++++++++++
.../index/AmazonAsyncEventServiceTest.java | 10 +-
.../corepersistence/index/IndexNamingTest.java | 18 ++-
.../usergrid/persistence/queue/QueueScope.java | 14 ++
.../persistence/queue/impl/QueueScopeImpl.java | 7 +-
.../queue/impl/SNSQueueManagerImpl.java | 101 +++++++++-----
.../queue/util/AmazonNotificationUtils.java | 42 ++++++
.../persistence/queue/QueueManagerTest.java | 2 +-
.../apache/usergrid/rest/MigrateResource.java | 26 +++-
.../notifications/NotificationsService.java | 2 +-
.../services/notifications/QueueListener.java | 2 +-
.../usergrid/services/queues/QueueListener.java | 2 +-
21 files changed, 452 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7256ea73/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------