You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/14 23:00:29 UTC
[05/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/519a6d83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/519a6d83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/519a6d83
Branch: refs/heads/cloudformation-update
Commit: 519a6d835f04aa043e43a56806eadd0f54864344
Parents: 30ba9ac c40aecb
Author: amuramoto <am...@apigee.com>
Authored: Mon Oct 6 15:40:54 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Mon Oct 6 15:40:54 2014 -0700
----------------------------------------------------------------------
stack/core/pom.xml | 15 +
.../usergrid/corepersistence/GuiceModule.java | 4 +
.../collection/event/EntityDeleted.java | 17 +
.../collection/event/EntityVersionCreated.java | 17 +
.../collection/event/EntityVersionDeleted.java | 17 +
stack/corepersistence/map/pom.xml | 81 +++++
.../usergrid/persistence/map/MapManager.java | 69 ++++
.../persistence/map/MapManagerFactory.java | 30 ++
.../usergrid/persistence/map/MapScope.java | 40 +++
.../persistence/map/guice/MapModule.java | 61 ++++
.../persistence/map/impl/MapManagerImpl.java | 114 +++++++
.../persistence/map/impl/MapScopeImpl.java | 91 ++++++
.../persistence/map/impl/MapSerialization.java | 64 ++++
.../map/impl/MapSerializationImpl.java | 327 +++++++++++++++++++
.../persistence/map/MapManagerTest.java | 207 ++++++++++++
.../persistence/map/guice/TestMapModule.java | 16 +
stack/corepersistence/pom.xml | 18 +
stack/corepersistence/queue/pom.xml | 92 ++++++
.../usergrid/persistence/queue/Queue.java | 31 ++
.../usergrid/persistence/queue/QueueFig.java | 16 +
.../persistence/queue/QueueManager.java | 64 ++++
.../persistence/queue/QueueManagerFactory.java | 23 ++
.../persistence/queue/QueueMessage.java | 42 +++
.../usergrid/persistence/queue/QueueScope.java | 31 ++
.../persistence/queue/guice/QueueModule.java | 51 +++
.../persistence/queue/impl/QueueScopeImpl.java | 87 +++++
.../queue/impl/SQSQueueManagerImpl.java | 234 +++++++++++++
.../persistence/queue/QueueManagerTest.java | 100 ++++++
.../queue/guice/TestQueueModule.java | 33 ++
stack/pom.xml | 8 +-
.../apache/usergrid/rest/SystemResource.java | 157 +++++++++
.../notifications/ApplicationQueueManager.java | 96 +++---
.../notifications/ApplicationQueueMessage.java | 67 ++--
.../notifications/NotificationsService.java | 15 +-
.../services/notifications/QueueListener.java | 69 ++--
.../services/notifications/QueueManager.java | 31 --
.../services/notifications/TaskManager.java | 54 +--
.../apns/NotificationsServiceIT.java | 47 ++-
.../gcm/NotificationsServiceIT.java | 2 +-
stack/test-utils/pom.xml | 17 +-
.../java/org/apache/usergrid/tools/ApiDoc.java | 5 +-
41 files changed, 2323 insertions(+), 237 deletions(-)
----------------------------------------------------------------------