Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/705891c1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/705891c1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/705891c1 Branch: refs/heads/master Commit: 705891c13c2bc1134b46ba7f389f7c0bdc6709a7 Parents: 584cf97 ee356ec Author: Michael Russo <[email protected]> Authored: Thu Feb 25 11:56:12 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Feb 25 11:56:12 2016 -0800 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 3 - .../corepersistence/CpEntityManager.java | 31 +- .../asyncevents/AmazonAsyncEventService.java | 844 ------------------- .../asyncevents/AsyncEventService.java | 5 +- .../asyncevents/AsyncEventServiceImpl.java | 829 ++++++++++++++++++ .../asyncevents/AsyncIndexProvider.java | 4 +- .../asyncevents/EventBuilder.java | 12 +- .../asyncevents/EventBuilderImpl.java | 15 +- .../asyncevents/IndexDocNotFoundException.java | 37 + .../asyncevents/model/AsyncEvent.java | 2 - .../asyncevents/model/EdgeIndexEvent.java | 70 -- .../asyncevents/model/EntityIndexEvent.java | 54 -- .../corepersistence/index/IndexServiceImpl.java | 4 +- .../read/search/CandidateEntityFilter.java | 10 +- .../index/AmazonAsyncEventServiceTest.java | 103 --- .../index/AsyncEventServiceImplTest.java | 103 +++ .../index/AsyncIndexServiceTest.java | 3 +- .../index/impl/EsIndexProducerImpl.java | 5 +- .../usergrid/persistence/queue/QueueFig.java | 4 + .../applications/ApplicationResource.java | 27 +- .../rest/management/users/UserResource.java | 2 +- .../security/SecuredResourceFilterFactory.java | 2 +- .../rest/applications/ApplicationDeleteIT.java | 12 +- .../collection/CollectionsResourceIT.java | 56 ++ .../usergrid/rest/management/AdminUsersIT.java | 101 ++- .../usergrid/services/ServiceManager.java | 5 +- 26 files changed, 1194 insertions(+), 1149 deletions(-) ----------------------------------------------------------------------
