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/11/04 23:59:24 UTC

[02/14] git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o

Merge branch 'two-dot-o' of github.com:apache/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/4db5a0b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4db5a0b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4db5a0b4

Branch: refs/heads/key-row-sharding
Commit: 4db5a0b4c9ca2fffd9c39cce8e3139c52a0ba583
Parents: 46106a8 dbfb3db
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Oct 7 14:54:32 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Oct 7 14:54:32 2014 -0400

----------------------------------------------------------------------
 stack/core/pom.xml                              |  15 +
 .../CpEntityIndexDeleteListener.java            |  23 +-
 .../corepersistence/CpEntityManager.java        |  45 ++-
 .../corepersistence/CpEntityManagerFactory.java |   5 +-
 .../corepersistence/CpManagerCache.java         |  29 +-
 .../usergrid/corepersistence/GuiceModule.java   |  12 +-
 .../collection/event/EntityDeleted.java         |  17 +
 .../collection/event/EntityVersionCreated.java  |  17 +
 .../collection/event/EntityVersionDeleted.java  |  17 +
 .../core/util/AvailablePortFinder.java          | 188 -----------
 stack/corepersistence/map/pom.xml               |  81 +++++
 .../usergrid/persistence/map/MapManager.java    |  68 ++++
 .../persistence/map/MapManagerFactory.java      |  30 ++
 .../usergrid/persistence/map/MapScope.java      |  40 +++
 .../persistence/map/guice/MapModule.java        |  61 ++++
 .../persistence/map/impl/MapManagerImpl.java    |  90 +++++
 .../persistence/map/impl/MapScopeImpl.java      |  90 +++++
 .../persistence/map/impl/MapSerialization.java  |  64 ++++
 .../map/impl/MapSerializationImpl.java          | 337 +++++++++++++++++++
 .../persistence/map/MapManagerTest.java         | 206 ++++++++++++
 .../persistence/map/guice/TestMapModule.java    |  16 +
 stack/corepersistence/pom.xml                   |  18 +
 .../index/impl/EsEntityIndexImpl.java           | 208 ++++++------
 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  | 108 +++---
 .../notifications/ApplicationQueueMessage.java  |  67 ++--
 .../notifications/NotificationsService.java     |  16 +-
 .../services/notifications/QueueListener.java   |  81 +++--
 .../services/notifications/QueueManager.java    |  31 --
 .../services/notifications/TaskManager.java     |  65 ++--
 .../usergrid/services/TestQueueManager.java     |  67 ++++
 .../AbstractServiceNotificationIT.java          |   1 -
 .../apns/NotificationsServiceIT.java            |  56 +--
 .../gcm/NotificationsServiceIT.java             |   9 +-
 stack/test-utils/pom.xml                        |  17 +-
 .../java/org/apache/usergrid/tools/ApiDoc.java  |   5 +-
 49 files changed, 2494 insertions(+), 585 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4db5a0b4/stack/pom.xml
----------------------------------------------------------------------