You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/01/13 20:15:48 UTC
[46/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into rodsimpson_usergrid/two_dot_o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into rodsimpson_usergrid/two_dot_o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b2436c6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b2436c6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b2436c6e
Branch: refs/heads/two-dot-o-import
Commit: b2436c6ee942d3ef66628f45dbe8b08e34c42fc5
Parents: 49508e4 e090acf
Author: Rod Simpson <ro...@apigee.com>
Authored: Mon Jan 12 11:29:20 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Mon Jan 12 11:29:20 2015 -0700
----------------------------------------------------------------------
portal/Gruntfile.js | 194 ++-
portal/build.sh | 2 -
portal/config.js | 94 +-
stack/.editorconfig | 26 +
stack/awscluster/gatling-cluster-cf.json | 387 ++++++
stack/awscluster/pom.xml | 2 +-
.../main/dist/init_instance/init_rest_server.sh | 18 +-
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../src/main/groovy/NodeRegistry.groovy | 195 ++-
.../main/groovy/configure_elasticsearch.groovy | 31 +-
.../src/main/groovy/registry_list.groovy | 36 -
stack/awscluster/ugcluster-cf.json | 7 +-
stack/core/.test-tdoe-5thread.log.swp | Bin 0 -> 28672 bytes
stack/core/pom.xml | 15 +-
.../corepersistence/CpEntityDeleteListener.java | 101 --
.../CpEntityIndexDeleteListener.java | 98 --
.../corepersistence/CpEntityManager.java | 354 +++--
.../corepersistence/CpEntityManagerFactory.java | 7 +
.../corepersistence/CpRelationManager.java | 35 +-
.../usergrid/corepersistence/CpSetup.java | 16 +-
.../usergrid/corepersistence/GuiceModule.java | 43 +-
.../HybridEntityManagerFactory.java | 9 +
.../events/EntityDeletedHandler.java | 68 +
.../events/EntityVersionCreatedHandler.java | 69 +
.../events/EntityVersionDeletedHandler.java | 102 ++
.../results/FilteringLoader.java | 7 +-
.../corepersistence/util/CpEntityMapUtils.java | 32 +-
.../persistence/EntityManagerFactory.java | 10 +
.../cassandra/EntityManagerFactoryImpl.java | 5 +
.../org/apache/usergrid/AbstractCoreIT.java | 12 +-
.../apache/usergrid/ConcurrentCoreITSuite.java | 51 -
.../usergrid/ConcurrentCoreIteratorITSuite.java | 83 --
.../usergrid/ConcurrentCoreTestSuite.java | 46 -
.../java/org/apache/usergrid/CoreITSuite.java | 58 -
.../java/org/apache/usergrid/CoreTestSuite.java | 45 -
.../apache/usergrid/batch/SchedulerITSuite.java | 50 -
.../usergrid/batch/SchedulerTestSuite.java | 34 -
.../batch/job/AbstractSchedulerRuntimeIT.java | 18 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 49 +-
.../CpEntityDeleteListenerTest.java | 91 --
.../CpEntityIndexDeleteListenerTest.java | 111 --
.../corepersistence/StaleIndexCleanupTest.java | 219 ++-
.../corepersistence/TestGuiceModule.java | 9 +-
.../migration/EntityDataMigrationIT.java | 139 +-
.../migration/EntityTypeMappingMigrationIT.java | 89 +-
.../migration/GraphShardVersionMigrationIT.java | 5 +-
.../usergrid/persistence/CollectionIT.java | 15 +-
.../apache/usergrid/persistence/CounterIT.java | 93 +-
.../usergrid/persistence/CountingMutatorIT.java | 4 +-
.../persistence/EntityDictionaryIT.java | 11 +-
.../usergrid/persistence/EntityManagerIT.java | 47 +-
.../org/apache/usergrid/persistence/GeoIT.java | 844 ++++++------
.../persistence/GeoQueryBooleanTest.java | 7 +-
.../apache/usergrid/persistence/IndexIT.java | 35 +-
.../usergrid/persistence/PathQueryIT.java | 10 +-
.../PerformanceEntityRebuildIndexTest.java | 6 +-
.../usergrid/persistence/PermissionsIT.java | 5 +-
.../cassandra/EntityManagerFactoryImplIT.java | 24 +-
.../query/AbstractIteratingQueryIT.java | 16 +-
.../system/UsergridSystemMonitorIT.java | 14 +-
stack/core/src/test/resources/log4j.properties | 5 +-
.../resources/usergrid-custom-test.properties | 3 +
.../collection/EntityCollectionManager.java | 13 +-
.../collection/EntityDeletedFactory.java | 34 +
.../persistence/collection/EntitySet.java | 4 +-
.../collection/EntityVersionCleanupFactory.java | 35 +
.../collection/EntityVersionCreatedFactory.java | 31 +
.../persistence/collection/VersionSet.java | 22 +-
.../collection/event/EntityDeleted.java | 5 +-
.../collection/event/EntityVersionCreated.java | 14 +-
.../collection/event/EntityVersionDeleted.java | 11 +-
.../collection/guice/CollectionModule.java | 24 +-
.../collection/impl/CollectionScopeImpl.java | 4 +-
.../impl/EntityCollectionManagerImpl.java | 86 +-
.../collection/impl/EntityDeletedTask.java | 148 ++
.../impl/EntityVersionCleanupTask.java | 224 ++--
.../impl/EntityVersionCreatedTask.java | 122 ++
.../mvcc/stage/delete/MarkCommit.java | 137 +-
.../impl/EntityVersionSerializer.java | 3 -
.../MvccEntitySerializationStrategyImpl.java | 2 +-
.../collection/guice/TestCollectionModule.java | 4 -
.../impl/EntityVersionCleanupTaskTest.java | 450 ++++---
.../impl/EntityVersionCreatedTaskTest.java | 244 ++++
.../core/astyanax/BucketScopedRowKey.java | 3 +-
.../core/astyanax/CassandraConfig.java | 18 +
.../core/astyanax/ColumnNameIterator.java | 1 -
.../persistence/core/astyanax/ColumnSearch.java | 30 +-
.../persistence/core/astyanax/ColumnTypes.java | 19 +-
.../core/astyanax/FieldBufferBuilder.java | 1 -
.../astyanax/MultiKeyColumnNameIterator.java | 2 -
.../core/astyanax/MultiRowColumnIterator.java | 4 -
.../core/astyanax/MultiTennantColumnFamily.java | 1 -
.../persistence/core/astyanax/ScopedRowKey.java | 1 -
.../astyanax/StringRowCompositeSerializer.java | 35 +-
.../core/hystrix/HystrixCassandra.java | 3 -
.../core/migration/data/DataMigration.java | 31 +-
.../migration/data/DataMigrationException.java | 30 +-
.../migration/data/DataMigrationManager.java | 30 +-
.../data/DataMigrationManagerImpl.java | 32 +-
.../data/MigrationInfoSerialization.java | 31 +-
.../data/MigrationInfoSerializationImpl.java | 31 +-
.../migration/schema/MigrationManagerFig.java | 18 +
.../migration/schema/MigrationManagerImpl.java | 18 +
.../core/shard/ExpandingShardLocator.java | 23 +-
.../persistence/core/shard/StringHashUtils.java | 22 +-
.../core/task/NamedTaskExecutorImpl.java | 141 +-
.../usergrid/persistence/core/task/Task.java | 19 +-
.../persistence/core/task/TaskExecutor.java | 18 +
.../core/task/NamedTaskExecutorImplTest.java | 56 +-
.../persistence/model/field/LocationField.java | 8 +
.../persistence/index/AliasedEntityIndex.java | 48 +
.../usergrid/persistence/index/EntityIndex.java | 31 +-
.../persistence/index/EntityIndexBatch.java | 7 +-
.../usergrid/persistence/index/IndexFig.java | 9 +
.../persistence/index/IndexIdentifier.java | 92 ++
.../index/impl/EsEntityIndexBatchImpl.java | 55 +-
.../index/impl/EsEntityIndexImpl.java | 336 +++--
.../persistence/index/impl/EsIndexCache.java | 114 ++
.../persistence/index/impl/IndexingUtils.java | 129 +-
.../persistence/index/impl/EntityIndexTest.java | 124 +-
.../persistence/queue/DefaultQueueManager.java | 68 +
stack/loadtests/README.md | 19 +
stack/loadtests/pom.xml | 4 +-
stack/loadtests/runtests.sh | 120 ++
.../apache/usergrid/helpers/Extractors.scala | 84 ++
.../org/apache/usergrid/helpers/Setup.scala | 30 +-
.../usergrid/scenarios/DeviceScenarios.scala | 2 +-
.../usergrid/scenarios/UserScenarios.scala | 197 ++-
.../org/apache/usergrid/settings/Headers.scala | 6 +-
.../org/apache/usergrid/settings/Settings.scala | 2 +-
.../simulations/DeleteUsersSimulation.scala | 56 +
.../simulations/GetUserPagesSimulation.scala | 51 +
.../simulations/GetUsersSimulation.scala | 51 +
.../simulations/PostUsersSimulation.scala | 49 +-
.../simulations/PutUsersSimulation.scala | 56 +
.../usergrid/simulations/SetupSimulation.scala | 4 +-
stack/loadtests/src/test/scala/Engine.scala | 4 +-
stack/pom.xml | 3 +
.../org/apache/usergrid/rest/IndexResource.java | 227 ++++
.../apache/usergrid/rest/SystemResource.java | 151 +--
.../rest/management/ManagementResource.java | 2 +
.../apache/usergrid/rest/AbstractRestIT.java | 2 +-
.../apache/usergrid/rest/IndexResourceIT.java | 80 ++
.../apache/usergrid/rest/TestContextSetup.java | 6 +-
.../applications/assets/AssetResourceIT.java | 43 +-
.../collection/DuplicateNameIT.java | 2 +-
.../activities/ActivityResourceIT.java | 133 +-
.../collection/activities/PutTest.java | 33 +-
.../collection/devices/DevicesResourceIT.java | 39 +-
.../collection/groups/GroupResourceIT.java | 592 +++++---
.../collection/groups/UpdateGroupIT.java | 114 --
.../collection/paging/PagingEntitiesTest.java | 141 --
.../collection/paging/PagingResourceIT.java | 442 +++---
.../users/ConnectionResourceTest.java | 282 ++--
.../collection/users/OwnershipResourceIT.java | 424 +++---
.../collection/users/PermissionsResourceIT.java | 723 ++++------
.../collection/users/RetrieveUsersTest.java | 40 +-
.../collection/users/UserResourceIT.java | 1260 +++++++-----------
.../applications/queries/AndOrQueryTest.java | 390 +++---
.../queries/BadGrammarQueryTest.java | 78 +-
.../applications/queries/GeoPagingTest.java | 562 ++++----
.../applications/queries/MatrixQueryTests.java | 181 ++-
.../rest/applications/queries/OrderByTest.java | 269 ++--
.../rest/applications/utils/TestUtils.java | 19 +
.../rest/applications/utils/UserRepo.java | 51 +-
.../rest/management/OrganizationsIT.java | 471 +++----
.../rest/test/resource/TestContext.java | 3 +-
.../test/resource2point0/AbstractRestIT.java | 159 +++
.../rest/test/resource2point0/ClientSetup.java | 113 ++
.../rest/test/resource2point0/DumbClient.java | 58 +
.../rest/test/resource2point0/RestClient.java | 114 ++
.../endpoints/ApplicationsResource.java | 48 +
.../endpoints/CollectionEndpoint.java | 221 +++
.../endpoints/EntityEndpoint.java | 176 +++
.../endpoints/NamedResource.java | 109 ++
.../endpoints/OrganizationResource.java | 55 +
.../resource2point0/endpoints/RootResource.java | 85 ++
.../endpoints/TokenResource.java | 61 +
.../resource2point0/endpoints/UrlResource.java | 44 +
.../endpoints/mgmt/ApplicationResource.java | 48 +
.../endpoints/mgmt/ManagementResource.java | 44 +
.../endpoints/mgmt/OrgResource.java | 114 ++
.../endpoints/mgmt/OrganizationResource.java | 83 ++
.../endpoints/mgmt/TokenResource.java | 54 +
.../endpoints/mgmt/UsersResource.java | 61 +
.../resource2point0/model/ActivityEntity.java | 49 +
.../test/resource2point0/model/ApiResponse.java | 219 +++
.../test/resource2point0/model/Application.java | 39 +
.../model/ChangePasswordEntity.java | 33 +
.../test/resource2point0/model/Collection.java | 98 ++
.../rest/test/resource2point0/model/Entity.java | 204 +++
.../resource2point0/model/Organization.java | 117 ++
.../resource2point0/model/QueryParameters.java | 93 ++
.../rest/test/resource2point0/model/Token.java | 72 +
.../rest/test/resource2point0/model/User.java | 101 ++
.../resource2point0/state/ClientContext.java | 39 +
.../resources/usergrid-custom-test.properties | 2 +
stack/services/pom.xml | 268 +---
.../cassandra/ManagementServiceImpl.java | 2 -
.../notifications/apns/APNsAdapter.java | 4 +-
.../notifications/apns/EntityPushManager.java | 3 +-
.../usergrid/ConcurrentServiceITSuite.java | 60 -
.../org/apache/usergrid/NewOrgAppAdminRule.java | 159 +++
.../org/apache/usergrid/ServiceITSuite.java | 64 -
.../apache/usergrid/management/EmailFlowIT.java | 124 +-
.../usergrid/management/OrganizationIT.java | 36 +-
.../org/apache/usergrid/management/RoleIT.java | 12 +-
.../cassandra/ApplicationCreatorIT.java | 46 +-
.../management/cassandra/ExportServiceIT.java | 63 +-
.../cassandra/ManagementServiceIT.java | 94 +-
.../security/providers/FacebookProviderIT.java | 21 +-
.../providers/PingIdentityProviderIT.java | 12 +-
.../security/tokens/TokenServiceIT.java | 55 +-
.../usergrid/services/AbstractServiceIT.java | 13 +-
.../usergrid/services/ServiceFactoryIT.java | 4 +-
.../usergrid/services/ServiceRequestIT.java | 14 +-
.../usergrid/services/TestQueueManager.java | 65 -
.../AbstractServiceNotificationIT.java | 16 +-
.../apns/NotificationsServiceIT.java | 12 +-
.../gcm/NotificationsServiceIT.java | 15 +-
.../java/org/apache/usergrid/TestHelper.java | 75 ++
221 files changed, 11971 insertions(+), 6950 deletions(-)
----------------------------------------------------------------------