You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/10/21 22:36:22 UTC
[05/24] usergrid git commit: Merge branch 'two-dot-o-dev' into
usergrid-1007-shiro-cache
Merge branch 'two-dot-o-dev' into usergrid-1007-shiro-cache
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ee66318c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ee66318c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ee66318c
Branch: refs/heads/master
Commit: ee66318c5394f9d17f707bc10bb7d5939e9dabe2
Parents: 39f49d8 684bf2a
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Sep 21 14:38:02 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Sep 21 14:38:02 2015 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 4 -
.../corepersistence/CpEntityManager.java | 31 +-
.../corepersistence/CpRelationManager.java | 27 +-
.../asyncevents/EventBuilderImpl.java | 44 +--
.../corepersistence/index/IndexServiceImpl.java | 26 +-
.../read/search/CandidateEntityFilter.java | 15 +-
.../pipeline/read/search/CandidateIdFilter.java | 14 +-
.../usergrid/persistence/EntityManager.java | 2 +
.../corepersistence/StaleIndexCleanupTest.java | 14 +-
.../usergrid/persistence/CollectionIT.java | 10 +-
.../usergrid/persistence/PermissionsIT.java | 7 +-
.../core/future/FutureObservable.java | 44 ---
.../persistence/index/EntityIndexBatch.java | 8 +-
.../usergrid/persistence/index/IndexFig.java | 18 --
.../persistence/index/guice/IndexModule.java | 2 +-
.../index/impl/EsEntityIndexBatchImpl.java | 21 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 8 +-
.../index/impl/EsEntityIndexImpl.java | 6 +-
.../index/impl/EsIndexBufferConsumerImpl.java | 286 -------------------
.../index/impl/EsIndexProducerImpl.java | 218 ++++++++++++++
.../index/impl/IndexBufferConsumer.java | 36 ---
.../index/impl/IndexOperationMessage.java | 18 --
.../persistence/index/impl/IndexProducer.java | 39 +++
.../index/impl/IndexRefreshCommandImpl.java | 4 +-
.../persistence/index/impl/EntityIndexTest.java | 66 ++---
.../persistence/index/impl/GeoPagingTest.java | 5 +-
.../index/impl/IndexLoadTestsIT.java | 6 +-
.../usergrid/rest/ApplicationsResource.java | 166 -----------
.../apache/usergrid/rest/DatabaseResource.java | 99 -------
.../apache/usergrid/rest/SystemResource.java | 19 +-
.../rest/system/ApplicationsResource.java | 168 +++++++++++
.../usergrid/rest/system/DatabaseResource.java | 101 +++++++
.../rest/system/QueueSystemResource.java | 77 +++++
.../apache/usergrid/rest/SystemResourceIT.java | 24 +-
.../collection/groups/GroupResourceIT.java | 6 +-
.../test/resource/endpoints/NamedResource.java | 163 ++++++-----
.../test/resource/endpoints/RootResource.java | 5 +
.../test/resource/endpoints/SubResource.java | 37 +++
.../test/resource/endpoints/SystemResource.java | 7 +-
.../test/resource/endpoints/UrlResource.java | 8 +
.../services/notifications/gcm/GCMAdapter.java | 7 +-
.../usergrid/services/roles/RolesService.java | 12 -
42 files changed, 956 insertions(+), 922 deletions(-)
----------------------------------------------------------------------