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 2014/10/10 17:50:11 UTC
[04/43] 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
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5070da9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5070da9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5070da9c
Branch: refs/heads/two-dot-o-events
Commit: 5070da9c8e1e2aebf1ba31fc381c4682befd53e4
Parents: 2828e91 66c377d
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 8 09:09:48 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 8 09:09:48 2014 -0600
----------------------------------------------------------------------
.../CpEntityIndexDeleteListener.java | 23 +-
.../corepersistence/CpEntityManager.java | 45 +++-
.../corepersistence/CpEntityManagerFactory.java | 5 +-
.../corepersistence/CpManagerCache.java | 29 ++-
.../usergrid/corepersistence/GuiceModule.java | 12 +-
.../persistence/entities/Notification.java | 13 ++
.../collection/EntityCollectionManagerIT.java | 32 ++-
.../core/util/AvailablePortFinder.java | 188 -----------------
.../usergrid/persistence/map/MapManager.java | 1 -
.../persistence/map/MapManagerFactory.java | 2 +-
.../persistence/map/impl/MapManagerImpl.java | 24 ---
.../persistence/map/impl/MapScopeImpl.java | 1 -
.../map/impl/MapSerializationImpl.java | 48 +++--
.../persistence/map/MapManagerTest.java | 21 +-
.../index/impl/EsEntityIndexImpl.java | 208 ++++++++++---------
.../persistence/queue/QueueManager.java | 4 +-
.../queue/impl/SQSQueueManagerImpl.java | 70 ++++---
.../persistence/queue/QueueManagerTest.java | 25 +++
.../notifications/ApplicationQueueManager.java | 33 ++-
.../notifications/NotificationsService.java | 3 +-
.../services/notifications/QueueListener.java | 22 +-
.../services/notifications/TaskManager.java | 52 +++--
.../usergrid/services/TestQueueManager.java | 67 ++++++
.../AbstractServiceNotificationIT.java | 1 -
.../apns/NotificationsServiceIT.java | 21 +-
.../gcm/NotificationsServiceIT.java | 17 +-
.../java/org/apache/usergrid/tools/ApiDoc.java | 5 +-
27 files changed, 508 insertions(+), 464 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5070da9c/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
----------------------------------------------------------------------