Merge commit 'refs/pull/456/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2ef1f322 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2ef1f322 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2ef1f322 Branch: refs/heads/master Commit: 2ef1f322e4dbd1911fbed031d2d69468c5765bfe Parents: f9aab91 5892118 Author: Michael Russo <[email protected]> Authored: Thu Jan 7 14:19:30 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Jan 7 14:19:30 2016 -0800 ---------------------------------------------------------------------- .../persistence/entities/Notification.java | 146 +++++++----- .../usergrid/persistence/entities/Notifier.java | 51 +++-- .../persistence/queue/LocalQueueManager.java | 5 + stack/pom.xml | 5 +- stack/services/pom.xml | 3 +- .../notifications/NotificationsService.java | 24 +- .../services/notifications/ProviderAdapter.java | 5 +- .../services/notifications/QueueListener.java | 15 +- .../services/notifications/TestAdapter.java | 6 +- .../notifications/apns/APNsAdapter.java | 9 +- .../services/notifications/gcm/GCMAdapter.java | 93 ++++++-- .../impl/ApplicationQueueManagerImpl.java | 4 +- .../services/notifications/wns/WNSAdapter.java | 4 +- .../AbstractServiceNotificationIT.java | 2 +- .../apns/MockSuccessfulProviderAdapter.java | 4 +- .../apns/NotificationsServiceIT.java | 22 +- .../gcm/MockSuccessfulProviderAdapter.java | 7 +- .../gcm/NotificationsServiceIT.java | 227 +++++++++++++++---- .../notifications/wns/WNSAdapterTest.java | 5 - 19 files changed, 425 insertions(+), 212 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ef1f322/stack/services/src/main/java/org/apache/usergrid/services/notifications/TestAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ef1f322/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ef1f322/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ef1f322/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/MockSuccessfulProviderAdapter.java ----------------------------------------------------------------------
