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:36 UTC
[19/24] usergrid git commit: Merge branch 'master' into
usergrid-1007-shiro-cache
Merge branch 'master' 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/341b4736
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/341b4736
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/341b4736
Branch: refs/heads/master
Commit: 341b47365936e824a0f12972fa17710b4176a3dc
Parents: 5427631 f19ae08
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Oct 15 08:59:00 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Oct 15 08:59:00 2015 -0400
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 22 +-
.../asyncevents/AmazonAsyncEventService.java | 280 ++++++++++++-------
.../asyncevents/EventBuilderImpl.java | 3 +-
.../asyncevents/InMemoryAsyncEventService.java | 7 +-
.../index/IndexProcessorFig.java | 4 +
.../index/ReIndexServiceImpl.java | 2 +-
.../migration/DeDupConnectionDataMigration.java | 2 +-
.../read/search/CandidateEntityFilter.java | 3 +-
.../pipeline/read/search/CandidateIdFilter.java | 2 +-
.../core/rx/ExceptionBehaviorTest.java | 171 +++++++++++
.../usergrid/persistence/index/IndexFig.java | 3 +
.../index/impl/EsIndexProducerImpl.java | 28 +-
.../EsIndexMappingMigrationPlugin.java | 2 +-
.../usergrid/persistence/queue/QueueFig.java | 12 +-
.../persistence/queue/QueueMessage.java | 10 +
.../queue/impl/SNSQueueManagerImpl.java | 2 +
.../queue/impl/SQSQueueManagerImpl.java | 1 +
.../queue/util/AmazonNotificationUtils.java | 1 +
.../rest/system/ApplicationsResource.java | 28 +-
stack/rest_integration_tests/README.md | 19 --
stack/rest_integration_tests/config/default.js | 38 ---
stack/rest_integration_tests/config/index.js | 25 --
stack/rest_integration_tests/index.js | 20 --
stack/rest_integration_tests/lib/connections.js | 137 ---------
stack/rest_integration_tests/lib/entities.js | 166 -----------
.../rest_integration_tests/lib/notifications.js | 68 -----
stack/rest_integration_tests/lib/random.js | 74 -----
stack/rest_integration_tests/lib/response.js | 30 --
stack/rest_integration_tests/lib/token.js | 49 ----
stack/rest_integration_tests/lib/urls.js | 37 ---
stack/rest_integration_tests/lib/users.js | 82 ------
stack/rest_integration_tests/package.json | 18 --
.../test/authentication/management.js | 38 ---
.../test/authentication/org.js | 37 ---
.../test/authentication/resetPassword.js | 78 ------
.../test/authentication/user.js | 40 ---
.../test/connections/create.js | 49 ----
.../test/connections/delete.js | 77 -----
.../test/connections/get.js | 82 ------
.../test/entities/create.js | 60 ----
.../test/entities/deleteAll.js | 37 ---
.../rest_integration_tests/test/entities/get.js | 51 ----
.../test/entities/update.js | 43 ---
stack/rest_integration_tests/test/main.js | 72 -----
stack/rest_integration_tests/test/mocha.opts | 3 -
.../test/notifications/create.js | 36 ---
.../test/queries/comparison.js | 58 ----
.../test/queries/contains.js | 116 --------
.../test/queries/equals.js | 54 ----
.../test/queries/location.js | 42 ---
.../test/queries/order.js | 82 ------
stack/rest_integration_tests/test/setup.js | 103 -------
stack/rest_integration_tests/test/teardown.js | 65 -----
.../rest_integration_tests/test/users/create.js | 45 ---
.../management/AppInfoMigrationPlugin.java | 2 +-
.../services/AbstractConnectionsService.java | 2 +-
56 files changed, 452 insertions(+), 2166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/341b4736/stack/services/src/main/java/org/apache/usergrid/services/AbstractConnectionsService.java
----------------------------------------------------------------------