You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/10 18:14:30 UTC
[41/41] incubator-usergrid git commit: Merge branch 'two-dot-o' into
UG-rest-test-framework-overhaul
Merge branch 'two-dot-o' into UG-rest-test-framework-overhaul
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7a0c3781
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7a0c3781
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7a0c3781
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 7a0c378163488dd310e5c7141b1fb701dec9c6b5
Parents: 7dd658b 43ed846
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 10 10:13:18 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 10 10:13:18 2014 -0700
----------------------------------------------------------------------
.../main/dist/init_instance/init_rest_server.sh | 18 +-
.../corepersistence/CpEntityManager.java | 230 ++++++++++---------
.../corepersistence/CpEntityManagerFactory.java | 4 +-
.../corepersistence/util/CpEntityMapUtils.java | 32 ++-
.../batch/job/SchedulerRuntimeIntervalIT.java | 49 ++--
.../migration/EntityDataMigrationIT.java | 139 +++++------
.../migration/EntityTypeMappingMigrationIT.java | 89 +++----
.../apache/usergrid/persistence/CounterIT.java | 89 ++++---
.../usergrid/persistence/CountingMutatorIT.java | 4 +-
.../persistence/EntityDictionaryIT.java | 11 +-
.../usergrid/persistence/EntityManagerIT.java | 47 ++--
.../persistence/GeoQueryBooleanTest.java | 7 +-
.../apache/usergrid/persistence/IndexIT.java | 14 +-
.../usergrid/persistence/PathQueryIT.java | 10 +-
.../PerformanceEntityRebuildIndexTest.java | 6 +-
.../usergrid/persistence/PermissionsIT.java | 5 +-
.../cassandra/EntityManagerFactoryImplIT.java | 9 +-
.../query/AbstractIteratingQueryIT.java | 3 +-
stack/core/src/test/resources/log4j.properties | 5 +-
.../data/DataMigrationManagerImpl.java | 29 ++-
.../persistence/index/AliasedEntityIndex.java | 48 ++++
.../usergrid/persistence/index/EntityIndex.java | 5 -
.../usergrid/persistence/index/IndexFig.java | 3 +
.../persistence/index/IndexIdentifier.java | 4 +
.../index/impl/EsEntityIndexBatchImpl.java | 38 ++-
.../index/impl/EsEntityIndexImpl.java | 106 +++++----
.../persistence/index/impl/EsIndexCache.java | 114 +++++++++
.../persistence/index/impl/EntityIndexTest.java | 61 +++--
.../persistence/queue/DefaultQueueManager.java | 68 ++++++
stack/loadtests/runtests.sh | 120 ++++++++++
.../apache/usergrid/helpers/Extractors.scala | 84 +++++++
.../org/apache/usergrid/helpers/Setup.scala | 30 +--
.../usergrid/scenarios/UserScenarios.scala | 177 ++++++++++----
.../org/apache/usergrid/settings/Headers.scala | 6 +-
.../simulations/DeleteUsersSimulation.scala | 56 +++++
.../simulations/GetUserPagesSimulation.scala | 51 ++++
.../simulations/GetUsersSimulation.scala | 51 ++++
.../simulations/PutUsersSimulation.scala | 56 +++++
.../usergrid/services/TestQueueManager.java | 65 ------
.../AbstractServiceNotificationIT.java | 16 +-
.../apns/NotificationsServiceIT.java | 12 +-
.../gcm/NotificationsServiceIT.java | 15 +-
42 files changed, 1418 insertions(+), 568 deletions(-)
----------------------------------------------------------------------