You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/01/09 05:21:04 UTC
[3/5] usergrid git commit: Merge branch 'master' into USERGRID-933-b
Merge branch 'master' into USERGRID-933-b
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/21730cc8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/21730cc8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/21730cc8
Branch: refs/heads/master
Commit: 21730cc88eeedec42952783ffbdc859e878a3d3a
Parents: e3d454f 63091f3
Author: Mike Dunker <md...@apigee.com>
Authored: Fri Jan 8 10:18:48 2016 -0800
Committer: Mike Dunker <md...@apigee.com>
Committed: Fri Jan 8 10:18:48 2016 -0800
----------------------------------------------------------------------
README.md | 9 +-
sdks/nodejs/lib/usergrid.js | 4 +-
.../usergrid/batch/UsergridJobFactory.java | 2 +-
.../batch/service/JobSchedulerService.java | 55 +-
.../batch/service/SchedulerServiceImpl.java | 30 +-
.../corepersistence/ApplicationIdCacheImpl.java | 4 +-
.../corepersistence/CpEntityManager.java | 56 +-
.../corepersistence/CpEntityManagerFactory.java | 13 +-
.../corepersistence/CpRelationManager.java | 37 +-
.../usergrid/corepersistence/CpWalker.java | 20 +-
.../usergrid/corepersistence/GuiceFactory.java | 4 +-
.../asyncevents/AmazonAsyncEventService.java | 9 +-
.../asyncevents/EventBuilderImpl.java | 29 +-
.../corepersistence/index/IndexServiceImpl.java | 12 +-
.../read/traverse/AbstractReadGraphFilter.java | 4 +-
.../read/traverse/EntityLoadVerifyFilter.java | 4 +-
.../results/ObservableQueryExecutor.java | 9 +-
.../service/ConnectionServiceImpl.java | 16 +-
.../usergrid/count/CassandraCounterStore.java | 11 +-
.../usergrid/count/CassandraSubmitter.java | 2 +-
.../apache/usergrid/count/SimpleBatcher.java | 2 +-
.../usergrid/count/Slf4JBatchSubmitter.java | 6 +-
.../singlenode/SingleNodeLockManagerImpl.java | 6 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 8 +-
.../mq/cassandra/io/AbstractSearch.java | 4 +-
.../mq/cassandra/io/ConsumerTransaction.java | 16 +-
.../org/apache/usergrid/persistence/Schema.java | 14 +-
.../cassandra/CassandraPersistenceUtils.java | 6 +-
.../persistence/cassandra/CassandraService.java | 8 +-
.../persistence/cassandra/CounterUtils.java | 10 +-
.../cassandra/util/TraceTagAspect.java | 11 +-
.../cassandra/util/TraceTagManager.java | 10 +-
.../persistence/entities/Notification.java | 177 +-
.../usergrid/persistence/entities/Notifier.java | 51 +-
.../usergrid/system/UsergridSystemMonitor.java | 2 +-
.../org/apache/usergrid/utils/JsonUtils.java | 12 +-
.../org/apache/usergrid/utils/MapUtils.java | 2 +-
.../org/apache/usergrid/utils/UUIDUtils.java | 5 +-
.../org/apache/usergrid/AbstractCoreIT.java | 6 +-
.../org/apache/usergrid/CoreApplication.java | 11 +-
.../org/apache/usergrid/CoreITSetupImpl.java | 12 +-
.../usergrid/batch/job/TestJobListener.java | 12 +-
.../usergrid/batch/job/TestJobListenerTest.java | 6 +-
.../count/BatchCountParallelismTest.java | 11 +-
.../locking/cassandra/HectorLockManagerIT.java | 10 +-
.../SingleNodeLockTestSingleNode.java | 10 +-
.../zookeeper/AbstractZooKeeperTest.java | 10 +-
.../java/org/apache/usergrid/mq/MessagesIT.java | 62 +-
.../org/apache/usergrid/mq/QueuePathsTest.java | 18 +-
.../usergrid/persistence/CollectionIT.java | 118 +-
.../usergrid/persistence/CoreSchemaManager.java | 11 +-
.../apache/usergrid/persistence/CounterIT.java | 32 +-
.../persistence/EntityConnectionsIT.java | 46 +-
.../persistence/EntityDictionaryIT.java | 24 +-
.../usergrid/persistence/EntityManagerIT.java | 76 +-
.../org/apache/usergrid/persistence/GeoIT.java | 21 +-
.../persistence/GeoQueryBooleanTest.java | 7 +-
.../apache/usergrid/persistence/IndexIT.java | 43 +-
.../usergrid/persistence/RebuildIndexTest.java | 17 +-
.../apache/usergrid/persistence/SchemaTest.java | 18 +-
.../query/IntersectionTransitivePagingIT.java | 4 +-
.../query/IntersectionUnionPagingIT.java | 12 +-
.../persistence/query/IteratingQueryIT.java | 104 +-
.../persistence/query/NotSubPropertyIT.java | 8 +-
.../apache/usergrid/utils/IndexUtilsTest.java | 6 +-
.../apache/usergrid/utils/JsonUtilsTest.java | 4 +-
.../apache/usergrid/utils/ListUtilsTest.java | 6 +-
.../org/apache/usergrid/utils/MapUtilsTest.java | 6 +-
.../apache/usergrid/utils/TestInflector.java | 6 +-
.../persistence/cache/ScopedCacheTest.java | 15 +-
.../EntityCollectionManagerStressTest.java | 9 +-
.../changelog/ChangeLogGeneratorImplTest.java | 8 +-
.../stage/write/WriteOptimisticVerifyTest.java | 4 +-
.../astyanax/MultiKeyColumnNameIterator.java | 2 +-
.../core/astyanax/MultiRowColumnIterator.java | 16 +-
.../migration/data/AbstractMigrationPlugin.java | 6 +-
.../data/DataMigrationManagerImpl.java | 11 +-
.../persistence/core/rx/ObservableIterator.java | 2 +-
.../persistence/core/rx/OrderedMerge.java | 6 +-
.../persistence/core/astyanax/TestUtils.java | 6 +-
.../persistence/core/rx/OrderedMergeTest.java | 38 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 12 +-
.../shard/impl/NodeShardAllocationImpl.java | 14 +-
.../shard/impl/ShardGroupColumnIterator.java | 10 +-
.../shard/impl/ShardGroupCompactionImpl.java | 30 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 30 +-
.../impl/shard/impl/ShardsColumnIterator.java | 8 +-
.../persistence/graph/GraphManagerLoadTest.java | 11 +-
.../graph/GraphManagerShardConsistencyIT.java | 35 +-
.../graph/GraphManagerStressTest.java | 10 +-
.../graph/impl/NodeDeleteListenerTest.java | 6 +-
.../serialization/EdgeSerializationTest.java | 5 +-
.../graph/serialization/TestCount.java | 4 +-
.../persistence/index/utils/UUIDUtils.java | 6 +-
.../persistence/index/impl/EntityIndexTest.java | 12 +-
.../persistence/index/impl/GeoPagingTest.java | 2 +-
.../persistence/queue/LocalQueueManager.java | 5 +
.../usergrid/launcher/EmbeddedServerHelper.java | 10 +-
stack/loadtests/.gitignore | 1 -
stack/loadtests/README.md | 207 -
stack/loadtests/pom.xml | 149 -
stack/loadtests/runAuditDeleteEntities.sh | 65 -
.../runAuditGetAllAppCollectionEntities.sh | 68 -
.../loadtests/runAuditGetCollectionEntities.sh | 68 -
.../runAuditVerifyCollectionEntities.sh | 69 -
stack/loadtests/runCollectionQueryTest.sh | 88 -
.../runCustomInjectRandomEntityByUuidTest.sh | 108 -
stack/loadtests/runDeleteEntities.sh | 92 -
.../loadtests/runGetEntitiesByNameSequential.sh | 101 -
stack/loadtests/runGetEntitiesByUuid.sh | 92 -
stack/loadtests/runLoadEntities.sh | 98 -
stack/loadtests/runLoadEntitiesUnlimited.sh | 103 -
.../loadtests/runLoadLargeMultiFieldEntities.sh | 107 -
stack/loadtests/runLoadNoNameEntities.sh | 98 -
stack/loadtests/runLoadSortableEntities.sh | 98 -
stack/loadtests/runOrgAppSetup.sh | 91 -
.../loadtests/runRandomEntityByNameQueryTest.sh | 91 -
stack/loadtests/runRandomEntityByNameTest.sh | 91 -
stack/loadtests/runUpdateEntities.sh | 91 -
stack/loadtests/runtests_deprecated.sh | 120 -
.../datagenerators/EntityDataGenerator.scala | 183 -
.../datagenerators/FeederGenerator.scala | 304 -
.../datagenerators/datafiles/dist.all.last.txt | 88799 -----------------
.../datafiles/dist.female.first.txt | 4275 -
.../datafiles/dist.male.first.txt | 1219 -
.../usergrid/datagenerators/firstNames.txt | 5494 -
.../usergrid/datagenerators/lastNames.txt | 88799 -----------------
.../org/apache/usergrid/enums/AuthType.scala | 31 -
.../usergrid/enums/ConfigProperties.scala | 181 -
.../usergrid/enums/CsvFeedPatternType.scala | 30 -
.../usergrid/enums/EndConditionType.scala | 29 -
.../org/apache/usergrid/enums/EntityType.scala | 30 -
.../apache/usergrid/enums/ScenarioType.scala | 38 -
.../org/apache/usergrid/enums/TokenType.scala | 29 -
.../apache/usergrid/helpers/Extractors.scala | 154 -
.../org/apache/usergrid/helpers/Headers.scala | 70 -
.../org/apache/usergrid/helpers/Setup.scala | 312 -
.../org/apache/usergrid/helpers/Utils.scala | 102 -
.../scenarios/ApplicationScenarios.scala | 53 -
.../usergrid/scenarios/AuditScenarios.scala | 342 -
.../scenarios/ConnectionScenarios.scala | 66 -
.../usergrid/scenarios/DeviceScenarios.scala | 85 -
.../scenarios/EntityCollectionScenarios.scala | 407 -
.../usergrid/scenarios/EntityScenarios.scala | 80 -
.../usergrid/scenarios/GeoScenarios.scala | 49 -
.../scenarios/NotificationScenarios.scala | 80 -
.../usergrid/scenarios/NotifierScenarios.scala | 70 -
.../scenarios/OrganizationScenarios.scala | 60 -
.../usergrid/scenarios/TokenScenarios.scala | 56 -
.../usergrid/scenarios/UserScenarios.scala | 210 -
.../org/apache/usergrid/settings/Settings.scala | 612 -
.../usergrid/simulations/AuditSimulation.scala | 86 -
.../simulations/ConfigurableSimulation.scala | 105 -
.../simulations/CustomInjectionSimulation.scala | 107 -
.../simulations/deprecated/AppSimulation.scala | 41 -
.../deprecated/ConnectionsSimulation.scala | 51 -
.../deprecated/DeleteUsersSimulation.scala | 56 -
.../deprecated/GetEntitySimulation.scala | 44 -
.../deprecated/GetUserPagesSimulation.scala | 51 -
.../deprecated/GetUsersSimulation.scala | 51 -
.../deprecated/PostCustomEntitySimulation.scala | 76 -
.../deprecated/PostUsersSimulation.scala | 51 -
.../PushNotificationTargetUserSimulation.scala | 45 -
.../deprecated/PutCustomEntitySimulation.scala | 75 -
.../deprecated/PutUsersSimulation.scala | 56 -
.../deprecated/SetupSimulation.scala | 43 -
stack/loadtests/src/main/scripts/gatling-mvn.sh | 31 -
stack/loadtests/src/main/scripts/gatling-ug.sh | 51 -
.../src/test/resources/dummyAuditUuid.csv | 1 -
.../loadtests/src/test/resources/dummyUuid.csv | 1 -
stack/loadtests/src/test/resources/gatling.conf | 150 -
.../src/test/resources/logback-test.xml | 39 -
stack/loadtests/src/test/resources/logback.xml | 38 -
.../loadtests/src/test/resources/recorder.conf | 37 -
stack/loadtests/src/test/scala/Engine.scala | 29 -
.../src/test/scala/IDEPathHelper.scala | 38 -
stack/loadtests/src/test/scala/Recorder.scala | 28 -
stack/loadtests/testConfig.sh | 68 -
.../usergrid/mongo/AbstractMongoTest.java | 2 +-
stack/pom.xml | 3077 +-
.../usergrid/rest/AbstractContextResource.java | 14 +-
.../org/apache/usergrid/rest/RootResource.java | 5 +-
.../rest/applications/ApplicationResource.java | 47 +-
.../rest/applications/ServiceResource.java | 59 +-
.../applications/assets/AssetsResource.java | 2 +-
.../notifiers/NotifierResource.java | 4 +-
.../notifiers/NotifiersResource.java | 4 +-
.../rest/applications/users/UserResource.java | 4 +-
.../rest/applications/users/UsersResource.java | 19 +-
.../exceptions/AbstractExceptionMapper.java | 1 +
.../rest/filters/ContentTypeFilter.java | 18 +-
.../usergrid/rest/filters/TracingFilter.java | 2 +-
.../rest/management/ManagementResource.java | 8 +-
.../organizations/OrganizationResource.java | 20 +-
.../organizations/OrganizationsResource.java | 12 +-
.../applications/ApplicationResource.java | 8 +-
.../applications/ApplicationsResource.java | 4 +-
.../applications/imports/ImportsResource.java | 6 +-
.../organizations/users/UsersResource.java | 2 +-
.../rest/management/users/UserResource.java | 4 +-
.../rest/management/users/UsersResource.java | 6 +-
.../organizations/OrganizationsResource.java | 4 +-
.../organizations/OrganizationResource.java | 4 +-
.../security/SecuredResourceFilterFactory.java | 57 +-
.../shiro/filters/BasicAuthSecurityFilter.java | 9 +-
.../ClientCredentialsSecurityFilter.java | 4 +-
.../OAuth2AccessTokenSecurityFilter.java | 5 +-
.../rest/system/ApplicationsResource.java | 4 +-
.../usergrid/rest/system/IndexResource.java | 2 +-
.../usergrid/rest/system/MigrateResource.java | 6 +-
.../rest/test/RefreshIndexResource.java | 2 +-
.../apache/usergrid/rest/IndexResourceIT.java | 2 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 8 +-
.../org/apache/usergrid/rest/TomcatRuntime.java | 12 +-
.../applications/assets/AssetResourceIT.java | 10 +-
.../applications/assets/AwsAssetResourceIT.java | 12 +-
.../collection/CollectionsResourceIT.java | 2 +-
.../activities/ActivityResourceIT.java | 2 +-
.../users/ConnectionResourceTest.java | 2 +-
.../collection/users/UserResourceIT.java | 13 +-
.../users/extensions/TestResource.java | 5 +-
.../applications/events/EventsResourceIT.java | 2 +-
.../applications/queries/AndOrQueryTest.java | 6 +-
.../applications/queries/GeoPagingTest.java | 6 +-
.../rest/applications/queries/OrderByTest.java | 8 +-
.../applications/queries/QueryTestBase.java | 4 +-
.../rest/management/ImportResourceIT.java | 4 +-
.../rest/management/OrganizationsIT.java | 61 +
.../organizations/AdminEmailEncodingIT.java | 2 +-
.../rest/test/resource/AbstractRestIT.java | 10 +-
.../rest/test/resource/ClientSetup.java | 75 +-
.../resource/endpoints/CollectionEndpoint.java | 20 +-
.../endpoints/mgmt/ApplicationResource.java | 8 +-
.../resource/endpoints/mgmt/OrgResource.java | 9 +-
stack/services/pom.xml | 3 +-
.../management/AppInfoMigrationPlugin.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 67 +-
.../management/importer/ImportServiceImpl.java | 547 +-
.../management/importer/S3ImportImpl.java | 5 +-
.../security/providers/AbstractProvider.java | 42 +-
.../security/providers/FacebookProvider.java | 5 +-
.../security/providers/FoursquareProvider.java | 2 +-
.../providers/PingIdentityProvider.java | 97 +-
.../apache/usergrid/security/shiro/Realm.java | 18 +-
.../usergrid/security/shiro/ShiroCache.java | 12 +-
.../principals/ApplicationUserPrincipal.java | 4 +-
.../shiro/principals/OrganizationPrincipal.java | 38 +-
.../shiro/principals/PrincipalIdentifier.java | 8 +-
.../security/shiro/utils/SubjectUtils.java | 4 +-
.../services/AbstractCollectionService.java | 34 +-
.../services/AbstractConnectionsService.java | 6 +-
.../usergrid/services/AbstractService.java | 9 +-
.../apache/usergrid/services/ServiceInfo.java | 7 +-
.../usergrid/services/ServiceManager.java | 14 +-
.../usergrid/services/ServiceRequest.java | 4 +-
.../usergrid/services/ServiceResults.java | 8 +-
.../services/activities/ActivitiesService.java | 4 +-
.../applications/ApplicationsService.java | 8 +-
.../usergrid/services/assets/AssetsService.java | 12 +-
.../services/assets/data/AssetUtils.java | 2 +-
.../assets/data/AwsSdkS3BinaryStore.java | 4 +-
.../assets/data/LocalFileBinaryStore.java | 2 +-
.../services/assets/data/S3BinaryStore.java | 26 +-
.../services/devices/DevicesService.java | 8 +-
.../services/devices/users/UsersService.java | 4 +-
.../usergrid/services/groups/GroupsService.java | 8 +-
.../groups/activities/ActivitiesService.java | 4 +-
.../services/groups/roles/RolesService.java | 4 +-
.../services/groups/users/UsersService.java | 4 +-
.../users/activities/ActivitiesService.java | 4 +-
.../groups/users/devices/DevicesService.java | 4 +-
.../services/messages/MessagesService.java | 4 +-
.../notifications/InactiveDeviceManager.java | 4 +-
.../services/notifications/JobScheduler.java | 11 +-
.../notifications/NotificationsService.java | 36 +-
.../services/notifications/ProviderAdapter.java | 5 +-
.../services/notifications/QueueListener.java | 61 +-
.../services/notifications/TaskManager.java | 45 +-
.../services/notifications/TestAdapter.java | 16 +-
.../notifications/apns/APNsAdapter.java | 13 +-
.../services/notifications/gcm/GCMAdapter.java | 93 +-
.../impl/ApplicationQueueManagerImpl.java | 84 +-
.../services/notifications/wns/WNSAdapter.java | 10 +-
.../services/queues/ImportQueueListener.java | 4 +-
.../usergrid/services/queues/QueueListener.java | 35 +-
.../usergrid/services/roles/RolesService.java | 4 +-
.../services/roles/groups/GroupsService.java | 4 +-
.../services/roles/users/UsersService.java | 4 +-
.../usergrid/services/users/UsersService.java | 4 +-
.../users/activities/ActivitiesService.java | 4 +-
.../services/users/devices/DevicesService.java | 8 +-
.../services/users/groups/GroupsService.java | 4 +-
.../org/apache/usergrid/NewOrgAppAdminRule.java | 4 +-
.../org/apache/usergrid/ServiceApplication.java | 14 +-
.../migration/AppInfoMigrationPluginTest.java | 8 +-
.../apache/usergrid/management/EmailFlowIT.java | 22 +-
.../org/apache/usergrid/management/RoleIT.java | 8 +-
.../cassandra/ManagementServiceIT.java | 12 +-
.../management/export/ExportServiceIT.java | 4 +-
.../management/export/MockS3ExportImpl.java | 2 +-
.../management/importer/ImportServiceIT.java | 17 +-
.../security/tokens/TokenServiceIT.java | 10 +-
.../usergrid/services/ServiceInvocationIT.java | 4 +-
.../AbstractServiceNotificationIT.java | 2 +-
.../apns/MockSuccessfulProviderAdapter.java | 4 +-
.../apns/NotificationsServiceIT.java | 22 +-
.../gcm/MockSuccessfulProviderAdapter.java | 8 +-
.../gcm/NotificationsServiceIT.java | 229 +-
.../notifications/wns/WNSAdapterTest.java | 5 -
.../java/org/apache/usergrid/TomcatMain.java | 10 +-
.../usergrid/cassandra/AvailablePortFinder.java | 18 +-
.../usergrid/cassandra/CassandraResource.java | 6 +-
.../usergrid/cassandra/ClearShiroSubject.java | 8 +-
.../usergrid/cassandra/SpringResource.java | 10 +-
.../usergrid/cassandra/SpringResourceTest.java | 10 +-
stack/tools/pom.xml | 8 +-
.../org/apache/usergrid/tools/AppAudit.java | 2 +-
.../java/org/apache/usergrid/tools/Cli.java | 35 +-
.../org/apache/usergrid/tools/DupOrgRepair.java | 2 +-
.../usergrid/tools/EntityInsertBenchMark.java | 272 -
.../usergrid/tools/EntityReadBenchMark.java | 353 -
.../java/org/apache/usergrid/tools/Export.java | 26 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 26 +-
.../org/apache/usergrid/tools/ExportApp.java | 128 +-
.../usergrid/tools/ExportDataCreator.java | 41 +-
.../java/org/apache/usergrid/tools/Import.java | 11 +-
.../org/apache/usergrid/tools/ImportAdmins.java | 104 +-
.../org/apache/usergrid/tools/IndexRebuild.java | 184 -
.../java/org/apache/usergrid/tools/Metrics.java | 2 +-
.../usergrid/tools/OrganizationExport.java | 2 +-
.../apache/usergrid/tools/PopulateSample.java | 2 +-
.../RepairingMismatchedApplicationMetadata.java | 119 -
.../org/apache/usergrid/tools/ToolBase.java | 11 +-
.../usergrid/tools/UniqueIndexCleanup.java | 386 -
.../org/apache/usergrid/tools/UserManager.java | 3 +-
.../apache/usergrid/tools/WarehouseExport.java | 133 +-
.../apache/usergrid/tools/WarehouseUpsert.java | 30 +-
.../apache/usergrid/tools/bean/MetricQuery.java | 6 +-
stack/tools/src/main/resources/log4j.properties | 33 +-
.../main/resources/toolsApplicationContext.xml | 124 +-
.../apache/usergrid/tools/ExportAppTest.java | 56 +-
.../usergrid/tools/ExportImportAdminsTest.java | 40 +-
.../test/resources/usergrid-test-context.xml | 63 +
.../websocket/WebSocketChannelHandler.java | 16 +-
tests/integration/.gitignore | 2 +
tests/integration/LICENSE | 327 +
tests/integration/README.md | 8 +
tests/integration/config/default.js | 28 +
tests/integration/config/index.js | 28 +
tests/integration/index.js | 23 +
tests/integration/lib/entities.js | 135 +
tests/integration/lib/random.js | 39 +
tests/integration/lib/response.js | 23 +
tests/integration/lib/token.js | 64 +
tests/integration/lib/urls.js | 40 +
tests/integration/lib/users.js | 48 +
tests/integration/package.json | 16 +
.../test/authentication/management.js | 40 +
tests/integration/test/authentication/org.js | 39 +
tests/integration/test/authentication/shawn | 1 +
tests/integration/test/authentication/user.js | 40 +
tests/integration/test/authorization/shawn | 1 +
tests/integration/test/collections/brandon | 1 +
tests/integration/test/connections/brandon | 1 +
tests/integration/test/entities/brandon | 1 +
tests/integration/test/entities/create.js | 37 +
tests/integration/test/entities/deleteAll.js | 39 +
tests/integration/test/entities/get.js | 60 +
tests/integration/test/entities/update.js | 44 +
tests/integration/test/main.js | 66 +
tests/integration/test/management/shawn | 1 +
tests/integration/test/mocha.opts | 3 +
.../test/queries/integerComparison.js | 77 +
tests/integration/test/setup.js | 98 +
tests/integration/test/teardown.js | 56 +
tests/integration/test/users/create.js | 47 +
tests/performance/.gitignore | 1 +
tests/performance/LICENSE | 327 +
tests/performance/README.md | 207 +
tests/performance/pom.xml | 149 +
tests/performance/runAuditDeleteEntities.sh | 65 +
.../runAuditGetAllAppCollectionEntities.sh | 68 +
.../runAuditGetCollectionEntities.sh | 68 +
.../runAuditVerifyCollectionEntities.sh | 69 +
tests/performance/runCollectionQueryTest.sh | 88 +
.../runCustomInjectRandomEntityByUuidTest.sh | 108 +
tests/performance/runDeleteEntities.sh | 92 +
.../runGetEntitiesByNameSequential.sh | 101 +
tests/performance/runGetEntitiesByUuid.sh | 92 +
tests/performance/runLoadEntities.sh | 98 +
tests/performance/runLoadEntitiesUnlimited.sh | 103 +
.../runLoadLargeMultiFieldEntities.sh | 107 +
tests/performance/runLoadNoNameEntities.sh | 98 +
tests/performance/runLoadSortableEntities.sh | 98 +
tests/performance/runOrgAppSetup.sh | 91 +
.../runRandomEntityByNameQueryTest.sh | 91 +
tests/performance/runRandomEntityByNameTest.sh | 91 +
tests/performance/runUpdateEntities.sh | 91 +
tests/performance/runtests_deprecated.sh | 120 +
.../datagenerators/EntityDataGenerator.scala | 183 +
.../datagenerators/FeederGenerator.scala | 304 +
.../datagenerators/datafiles/dist.all.last.txt | 88799 +++++++++++++++++
.../datafiles/dist.female.first.txt | 4275 +
.../datafiles/dist.male.first.txt | 1219 +
.../usergrid/datagenerators/firstNames.txt | 5494 +
.../usergrid/datagenerators/lastNames.txt | 88799 +++++++++++++++++
.../org/apache/usergrid/enums/AuthType.scala | 31 +
.../usergrid/enums/ConfigProperties.scala | 181 +
.../usergrid/enums/CsvFeedPatternType.scala | 30 +
.../usergrid/enums/EndConditionType.scala | 29 +
.../org/apache/usergrid/enums/EntityType.scala | 30 +
.../apache/usergrid/enums/ScenarioType.scala | 38 +
.../org/apache/usergrid/enums/TokenType.scala | 29 +
.../apache/usergrid/helpers/Extractors.scala | 154 +
.../org/apache/usergrid/helpers/Headers.scala | 70 +
.../org/apache/usergrid/helpers/Setup.scala | 312 +
.../org/apache/usergrid/helpers/Utils.scala | 102 +
.../scenarios/ApplicationScenarios.scala | 53 +
.../usergrid/scenarios/AuditScenarios.scala | 342 +
.../scenarios/ConnectionScenarios.scala | 66 +
.../usergrid/scenarios/DeviceScenarios.scala | 85 +
.../scenarios/EntityCollectionScenarios.scala | 407 +
.../usergrid/scenarios/EntityScenarios.scala | 80 +
.../usergrid/scenarios/GeoScenarios.scala | 49 +
.../scenarios/NotificationScenarios.scala | 80 +
.../usergrid/scenarios/NotifierScenarios.scala | 70 +
.../scenarios/OrganizationScenarios.scala | 60 +
.../usergrid/scenarios/TokenScenarios.scala | 56 +
.../usergrid/scenarios/UserScenarios.scala | 210 +
.../org/apache/usergrid/settings/Settings.scala | 612 +
.../usergrid/simulations/AuditSimulation.scala | 86 +
.../simulations/ConfigurableSimulation.scala | 105 +
.../simulations/CustomInjectionSimulation.scala | 107 +
.../simulations/deprecated/AppSimulation.scala | 41 +
.../deprecated/ConnectionsSimulation.scala | 51 +
.../deprecated/DeleteUsersSimulation.scala | 56 +
.../deprecated/GetEntitySimulation.scala | 44 +
.../deprecated/GetUserPagesSimulation.scala | 51 +
.../deprecated/GetUsersSimulation.scala | 51 +
.../deprecated/PostCustomEntitySimulation.scala | 76 +
.../deprecated/PostUsersSimulation.scala | 51 +
.../PushNotificationTargetUserSimulation.scala | 45 +
.../deprecated/PutCustomEntitySimulation.scala | 75 +
.../deprecated/PutUsersSimulation.scala | 56 +
.../deprecated/SetupSimulation.scala | 43 +
.../performance/src/main/scripts/gatling-mvn.sh | 31 +
.../performance/src/main/scripts/gatling-ug.sh | 51 +
.../src/test/resources/dummyAuditUuid.csv | 1 +
.../src/test/resources/dummyUuid.csv | 1 +
.../performance/src/test/resources/gatling.conf | 150 +
.../src/test/resources/logback-test.xml | 39 +
.../performance/src/test/resources/logback.xml | 38 +
.../src/test/resources/recorder.conf | 37 +
tests/performance/src/test/scala/Engine.scala | 29 +
.../src/test/scala/IDEPathHelper.scala | 38 +
tests/performance/src/test/scala/Recorder.scala | 28 +
tests/performance/testConfig.sh | 68 +
457 files changed, 202172 insertions(+), 200780 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/core/src/main/java/org/apache/usergrid/utils/MapUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
index a70f766,79c5030..cd4ebb1
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
@@@ -417,14 -404,13 +425,16 @@@ public class OrganizationResource exten
@JSONP
@PUT
@Path("config")
- public ApiResponse putConfig( @Context UriInfo ui, Map<String, Object> json,
- @QueryParam("callback") @DefaultValue("callback") String callback )
+ public ApiResponse putConfig( @Context UriInfo ui,
+ Map<String, Object> json,
+ @QueryParam("separate_defaults") @DefaultValue("false") boolean separateDefaults,
+ @QueryParam("only_changed") @DefaultValue("false") boolean onlyChanged,
+ @QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.debug("Put configuration for organization: " + organization.getUuid());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Put configuration for organization: " + organization.getUuid());
+ }
ApiResponse response = createApiResponse();
response.setAction("put organization configuration");
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --cc stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 99ea05f,1e0f944..3f4bef5
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@@ -498,13 -474,15 +506,15 @@@ public class ManagementServiceImpl impl
return null;
}
if ( areActivationChecksDisabled() ) {
- user = createAdminUserInternal( username, name, email, password, true, false, userProperties );
+ user = createAdminUserInternal( null, username, name, email, password, true, false, userProperties );
}
else {
- user = createAdminUserInternal( username, name, email, password, activated, disabled, userProperties );
+ user = createAdminUserInternal( null, username, name, email, password, activated, disabled, userProperties );
}
- logger.debug("User created");
+ if(logger.isDebugEnabled()){
+ logger.debug("User created");
+ }
organization = createOrganizationInternal( null, organizationName, user, true, organizationProperties );
}
finally {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/services/src/test/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPluginTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/21730cc8/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
----------------------------------------------------------------------