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:38 UTC
[21/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/2fdf664c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2fdf664c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2fdf664c
Branch: refs/heads/master
Commit: 2fdf664c6736f9a92b965e1b708067fc77b75e3d
Parents: fed460b 1393c2f
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Oct 20 17:06:38 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Oct 20 17:06:38 2015 -0400
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 373 +++++++----
.../asyncevents/AsyncEventService.java | 1 +
.../asyncevents/AsyncIndexProvider.java | 16 +-
.../asyncevents/model/AsyncEvent.java | 22 +-
.../asyncevents/model/EdgeDeleteEvent.java | 6 +-
.../asyncevents/model/EdgeIndexEvent.java | 9 +-
.../model/ElasticsearchIndexEvent.java | 51 ++
.../asyncevents/model/EntityDeleteEvent.java | 8 +-
.../asyncevents/model/EntityIndexEvent.java | 6 +-
.../model/InitializeApplicationIndexEvent.java | 4 +-
.../index/IndexProcessorFig.java | 18 +-
.../util/ObjectJsonSerializer.java | 92 +++
.../index/AmazonAsyncEventServiceTest.java | 10 +-
.../index/AsyncIndexServiceTest.java | 2 +-
.../corepersistence/index/PublishRxTest.java | 95 ---
.../usergrid/corepersistence/index/RxTest.java | 108 ++++
.../cache/CachedEntityCollectionManager.java | 147 -----
.../EntityCollectionManagerFactoryImpl.java | 6 -
.../core/astyanax/CassandraConfig.java | 8 +-
.../core/astyanax/CassandraConfigImpl.java | 1 +
.../persistence/core/astyanax/CassandraFig.java | 6 +-
.../usergrid/persistence/map/MapManager.java | 25 +-
.../persistence/map/impl/MapManagerImpl.java | 6 +
.../persistence/map/impl/MapSerialization.java | 27 +-
.../map/impl/MapSerializationImpl.java | 244 ++++----
.../index/impl/DeIndexOperation.java | 4 +
.../persistence/index/impl/IndexOperation.java | 4 +
.../index/impl/IndexOperationMessage.java | 5 +
.../persistence/queue/DefaultQueueManager.java | 12 +-
.../usergrid/persistence/queue/QueueFig.java | 8 +-
.../persistence/queue/QueueManager.java | 8 +-
.../persistence/queue/guice/QueueModule.java | 1 -
.../queue/impl/SNSQueueManagerImpl.java | 621 +++++++++++--------
.../queue/impl/SQSQueueManagerImpl.java | 352 -----------
.../queue/util/AmazonNotificationUtils.java | 4 +-
.../runAuditVerifyCollectionEntities.sh | 11 +-
stack/loadtests/runDeleteEntities.sh | 13 +-
stack/loadtests/runLoadEntitiesUnlimited.sh | 103 +++
.../datagenerators/FeederGenerator.scala | 9 +-
.../usergrid/enums/ConfigProperties.scala | 15 +-
.../apache/usergrid/helpers/Extractors.scala | 24 +-
.../org/apache/usergrid/helpers/Headers.scala | 7 +
.../usergrid/scenarios/AuditScenarios.scala | 121 +++-
.../scenarios/EntityCollectionScenarios.scala | 38 +-
.../org/apache/usergrid/settings/Settings.scala | 150 ++++-
stack/loadtests/testConfig.sh | 3 +
.../services/queues/ImportQueueManager.java | 9 +-
47 files changed, 1589 insertions(+), 1224 deletions(-)
----------------------------------------------------------------------