You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/07 15:28:06 UTC
[5/5] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Conflicts:
stack/core/pom.xml
stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/43f19302
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43f19302
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43f19302
Branch: refs/heads/two-dot-o
Commit: 43f19302afd9947a27af31ca2bf5d5398ab19b52
Parents: 5ad79e3 c40aecb
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Oct 7 09:27:45 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Oct 7 09:27:45 2014 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 16 +-
.../usergrid/corepersistence/GuiceModule.java | 1 +
stack/corepersistence/map/pom.xml | 16 ++
stack/corepersistence/pom.xml | 17 ++
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 | 67 ++++--
.../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 +-
.../java/org/apache/usergrid/tools/ApiDoc.java | 5 +-
27 files changed, 1066 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/43f19302/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
----------------------------------------------------------------------