Merge branch 'master' into datastax-cass-driver
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/eccb4d54 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/eccb4d54 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/eccb4d54 Branch: refs/heads/datastax-cass-driver Commit: eccb4d546f548cc66c14b7bef6f6b5272c2f4ab4 Parents: 24b4285 e4beaea Author: Michael Russo <[email protected]> Authored: Sun May 8 22:21:09 2016 +0800 Committer: Michael Russo <[email protected]> Committed: Sun May 8 22:21:09 2016 +0800 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 10 +- .../corepersistence/ApplicationIdCacheImpl.java | 9 +- .../corepersistence/CpEntityManager.java | 4 +- .../index/IndexSchemaCacheFig.java | 2 +- .../index/IndexSchemaCacheImpl.java | 3 +- .../corepersistence/index/IndexServiceImpl.java | 1 + .../org/apache/usergrid/utils/StringUtils.java | 8 + .../main/resources/usergrid-core-context.xml | 6 + .../shard/impl/NodeShardAllocationImpl.java | 7 +- .../shard/impl/ShardGroupCompactionImpl.java | 18 +-- .../usergrid/persistence/queue/QueueFig.java | 4 +- .../queue/impl/QueueManagerFactoryImpl.java | 27 ++-- .../org/apache/usergrid/rest/RootResource.java | 25 +++ .../rest/applications/CollectionResource.java | 8 +- .../apache/usergrid/rest/NotificationsIT.java | 11 ++ .../collection/CollectionsResourceIT.java | 147 +++++++++++++++--- .../events/ApplicationRequestCounterIT.java | 48 ++++++ .../cassandra/ManagementServiceImpl.java | 93 ++++++------ .../ApplicationQueueManagerCache.java | 143 ++++++++++++++++++ .../notifications/NotificationsService.java | 11 +- .../services/notifications/QueueListener.java | 58 ++----- .../services/notifications/TaskManager.java | 117 +++++++------- .../impl/ApplicationQueueManagerImpl.java | 151 +++++++++++++------ .../services/notifiers/NotifiersService.java | 6 + .../gcm/NotificationsServiceIT.java | 77 ++++++++++ 25 files changed, 741 insertions(+), 253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/eccb4d54/stack/config/src/main/resources/usergrid-default.properties ----------------------------------------------------------------------
