usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [22/22] git commit: Merge branch 'two-dot-o' into two-dot-o-events
Date Wed, 29 Oct 2014 19:22:03 GMT
Merge branch 'two-dot-o' into two-dot-o-events

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityDeleteListener.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexBatch.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/9153eb9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9153eb9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9153eb9d

Branch: refs/heads/two-dot-o-events
Commit: 9153eb9d80f8af8f1b5a82d8fd03b91c0a77f202
Parents: 16ff75a 707c9b9
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Wed Oct 29 15:21:10 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Wed Oct 29 15:21:10 2014 -0400

----------------------------------------------------------------------
 .../usergrid/corepersistence/CpWalker.java      |  44 +-
 .../results/FilteringLoader.java                |  63 +-
 .../results/ResultsLoaderFactory.java           |   5 +-
 .../results/ResultsLoaderFactoryImpl.java       |   4 -
 .../results/ResultsVerifier.java                |   6 +-
 .../results/VersionVerifier.java                |   8 +-
 .../corepersistence/util/CpEntityMapUtils.java  |   5 +-
 .../usergrid/persistence/entities/Notifier.java |   2 -
 .../usergrid/persistence/index/EntityIndex.java |   2 +-
 .../persistence/index/EntityIndexFactory.java   |   2 -
 .../usergrid/persistence/index/IndexScope.java  |   9 +-
 .../persistence/index/guice/IndexModule.java    |   1 -
 .../index/impl/EsEntityIndexBatchImpl.java      |   3 +-
 .../index/impl/EsEntityIndexImpl.java           |  71 ++-
 .../persistence/index/impl/EsProvider.java      |   8 +-
 .../index/query/CandidateResults.java           |   7 +-
 .../persistence/index/query/Identifier.java     |   3 +-
 .../usergrid/persistence/index/query/Query.java |  27 +-
 .../persistence/index/query/Results.java        |   4 +-
 .../queue/impl/QueueScopeFactoryImpl.java       |   2 +-
 .../queue/impl/SQSQueueManagerImpl.java         |   6 +-
 .../_maven.repositories                         |   8 -
 ...14c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar | Bin 160201 -> 0 bytes
 ...14c97c6e3ef40c88590e1b196d3ec55b-sources.jar | Bin 59744 -> 0 bytes
 ...63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar | Bin 67751 -> 0 bytes
 ...7c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated |  13 -
 ...63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom | 166 ------
 ...7c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated |  13 -
 .../pushy-0.4-apigee.pom                        | 166 ------
 stack/pom.xml                                   |   2 +-
 stack/services/pom.xml                          |   2 +-
 .../notifications/ApplicationQueueManager.java  | 585 ++-----------------
 .../notifications/InactiveDeviceManager.java    |  79 +++
 .../notifications/NotificationsService.java     |  35 +-
 .../services/notifications/ProviderAdapter.java |  42 +-
 .../notifications/ProviderAdapterFactory.java   |  49 ++
 .../services/notifications/QueueListener.java   |  84 ++-
 .../services/notifications/TaskManager.java     |  17 +-
 .../services/notifications/TestAdapter.java     |  23 +-
 .../notifications/apns/APNsAdapter.java         | 177 ++----
 .../notifications/apns/EntityPushManager.java   |  74 +++
 .../apns/ExpiredTokenListener.java              |  52 ++
 .../services/notifications/gcm/GCMAdapter.java  | 134 +++--
 .../impl/ApplicationQueueManagerImpl.java       | 523 +++++++++++++++++
 .../services/notifiers/NotifiersService.java    |  30 +-
 .../notifications/NotifiersServiceIT.java       |  33 +-
 .../apns/MockSuccessfulProviderAdapter.java     |  38 +-
 .../apns/NotificationsServiceIT.java            |  67 +--
 .../gcm/MockSuccessfulProviderAdapter.java      |  33 +-
 .../gcm/NotificationsServiceIT.java             |  81 +--
 50 files changed, 1293 insertions(+), 1515 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9153eb9d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9153eb9d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------


Mime
View raw message