Merge branch 'master' into asf-site. Conflicts: website/tmp/checksums website/tmp/compiled_content website/tmp/dependencies website/tmp/rule_memory
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6474c036 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6474c036 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6474c036 Branch: refs/heads/usergrid-1318-queue Commit: 6474c03694014f3d9ddbcb52b85cf61f4aa6f836 Parents: cbe501a a77ec46e Author: Dave Johnson <snoopd...@apache.org> Authored: Thu Feb 4 09:56:55 2016 -0800 Committer: Dave Johnson <snoopd...@apache.org> Committed: Thu Feb 4 09:56:55 2016 -0800 ---------------------------------------------------------------------- .gitignore | 3 +- README.md | 9 +- content/docs/README.html | 2 +- .../data-queries/operators-and-types.txt | 25 +- content/docs/_sources/index.txt | 2 +- .../_sources/installation/deployment-guide.txt | 484 + content/docs/_sources/introduction/overview.txt | 4 +- .../file-storage-configuration.html | 2 +- content/docs/assets-and-files/folders.html | 2 +- .../assets-and-files/legacy-asset-support.html | 2 +- .../assets-and-files/retrieving-assets.html | 2 +- .../docs/assets-and-files/uploading-assets.html | 2 +- .../creating-and-incrementing-counters.html | 2 +- .../events-and-counters.html | 2 +- .../retrieving-counters.html | 2 +- .../docs/data-queries/advanced-query-usage.html | 2 +- .../docs/data-queries/operators-and-types.html | 41 +- content/docs/data-queries/query-parameters.html | 2 +- .../docs/data-queries/querying-your-data.html | 2 +- content/docs/data-storage/collections.html | 2 +- content/docs/data-storage/data-store-dbms.html | 2 +- content/docs/data-storage/entities.html | 2 +- .../docs/data-storage/optimizing-access.html | 2 +- .../entity-connections/connecting-entities.html | 2 +- .../disconnecting-entities.html | 2 +- .../entity-connections/retrieving-entities.html | 2 +- content/docs/genindex.html | 2 +- content/docs/geolocation/geolocation.html | 2 +- .../creating-a-new-application.html | 2 +- .../docs/getting-started/creating-account.html | 2 +- .../getting-started/using-a-sandbox-app.html | 2 +- content/docs/getting-started/using-the-api.html | 2 +- content/docs/index.html | 15 +- content/docs/installation/deployment-guide.html | 848 + .../docs/installation/ug1-deploy-to-tomcat.html | 2 +- .../installation/ug1-launcher-quick-start.html | 6 +- .../docs/installation/ug2-deploy-to-tomcat.html | 31 +- content/docs/introduction/async-vs-sync.html | 2 +- content/docs/introduction/data-model.html | 2 +- content/docs/introduction/overview.html | 11 +- .../docs/introduction/usergrid-features.html | 2 +- content/docs/jersey2skeleton/README.html | 2 +- content/docs/orgs-and-apps/admin-user.html | 2 +- content/docs/orgs-and-apps/application.html | 2 +- content/docs/orgs-and-apps/managing.html | 2 +- content/docs/orgs-and-apps/organization.html | 2 +- .../push-notifications/adding-push-support.html | 2 +- .../creating-and-managing-notifications.html | 2 +- .../push-notifications/creating-notifiers.html | 2 +- .../push-notifications/getting-started.html | 2 +- .../managing-users-and-devices.html | 2 +- content/docs/push-notifications/overview.html | 2 +- .../docs/push-notifications/registering.html | 2 +- content/docs/push-notifications/tbd.html | 2 +- .../push-notifications/troubleshooting.html | 2 +- content/docs/push-notifications/tutorial.html | 2 +- .../docs/push-notifications/users-devices.html | 2 +- content/docs/reference/contribute-code.html | 2 +- content/docs/reference/presos-and-videos.html | 6 +- content/docs/rest-endpoints/api-docs.html | 2 +- content/docs/sdks/ios-new.html | 2 +- content/docs/sdks/sdk-outline.html | 2 +- content/docs/sdks/tbd.html | 2 +- content/docs/search.html | 2 +- content/docs/searchindex.js | 2 +- .../docs/security-and-auth/app-security.html | 2 +- .../authenticating-api-requests.html | 2 +- ...nticating-users-and-application-clients.html | 2 +- .../changing-token-time-live-ttl.html | 2 +- .../docs/security-and-auth/facebook-sign.html | 2 +- .../revoking-tokens-logout.html | 2 +- .../security-and-auth/securing-your-app.html | 2 +- .../user-authentication-types.html | 2 +- .../security-and-auth/using-permissions.html | 2 +- content/docs/security-and-auth/using-roles.html | 2 +- content/docs/user-management/activity.html | 2 +- content/docs/user-management/group.html | 2 +- content/docs/user-management/groups.html | 2 +- .../docs/user-management/messagee-example.html | 2 +- .../docs/user-management/user-connections.html | 2 +- .../docs/user-management/user-management.html | 2 +- .../docs/user-management/working-user-data.html | 2 +- deployment/aws/README.md | 172 + deployment/aws/assembly.xml | 74 + deployment/aws/aws-sample.properties | 19 + deployment/aws/gatling-cluster-cf.json | 386 + deployment/aws/pom.xml | 238 + deployment/aws/src/main/cql/update_locks.cql | 23 + deployment/aws/src/main/cql/update_usergrid.cql | 27 + .../main/cql/update_usergrid_applications.cql | 46 + .../src/main/dist/init_instance/create_raid0.sh | 54 + .../main/dist/init_instance/init_db_server.sh | 76 + .../main/dist/init_instance/init_es_server.sh | 71 + .../dist/init_instance/init_graphite_server.sh | 69 + .../dist/init_instance/init_opscenter_server.sh | 287 + .../main/dist/init_instance/init_rest_server.sh | 257 + .../dist/init_instance/install_cassandra.sh | 51 + .../main/dist/init_instance/install_collectd.sh | 350 + .../dist/init_instance/install_elasticsearch.sh | 123 + .../init_instance/install_opscenter_agent.sh | 42 + .../dist/init_instance/install_oraclejdk.sh | 55 + .../main/dist/init_instance/install_yourkit.sh | 39 + .../main/dist/init_instance/update_keyspaces.sh | 75 + .../aws/src/main/dist/lib/log4j.properties | 53 + deployment/aws/src/main/dist/update.sh | 35 + .../aws/src/main/groovy/NodeRegistry.groovy | 227 + .../src/main/groovy/configure_cassandra.groovy | 125 + .../main/groovy/configure_elasticsearch.groovy | 169 + .../groovy/configure_opscenter_agent.groovy | 50 + .../groovy/configure_opscenter_cassandra.groovy | 120 + .../groovy/configure_opscenter_usergrid.groovy | 58 + .../src/main/groovy/configure_portal_new.groovy | 28 + .../src/main/groovy/configure_usergrid.groovy | 193 + .../aws/src/main/groovy/create_dashboard.groovy | 79 + .../src/main/groovy/get_first_instance.groovy | 46 + .../src/main/groovy/registry_register.groovy | 38 + .../aws/src/main/groovy/tag_instance.groovy | 55 + .../src/main/groovy/wait_for_instances.groovy | 47 + deployment/aws/ugcluster-cf.json | 2062 + docs/data-queries/operators-and-types.md | 25 +- docs/index.rst | 2 +- docs/installation/deployment-guide.md | 484 + docs/introduction/overview.md | 4 +- docs/push.tgz | Bin 1651449 -> 0 bytes portal/Gruntfile.js | 5 +- portal/bower.json | 2 +- portal/getStatus.js | 37 + portal/package.json | 2 +- portal/status.html | 35 + .../apache/usergrid/android/sdk/UGClient.java | 12 +- sdks/ios/README.md | 53 +- sdks/nodejs/lib/usergrid.js | 4 +- stack/Coverage.md | 2 +- stack/awscluster/README.md | 163 - stack/awscluster/assembly.xml | 74 - stack/awscluster/aws-sample.properties | 19 - stack/awscluster/gatling-cluster-cf.json | 386 - stack/awscluster/pom.xml | 237 - stack/awscluster/src/main/cql/update_locks.cql | 23 - .../awscluster/src/main/cql/update_usergrid.cql | 27 - .../main/cql/update_usergrid_applications.cql | 46 - .../src/main/dist/init_instance/create_raid0.sh | 54 - .../main/dist/init_instance/init_db_server.sh | 76 - .../main/dist/init_instance/init_es_server.sh | 71 - .../dist/init_instance/init_graphite_server.sh | 69 - .../dist/init_instance/init_opscenter_server.sh | 287 - .../main/dist/init_instance/init_rest_server.sh | 257 - .../dist/init_instance/install_cassandra.sh | 51 - .../main/dist/init_instance/install_collectd.sh | 350 - .../dist/init_instance/install_elasticsearch.sh | 123 - .../init_instance/install_opscenter_agent.sh | 42 - .../dist/init_instance/install_oraclejdk.sh | 55 - .../main/dist/init_instance/install_yourkit.sh | 39 - .../main/dist/init_instance/update_keyspaces.sh | 75 - .../src/main/dist/lib/log4j.properties | 54 - stack/awscluster/src/main/dist/update.sh | 35 - .../awscluster/src/main/dist/webapps/dummy.txt | 0 .../src/main/groovy/NodeRegistry.groovy | 227 - .../src/main/groovy/configure_cassandra.groovy | 129 - .../main/groovy/configure_elasticsearch.groovy | 169 - .../groovy/configure_opscenter_agent.groovy | 50 - .../groovy/configure_opscenter_cassandra.groovy | 120 - .../groovy/configure_opscenter_usergrid.groovy | 58 - .../src/main/groovy/configure_portal_new.groovy | 28 - .../src/main/groovy/configure_usergrid.groovy | 207 - .../src/main/groovy/create_dashboard.groovy | 79 - .../src/main/groovy/get_first_instance.groovy | 46 - .../src/main/groovy/registry_register.groovy | 38 - .../src/main/groovy/tag_instance.groovy | 55 - .../src/main/groovy/wait_for_instances.groovy | 47 - stack/awscluster/ugcluster-cf.json | 2062 - stack/build-tools/pom.xml | 11 + stack/config/pom.xml | 10 + .../main/resources/usergrid-default.properties | 40 +- .../src/test/resources/usergrid-test.properties | 20 +- stack/core/pom.xml | 16 +- .../usergrid/batch/UsergridJobFactory.java | 2 +- .../apache/usergrid/batch/job/OnlyOnceJob.java | 3 +- .../batch/service/JobSchedulerService.java | 55 +- .../batch/service/SchedulerServiceImpl.java | 34 +- .../hazelcast/HazelcastLifecycleMonitor.java | 8 +- .../corepersistence/ApplicationIdCacheImpl.java | 4 +- .../usergrid/corepersistence/CoreModule.java | 134 +- .../corepersistence/CpEntityManager.java | 196 +- .../corepersistence/CpEntityManagerFactory.java | 37 +- .../corepersistence/CpRelationManager.java | 130 +- .../usergrid/corepersistence/CpSetup.java | 16 +- .../usergrid/corepersistence/CpWalker.java | 19 +- .../usergrid/corepersistence/GuiceFactory.java | 6 +- .../asyncevents/AmazonAsyncEventService.java | 63 +- .../asyncevents/AsyncEventsSchedulerFig.java | 76 + .../asyncevents/AsyncIndexProvider.java | 2 +- .../asyncevents/EventBuilderImpl.java | 91 +- .../asyncevents/EventExecutionScheduler.java | 37 + .../index/IndexProcessorFig.java | 2 +- .../corepersistence/index/IndexServiceImpl.java | 12 +- .../index/ReIndexServiceImpl.java | 6 +- .../migration/DeDupConnectionDataMigration.java | 2 +- .../pipeline/PipelineModule.java | 2 +- .../pipeline/PipelineOperations.java | 30 - .../search/AbstractElasticSearchFilter.java | 4 +- .../read/search/CandidateEntityFilter.java | 15 +- .../pipeline/read/search/CandidateIdFilter.java | 6 +- .../read/search/SearchCollectionFilter.java | 2 - .../read/search/SearchConnectionFilter.java | 8 +- .../read/traverse/AbstractReadGraphFilter.java | 49 +- .../read/traverse/EntityLoadVerifyFilter.java | 4 +- .../traverse/ReadGraphCollectionFilter.java | 3 +- .../traverse/ReadGraphConnectionFilter.java | 3 +- .../results/ObservableQueryExecutor.java | 9 +- .../rx/impl/AllApplicationsObservable.java | 2 - .../corepersistence/rx/impl/AsyncRepair.java | 38 + .../rx/impl/ResponseImportTasks.java | 38 + .../service/ConnectionServiceImpl.java | 16 +- .../service/ServiceSchedulerFig.java | 66 + .../corepersistence/util/CpNamingUtils.java | 23 +- .../usergrid/count/CassandraCounterStore.java | 13 +- .../usergrid/count/CassandraSubmitter.java | 4 +- .../apache/usergrid/count/SimpleBatcher.java | 2 +- .../usergrid/count/Slf4JBatchSubmitter.java | 6 +- .../locking/cassandra/AstyanaxLockImpl.java | 92 + .../cassandra/AstyanaxLockManagerImpl.java | 211 + .../locking/cassandra/HectorLockImpl.java | 86 - .../cassandra/HectorLockManagerImpl.java | 142 - .../usergrid/locking/guice/LockModule.java | 40 + .../locking/singlenode/SingleNodeLockImpl.java | 71 - .../singlenode/SingleNodeLockManagerImpl.java | 94 - .../zookeeper/ZooKeeperLockManagerImpl.java | 115 - .../locking/zookeeper/ZookeeperLockImpl.java | 88 - .../org/apache/usergrid/mq/CounterQuery.java | 4 - .../java/org/apache/usergrid/mq/Message.java | 4 +- .../main/java/org/apache/usergrid/mq/Query.java | 16 +- .../usergrid/mq/cassandra/CassandraMQUtils.java | 8 +- .../mq/cassandra/QueueManagerFactoryImpl.java | 5 +- .../usergrid/mq/cassandra/QueueManagerImpl.java | 24 +- .../apache/usergrid/mq/cassandra/QueuesCF.java | 2 +- .../mq/cassandra/io/AbstractSearch.java | 9 +- .../mq/cassandra/io/ConsumerTransaction.java | 32 +- .../mq/cassandra/io/NoTransactionSearch.java | 2 +- .../usergrid/persistence/EntityManager.java | 5 +- .../persistence/EntityManagerFactory.java | 8 +- .../org/apache/usergrid/persistence/Schema.java | 26 +- .../cassandra/CassandraPersistenceUtils.java | 8 +- .../persistence/cassandra/CassandraService.java | 65 +- .../cassandra/ConnectionRefImpl.java | 4 +- .../persistence/cassandra/CounterUtils.java | 28 +- .../usergrid/persistence/cassandra/Setup.java | 4 - .../cassandra/util/Slf4jTraceTagReporter.java | 4 +- .../cassandra/util/TraceTagAspect.java | 11 +- .../cassandra/util/TraceTagManager.java | 10 +- .../persistence/entities/Notification.java | 177 +- .../usergrid/persistence/entities/Notifier.java | 51 +- .../usergrid/system/ServerEnvironmentProps.java | 27 + .../usergrid/system/UsergridSystemMonitor.java | 4 +- .../org/apache/usergrid/utils/AESUtils.java | 8 +- .../apache/usergrid/utils/ConversionUtils.java | 6 +- .../org/apache/usergrid/utils/IndexUtils.java | 4 +- .../org/apache/usergrid/utils/JsonUtils.java | 22 +- .../org/apache/usergrid/utils/ListUtils.java | 10 +- .../org/apache/usergrid/utils/MailUtils.java | 2 +- .../org/apache/usergrid/utils/MapUtils.java | 8 +- .../org/apache/usergrid/utils/StringUtils.java | 4 +- .../org/apache/usergrid/utils/UUIDUtils.java | 16 +- .../main/resources/usergrid-core-context.xml | 36 +- .../org/apache/usergrid/AbstractCoreIT.java | 6 +- .../org/apache/usergrid/CoreApplication.java | 11 +- .../org/apache/usergrid/CoreITSetupImpl.java | 16 +- .../apache/usergrid/batch/BulkTestUtils.java | 1 - .../usergrid/batch/job/CountdownLatchJob.java | 1 - .../usergrid/batch/job/DelayExecution.java | 1 - .../usergrid/batch/job/DelayHeartbeat.java | 1 - .../usergrid/batch/job/FailureJobExecution.java | 1 - .../usergrid/batch/job/OnlyOnceExceution.java | 123 - .../usergrid/batch/job/OnlyOnceExecution.java | 122 + .../job/OnlyOnceUnlockOnFailExceution.java | 133 - .../job/OnlyOnceUnlockOnFailExecution.java | 132 + .../usergrid/batch/job/SchedulerRuntime1IT.java | 3 +- .../usergrid/batch/job/SchedulerRuntime2IT.java | 3 +- .../usergrid/batch/job/SchedulerRuntime3IT.java | 3 +- .../usergrid/batch/job/SchedulerRuntime4IT.java | 3 +- .../usergrid/batch/job/SchedulerRuntime5IT.java | 3 +- .../usergrid/batch/job/SchedulerRuntime6IT.java | 5 +- .../usergrid/batch/job/SchedulerRuntime7IT.java | 7 +- .../usergrid/batch/job/SchedulerRuntime8IT.java | 3 +- .../batch/job/SchedulerRuntimeIntervalIT.java | 3 +- .../usergrid/batch/job/TestJobListener.java | 12 +- .../usergrid/batch/job/TestJobListenerTest.java | 6 +- .../clustering/hazelcast/HazelcastTest.java | 5 +- .../corepersistence/CpEntityMapUtilsTest.java | 28 +- .../corepersistence/StaleIndexCleanupTest.java | 99 +- .../usergrid/corepersistence/index/RxTest.java | 5 +- .../count/BatchCountParallelismTest.java | 16 +- .../usergrid/locking/AstyanaxLockManagerIT.java | 164 + .../locking/cassandra/HectorLockManagerIT.java | 185 - .../SingleNodeLockTestSingleNode.java | 170 - .../zookeeper/AbstractZooKeeperTest.java | 127 - .../usergrid/locking/zookeeper/ZooPut.java | 114 - .../zookeeper/ZookeeperLockManagerTest.java | 186 - .../java/org/apache/usergrid/mq/MessagesIT.java | 70 +- .../org/apache/usergrid/mq/QueuePathsTest.java | 18 +- .../usergrid/persistence/CollectionIT.java | 118 +- .../usergrid/persistence/CoreSchemaManager.java | 12 +- .../apache/usergrid/persistence/CounterIT.java | 62 +- .../persistence/EntityConnectionsIT.java | 56 +- .../persistence/EntityDictionaryIT.java | 24 +- .../usergrid/persistence/EntityManagerIT.java | 112 +- .../apache/usergrid/persistence/EntityTest.java | 2 - .../org/apache/usergrid/persistence/GeoIT.java | 152 +- .../persistence/GeoQueryBooleanTest.java | 8 +- .../apache/usergrid/persistence/IndexIT.java | 43 +- .../persistence/PerformanceEntityReadTest.java | 4 +- .../persistence/PerformanceEntityWriteTest.java | 4 +- .../usergrid/persistence/RebuildIndexTest.java | 19 +- .../apache/usergrid/persistence/SchemaTest.java | 18 +- .../query/IntersectionTransitivePagingIT.java | 4 +- .../query/IntersectionUnionPagingIT.java | 12 +- .../persistence/query/IteratingQueryIT.java | 104 +- .../persistence/query/NotSubPropertyIT.java | 8 +- .../persistence/query/ParenthesisProblemIT.java | 81 + .../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 +- .../apache/usergrid/utils/UUIDUtilsTest.java | 4 +- stack/core/src/test/resources/log4j.properties | 1 - .../impl/ScopedCacheSerializationImpl.java | 18 +- .../persistence/cache/ScopedCacheTest.java | 15 +- .../collection/guice/CollectionModule.java | 32 + .../guice/CollectionTaskExecutor.java | 35 - .../EntityCollectionManagerFactoryImpl.java | 5 +- .../impl/EntityCollectionManagerImpl.java | 20 +- .../mvcc/stage/delete/MarkCommit.java | 6 +- .../collection/mvcc/stage/delete/MarkStart.java | 4 +- .../mvcc/stage/delete/UniqueCleanup.java | 12 +- .../mvcc/stage/delete/VersionCompact.java | 2 +- .../mvcc/stage/write/RollbackAction.java | 2 +- .../mvcc/stage/write/WriteCommit.java | 17 +- .../mvcc/stage/write/WriteOptimisticVerify.java | 4 +- .../collection/mvcc/stage/write/WriteStart.java | 15 +- .../mvcc/stage/write/WriteUniqueVerify.java | 2 +- .../scheduler/CollectionExecutorScheduler.java | 52 + .../scheduler/CollectionSchedulerFig.java | 53 + .../MvccEntitySerializationStrategyImpl.java | 24 +- ...vccEntitySerializationStrategyProxyImpl.java | 4 +- .../MvccEntitySerializationStrategyV1Impl.java | 8 +- .../MvccEntitySerializationStrategyV2Impl.java | 13 +- .../MvccEntitySerializationStrategyV3Impl.java | 16 +- .../MvccLogEntrySerializationProxyImpl.java | 4 +- .../MvccLogEntrySerializationStrategyImpl.java | 12 +- ...MvccLogEntrySerializationStrategyV1Impl.java | 18 +- ...MvccLogEntrySerializationStrategyV2Impl.java | 18 +- .../UniqueValueSerializationStrategyImpl.java | 35 +- ...iqueValueSerializationStrategyProxyImpl.java | 4 +- .../UniqueValueSerializationStrategyV1Impl.java | 31 +- .../UniqueValueSerializationStrategyV2Impl.java | 31 +- .../migration/MvccEntityDataMigrationImpl.java | 6 +- .../collection/EntityCollectionManagerIT.java | 68 + .../EntityCollectionManagerStressTest.java | 15 +- .../changelog/ChangeLogGeneratorImplTest.java | 8 +- .../mvcc/stage/AbstractEntityStageTest.java | 1 - .../mvcc/stage/delete/MarkCommitTest.java | 2 +- .../mvcc/stage/delete/UniqueCleanupTest.java | 1 - .../mvcc/stage/write/WriteCommitTest.java | 2 +- .../stage/write/WriteOptimisticVerifyTest.java | 4 +- .../impl/SerializationComparison.java | 5 +- ...niqueValueSerializationStrategyImplTest.java | 4 +- stack/corepersistence/common/pom.xml | 350 +- .../core/astyanax/AstyanaxKeyspaceProvider.java | 46 +- .../core/astyanax/CassandraCluster.java | 20 + .../core/astyanax/CassandraClusterImpl.java | 199 + .../persistence/core/astyanax/CassandraFig.java | 72 +- .../astyanax/MultiKeyColumnNameIterator.java | 8 +- .../core/astyanax/MultiRowColumnIterator.java | 16 +- .../core/astyanax/MultiTenantColumnFamily.java | 47 + .../MultiTenantColumnFamilyDefinition.java | 138 + .../core/astyanax/MultiTennantColumnFamily.java | 47 - .../MultiTennantColumnFamilyDefinition.java | 138 - .../core/executor/TaskExecutorFactory.java | 108 +- .../persistence/core/guice/CommonModule.java | 36 +- .../core/metrics/MetricsFactoryImpl.java | 6 +- .../migration/data/AbstractMigrationPlugin.java | 6 +- .../data/DataMigrationManagerImpl.java | 11 +- .../data/MigrationInfoSerializationImpl.java | 24 +- .../core/migration/schema/Migration.java | 4 +- .../migration/schema/MigrationManagerImpl.java | 14 +- .../persistence/core/rx/ObservableIterator.java | 4 +- .../persistence/core/rx/OrderedMerge.java | 6 +- .../persistence/core/rx/RxSchedulerFig.java | 71 - .../core/rx/RxTaskSchedulerImpl.java | 81 +- .../core/astyanax/ColumnNameIteratorTest.java | 5 +- .../MultiKeyColumnNameIteratorTest.java | 5 +- .../astyanax/MultiRowColumnIteratorTest.java | 5 +- .../persistence/core/astyanax/TestUtils.java | 14 +- .../persistence/core/rx/OrderedMergeTest.java | 43 +- stack/corepersistence/graph/pom.xml | 1 + .../usergrid/persistence/graph/GraphFig.java | 2 +- .../persistence/graph/guice/GraphModule.java | 7 - .../graph/impl/GraphManagerImpl.java | 14 +- .../graph/impl/stage/EdgeDeleteRepairImpl.java | 18 +- .../graph/impl/stage/EdgeMetaRepairImpl.java | 46 +- .../impl/stage/NodeDeleteListenerImpl.java | 20 +- .../EdgeMetadataSerializationProxyImpl.java | 4 +- .../impl/EdgeMetadataSerializationV1Impl.java | 36 +- .../impl/EdgeMetadataSerializationV2Impl.java | 36 +- .../impl/EdgeSerializationImpl.java | 61 +- .../serialization/impl/EdgesObservableImpl.java | 16 +- .../impl/NodeSerializationImpl.java | 14 +- .../impl/TargetIdObservableImpl.java | 4 +- .../impl/migration/EdgeDataMigrationImpl.java | 2 +- .../impl/shard/DirectedEdgeMeta.java | 4 +- .../impl/shard/EdgeColumnFamilies.java | 12 +- .../impl/shard/EdgeShardStrategy.java | 10 +- .../impl/shard/NodeShardApproximation.java | 66 - .../impl/shard/ShardEntryGroup.java | 21 +- .../impl/shard/ShardedEdgeSerialization.java | 2 +- .../serialization/impl/shard/count/Counter.java | 131 - .../shard/count/NodeShardApproximationImpl.java | 272 - .../count/NodeShardCounterSerialization.java | 48 - .../NodeShardCounterSerializationImpl.java | 186 - .../impl/shard/count/ShardKey.java | 75 - .../shard/impl/EdgeShardSerializationImpl.java | 17 +- .../shard/impl/NodeShardAllocationImpl.java | 37 +- .../impl/shard/impl/NodeShardCacheImpl.java | 2 +- .../shard/impl/ShardGroupColumnIterator.java | 14 +- .../shard/impl/ShardGroupCompactionImpl.java | 37 +- .../impl/shard/impl/ShardGroupDeletionImpl.java | 44 +- .../impl/ShardedEdgeSerializationImpl.java | 89 +- .../impl/shard/impl/ShardsColumnIterator.java | 23 +- .../shard/impl/SizebasedEdgeColumnFamilies.java | 46 +- .../shard/impl/SizebasedEdgeShardStrategy.java | 13 +- .../persistence/graph/GraphManagerLoadTest.java | 18 +- .../graph/GraphManagerShardConsistencyIT.java | 81 +- .../graph/GraphManagerShardingIT.java | 208 - .../graph/GraphManagerStressTest.java | 54 +- .../graph/impl/NodeDeleteListenerTest.java | 9 +- .../serialization/EdgeSerializationTest.java | 11 +- .../graph/serialization/TestCount.java | 4 +- .../impl/shard/EdgeShardSerializationTest.java | 44 + .../impl/shard/NodeShardAllocationTest.java | 54 +- .../impl/shard/ShardEntryGroupTest.java | 59 + .../serialization/impl/shard/ShardTest.java | 65 + .../shard/count/NodeShardApproximationTest.java | 627 - .../NodeShardCounterSerializationTest.java | 124 - .../shard/impl/ShardGroupDeletionImplTest.java | 5 + ...-cassandra-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 619559 -> 0 bytes ...-cassandra-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 161970 -> 0 bytes ...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.jar | Bin 224466 -> 0 bytes ...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.pom | 112 - .../astyanax-cassandra/maven-metadata-local.xml | 12 - ...ax-contrib-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 33178 -> 0 bytes ...ax-contrib-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 2314 -> 0 bytes .../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.jar | Bin 4842 -> 0 bytes .../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.pom | 112 - .../astyanax-contrib/maven-metadata-local.xml | 12 - ...yanax-core-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 522906 -> 0 bytes ...yanax-core-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 141910 -> 0 bytes .../astyanax-core-1.56.49-SNAPSHOT-UG-1.jar | Bin 212858 -> 0 bytes .../astyanax-core-1.56.49-SNAPSHOT-UG-1.pom | 88 - .../astyanax-core/maven-metadata-local.xml | 12 - ...ity-mapper-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 97513 -> 0 bytes ...ity-mapper-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 30591 -> 0 bytes ...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.jar | Bin 68952 -> 0 bytes ...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.pom | 118 - .../maven-metadata-local.xml | 12 - ...x-examples-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 38284 -> 0 bytes ...x-examples-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 4457 -> 0 bytes .../astyanax-examples-1.56.49-SNAPSHOT-UG-1.jar | Bin 8506 -> 0 bytes .../astyanax-examples-1.56.49-SNAPSHOT-UG-1.pom | 106 - .../astyanax-examples/maven-metadata-local.xml | 12 - ...anax-queue-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 180462 -> 0 bytes ...anax-queue-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 44057 -> 0 bytes .../astyanax-queue-1.56.49-SNAPSHOT-UG-1.jar | Bin 86586 -> 0 bytes .../astyanax-queue-1.56.49-SNAPSHOT-UG-1.pom | 112 - .../astyanax-queue/maven-metadata-local.xml | 12 - ...ax-recipes-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 204424 -> 0 bytes ...ax-recipes-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 58161 -> 0 bytes .../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.jar | Bin 100246 -> 0 bytes .../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.pom | 106 - .../astyanax-recipes/maven-metadata-local.xml | 12 - ...nax-thrift-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 197342 -> 0 bytes ...nax-thrift-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 76509 -> 0 bytes .../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.jar | Bin 239007 -> 0 bytes .../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.pom | 112 - .../astyanax-thrift/maven-metadata-local.xml | 12 - .../astyanax-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 261 -> 0 bytes .../astyanax-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 261 -> 0 bytes .../astyanax-1.56.49-SNAPSHOT-UG-1.jar | Bin 261 -> 0 bytes .../astyanax-1.56.49-SNAPSHOT-UG-1.pom | 136 - .../astyanax/astyanax/maven-metadata-local.xml | 12 - stack/corepersistence/map/pom.xml | 1 + .../map/impl/MapSerializationImpl.java | 28 +- .../org/apache/usergrid/ExperimentalTest.java | 22 + .../java/org/apache/usergrid/StressTest.java | 22 + .../persistence/model/entity/EntityMap.java | 50 +- .../model/entity/EntityToMapConverter.java | 9 +- .../model/entity/MapToEntityConverter.java | 237 +- .../persistence/model/field/ArrayField.java | 4 +- .../persistence/model/field/BooleanField.java | 4 +- .../persistence/model/field/ByteArrayField.java | 8 +- .../persistence/model/field/DistanceField.java | 42 + .../persistence/model/field/FieldTypeName.java | 4 +- .../persistence/model/field/FloatField.java | 4 +- .../persistence/model/field/IntegerField.java | 4 +- .../persistence/model/field/ListField.java | 4 +- .../persistence/model/field/LocationField.java | 4 +- .../persistence/model/field/LongField.java | 4 +- .../persistence/model/field/NullField.java | 44 + .../model/field/SerializedObjectField.java | 8 +- .../persistence/model/field/SetField.java | 6 +- .../persistence/model/field/StringField.java | 6 +- .../persistence/model/field/UUIDField.java | 4 +- .../model/entity/MapToEntityConverterTest.java | 179 + .../persistence/model/field/EntityTest.java | 9 +- stack/corepersistence/pom.xml | 120 +- stack/corepersistence/queryindex/pom.xml | 5 +- .../persistence/index/GeoCandidateResult.java | 40 + .../index/impl/DeIndexOperation.java | 4 +- .../persistence/index/impl/EntityField.java | 11 + .../index/impl/EntityMappingParser.java | 25 +- .../index/impl/EntityToMapConverter.java | 3 +- .../index/impl/EsEntityIndexBatchImpl.java | 22 +- .../index/impl/EsEntityIndexImpl.java | 57 +- .../index/impl/EsIndexProducerImpl.java | 18 +- .../persistence/index/impl/EsProvider.java | 8 +- .../index/impl/FailureMonitorImpl.java | 7 +- .../persistence/index/impl/FieldParser.java | 5 +- .../index/impl/IndexOperationMessage.java | 4 +- .../persistence/index/impl/IndexingUtils.java | 63 +- .../EsIndexMappingMigrationPlugin.java | 4 +- .../persistence/index/query/ParsedQuery.java | 4 + .../index/query/ParsedQueryBuilder.java | 4 +- .../index/utils/ConversionUtils.java | 6 +- .../persistence/index/utils/ListUtils.java | 10 +- .../persistence/index/utils/UUIDUtils.java | 6 +- .../persistence/index/impl/EntityIndexTest.java | 79 +- .../index/impl/EntityToMapConverterTest.java | 193 +- .../persistence/index/impl/GeoPagingTest.java | 3 +- .../index/impl/IndexLoadTestsIT.java | 4 + .../index/impl/IndexingUtilsTest.java | 36 + stack/corepersistence/queue/pom.xml | 179 +- .../persistence/queue/LocalQueueManager.java | 5 + .../persistence/queue/impl/QueueScopeImpl.java | 3 - .../queue/impl/SNSQueueManagerImpl.java | 77 +- .../queue/util/AmazonNotificationUtils.java | 22 +- .../usergrid/launcher/EmbeddedServerHelper.java | 10 +- .../resources/usergrid-standalone.properties | 12 +- 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 | 97 - stack/loadtests/runLoadEntitiesUnlimited.sh | 104 - .../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 | 67 - .../usergrid/mongo/AbstractMongoTest.java | 2 +- stack/pom.xml | 3054 +- stack/rest/pom.xml | 42 +- .../usergrid/rest/AbstractContextResource.java | 68 +- .../org/apache/usergrid/rest/ApiResponse.java | 74 +- .../org/apache/usergrid/rest/RootResource.java | 9 +- .../rest/ServerEnvironmentProperties.java | 22 +- .../apache/usergrid/rest/SwaggerServlet.java | 18 +- .../rest/applications/ApplicationResource.java | 61 +- .../rest/applications/AuthResource.java | 30 +- .../rest/applications/ServiceResource.java | 95 +- .../applications/assets/AssetsResource.java | 44 +- .../notifiers/NotifierResource.java | 51 +- .../notifiers/NotifiersResource.java | 51 +- .../rest/applications/queues/QueueResource.java | 50 +- .../queues/QueueSubscriberResource.java | 25 +- .../queues/QueueSubscriptionResource.java | 25 +- .../queues/QueueTransactionsResource.java | 4 + .../rest/applications/users/UserResource.java | 93 +- .../rest/applications/users/UsersResource.java | 33 +- .../exceptions/AbstractExceptionMapper.java | 17 +- .../AwsPropertiesNotFoundExceptionMapper.java | 3 +- .../ElasticsearchExecutionExceptionMapper.java | 38 + .../GCMInvalidRequestExceptionMapper.java | 62 + .../exceptions/NotAllowedExceptionMapper.java | 34 + ...rganizationApplicationNotFoundException.java | 6 +- .../UnsupportedOperationExceptionMapper.java | 35 + .../UnsupportedRestOperationException.java | 25 + ...UnsupportedRestOperationExceptionMapper.java | 34 + ...upportedServiceOperationExceptionMapper.java | 34 + .../rest/filters/ContentTypeFilter.java | 20 +- .../rest/filters/JSONPCallbackFilter.java | 4 +- .../usergrid/rest/filters/MeteringFilter.java | 8 +- .../usergrid/rest/filters/TracingFilter.java | 7 +- .../rest/management/ManagementResource.java | 29 +- .../organizations/OrganizationResource.java | 153 +- .../organizations/OrganizationsResource.java | 12 +- .../applications/ApplicationResource.java | 11 +- .../applications/ApplicationsResource.java | 4 +- .../applications/imports/ImportsResource.java | 6 +- .../organizations/users/UsersResource.java | 8 +- .../rest/management/users/UserResource.java | 76 +- .../rest/management/users/UsersResource.java | 18 +- .../organizations/OrganizationsResource.java | 4 +- .../organizations/OrganizationResource.java | 6 +- .../rest/security/CrossOriginRequestFilter.java | 4 +- .../security/SecuredResourceFilterFactory.java | 154 +- .../annotations/CheckPermissionsForPath.java | 32 + .../security/shiro/RestSecurityManager.java | 2 +- .../shiro/filters/BasicAuthSecurityFilter.java | 9 +- .../ClientCredentialsSecurityFilter.java | 4 +- .../OAuth2AccessTokenSecurityFilter.java | 5 +- .../rest/system/ApplicationsResource.java | 10 +- .../usergrid/rest/system/DatabaseResource.java | 4 +- .../usergrid/rest/system/IndexResource.java | 6 +- .../usergrid/rest/system/MigrateResource.java | 10 +- .../usergrid/rest/test/PropertiesResource.java | 3 +- .../rest/test/RefreshIndexResource.java | 5 +- .../usergrid/rest/utils/CertificateUtils.java | 108 + .../usergrid/rest/ExceptionResourceIT.java | 91 + .../apache/usergrid/rest/IndexResourceIT.java | 6 +- .../apache/usergrid/rest/NotificationsIT.java | 2 + .../apache/usergrid/rest/PartialUpdateTest.java | 8 +- .../org/apache/usergrid/rest/TomcatRuntime.java | 12 +- .../applications/ApplicationResourceIT.java | 111 +- .../usergrid/rest/applications/SecurityIT.java | 115 + .../applications/assets/AssetResourceIT.java | 90 +- .../applications/assets/AwsAssetResourceIT.java | 41 +- .../applications/assets/aws/NoAWSCredsRule.java | 4 +- .../collection/CollectionsResourceIT.java | 20 +- .../activities/ActivityResourceIT.java | 2 +- .../collection/groups/GroupResourceIT.java | 115 +- .../collection/paging/PagingResourceIT.java | 13 +- .../users/ConnectionResourceTest.java | 2 +- .../collection/users/UserResourceIT.java | 13 +- .../users/extensions/TestResource.java | 6 +- .../applications/events/EventsResourceIT.java | 4 +- .../applications/notifiers/NotifiersIT.java | 116 + .../applications/queries/AndOrQueryTest.java | 6 +- .../applications/queries/GeoPagingTest.java | 7 +- .../applications/queries/MatrixQueryTests.java | 2 - .../rest/applications/queries/OrderByTest.java | 9 +- .../applications/queries/QueryTestBase.java | 4 +- .../rest/applications/utils/TestUtils.java | 1 - .../rest/filters/ContentTypeResourceIT.java | 4 - .../usergrid/rest/management/AdminUsersIT.java | 257 +- .../rest/management/ExportResourceIT.java | 22 +- .../rest/management/ImportResourceIT.java | 15 +- .../rest/management/OrganizationsIT.java | 71 +- .../rest/management/RegistrationIT.java | 16 +- .../organizations/AdminEmailEncodingIT.java | 5 +- .../rest/test/resource/AbstractRestIT.java | 10 +- .../rest/test/resource/ClientSetup.java | 75 +- .../usergrid/rest/test/resource/DumbClient.java | 58 - .../resource/endpoints/CollectionEndpoint.java | 20 +- .../endpoints/OrganizationResource.java | 3 +- .../endpoints/mgmt/ApplicationResource.java | 8 +- .../resource/endpoints/mgmt/OrgResource.java | 9 +- .../rest/test/resource/model/ApiResponse.java | 3 - .../rest/test/resource/model/Collection.java | 7 +- stack/rest/src/test/resources/log4j.properties | 1 - .../src/test/resources/pushtest_dev_recent.p12 | Bin 0 -> 3227 bytes stack/rest/src/test/resources/test.txt | 17 + .../resources/usergrid-custom-test.properties | 2 +- .../resources/valid_non_apple_2036_01_07.p12 | Bin 0 -> 2661 bytes stack/scripts/multitenant_migrate.py | 48 +- stack/services/pom.xml | 890 +- .../management/AccountCreationProps.java | 131 +- .../management/AppInfoMigrationPlugin.java | 9 +- .../usergrid/management/ManagementService.java | 373 +- .../usergrid/management/OrganizationConfig.java | 213 +- .../management/OrganizationConfigProps.java | 73 + .../usergrid/management/OrganizationInfo.java | 27 +- .../cassandra/AccountCreationPropsImpl.java | 2 +- .../cassandra/ManagementServiceImpl.java | 730 +- .../cassandra/OrganizationConfigPropsImpl.java | 224 + .../usergrid/management/export/ExportJob.java | 7 +- .../management/export/ExportServiceImpl.java | 7 +- .../management/export/S3ExportImpl.java | 3 +- .../management/importer/FileImportJob.java | 6 +- .../usergrid/management/importer/ImportJob.java | 8 +- .../management/importer/ImportServiceImpl.java | 586 +- .../management/importer/S3ImportImpl.java | 7 +- .../usergrid/security/AuthPrincipalType.java | 4 +- .../security/crypto/EncryptionServiceImpl.java | 8 +- .../usergrid/security/oauth/AccessInfo.java | 2 +- .../security/providers/AbstractProvider.java | 42 +- .../security/providers/FacebookProvider.java | 9 +- .../security/providers/FoursquareProvider.java | 6 +- .../providers/PingIdentityProvider.java | 97 +- .../apache/usergrid/security/shiro/Realm.java | 18 +- .../usergrid/security/shiro/ShiroCache.java | 15 +- .../security/shiro/ShiroCacheManager.java | 2 +- .../principals/ApplicationUserPrincipal.java | 4 +- .../shiro/principals/OrganizationPrincipal.java | 38 +- .../shiro/principals/PrincipalIdentifier.java | 8 +- .../security/shiro/utils/SubjectUtils.java | 4 +- .../usergrid/security/tokens/TokenCategory.java | 4 +- .../usergrid/security/tokens/TokenInfo.java | 19 + .../usergrid/security/tokens/TokenService.java | 9 +- .../tokens/cassandra/TokenServiceImpl.java | 43 +- .../services/AbstractCollectionService.java | 53 +- .../services/AbstractConnectionsService.java | 14 +- .../AbstractPathBasedColllectionService.java | 10 +- .../usergrid/services/AbstractService.java | 26 +- .../apache/usergrid/services/ServiceInfo.java | 7 +- .../usergrid/services/ServiceManager.java | 18 +- .../services/ServiceManagerFactory.java | 6 +- .../usergrid/services/ServiceParameter.java | 44 +- .../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/AssetMimeHandler.java | 4 +- .../services/assets/data/AssetUtils.java | 4 +- .../assets/data/AwsSdkS3BinaryStore.java | 23 +- .../assets/data/LocalFileBinaryStore.java | 4 +- .../services/assets/data/S3BinaryStore.java | 36 +- .../services/devices/DevicesService.java | 12 +- .../notifications/NotificationsService.java | 4 +- .../services/devices/users/UsersService.java | 4 +- .../AwsPropertiesNotFoundException.java | 3 - .../usergrid/services/groups/GroupsService.java | 8 +- .../groups/activities/ActivitiesService.java | 4 +- .../notifications/NotificationsService.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 +- .../notifications/NotificationsService.java | 4 +- .../services/guice/ServiceModuleImpl.java | 3 + .../services/messages/MessagesService.java | 4 +- .../notifications/ApplicationQueueMessage.java | 5 +- .../notifications/InactiveDeviceManager.java | 8 +- .../services/notifications/JobScheduler.java | 15 +- .../notifications/NotificationServiceProxy.java | 3 - .../notifications/NotificationsService.java | 48 +- .../services/notifications/ProviderAdapter.java | 5 +- .../services/notifications/QueueJob.java | 16 +- .../services/notifications/QueueListener.java | 88 +- .../services/notifications/TaskManager.java | 49 +- .../services/notifications/TestAdapter.java | 16 +- .../notifications/apns/APNsAdapter.java | 11 +- .../apns/RejectedAPNsListener.java | 4 +- .../services/notifications/gcm/GCMAdapter.java | 127 +- .../impl/ApplicationQueueManagerImpl.java | 141 +- .../services/notifications/wns/WNSAdapter.java | 15 +- .../services/notifiers/NotifiersService.java | 4 +- .../services/queues/ImportQueueListener.java | 4 +- .../usergrid/services/queues/QueueListener.java | 62 +- .../usergrid/services/roles/RolesService.java | 4 +- .../services/roles/groups/GroupsService.java | 4 +- .../services/roles/users/UsersService.java | 4 +- .../usergrid/services/users/UsersService.java | 6 +- .../users/activities/ActivitiesService.java | 4 +- .../services/users/devices/DevicesService.java | 20 +- .../notifications/NotificationsService.java | 4 +- .../users/following/FollowingService.java | 4 +- .../services/users/groups/GroupsService.java | 4 +- .../notifications/NotificationsService.java | 4 +- .../services/users/roles/RolesService.java | 4 +- .../org/apache/usergrid/utils/PythonUtils.java | 103 - .../src/main/python/pyusergrid/__init__.py | 15 - .../main/python/pyusergrid/services/__init__.py | 15 - .../pyusergrid/services/pytest/PytestService.py | 31 - .../pyusergrid/services/pytest/__init__.py | 15 - .../python/pyusergrid/services/pytest/test.py | 29 - stack/services/src/main/python/test/__init__.py | 15 - stack/services/src/main/python/test/test.py | 29 - .../resources/usergrid-services-context.xml | 133 +- .../org/apache/usergrid/NewOrgAppAdminRule.java | 4 +- .../org/apache/usergrid/ServiceApplication.java | 14 +- .../migration/AppInfoMigrationPluginTest.java | 10 +- .../apache/usergrid/management/EmailFlowIT.java | 43 +- .../management/OrganizationConfigIT.java | 213 + .../usergrid/management/OrganizationIT.java | 4 +- .../org/apache/usergrid/management/RoleIT.java | 10 +- .../cassandra/ManagementServiceIT.java | 55 +- .../management/export/ExportServiceIT.java | 88 +- .../management/export/MockS3ExportImpl.java | 2 +- .../importer/ImportConnectionsTest.java | 2 +- .../management/importer/ImportServiceIT.java | 32 +- .../usergrid/management/importer/S3Upload.java | 1 - .../org/apache/usergrid/python/JythonTest.java | 39 - .../security/providers/FacebookProviderIT.java | 6 +- .../providers/PingIdentityProviderIT.java | 6 +- .../security/tokens/TokenServiceIT.java | 10 +- .../usergrid/services/ServiceInvocationIT.java | 4 +- .../AbstractServiceNotificationIT.java | 3 +- .../notifications/NotifiersServiceIT.java | 11 +- .../apns/MockSuccessfulProviderAdapter.java | 103 - .../apns/NotificationsServiceIT.java | 294 +- .../gcm/MockSuccessfulProviderAdapter.java | 89 - .../gcm/NotificationsServiceIT.java | 227 +- .../notifications/wns/WNSAdapterTest.java | 44 + .../src/test/resources/log4j.properties | 1 - .../src/test/resources/pushtest_dev.p12 | Bin 3203 -> 0 bytes .../src/test/resources/pushtest_prod.p12 | Bin 3205 -> 0 bytes .../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/FakeSchemaManager.java | 4 - .../usergrid/cassandra/SpringResourceTest.java | 10 +- stack/tools/pom.xml | 20 +- .../org/apache/usergrid/tools/AppAudit.java | 2 +- .../java/org/apache/usergrid/tools/Cli.java | 35 +- .../apache/usergrid/tools/DupAdminRepair.java | 297 - .../org/apache/usergrid/tools/DupOrgRepair.java | 263 - .../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 | 138 +- .../usergrid/tools/ExportDataCreator.java | 41 +- .../java/org/apache/usergrid/tools/Import.java | 11 +- .../org/apache/usergrid/tools/ImportAdmins.java | 161 +- .../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 | 4 +- .../RepairingMismatchedApplicationMetadata.java | 119 - .../org/apache/usergrid/tools/ToolBase.java | 15 +- .../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 | 11 +- stack/tools/src/main/resources/log4j.properties | 34 +- .../main/resources/toolsApplicationContext.xml | 124 +- .../apache/usergrid/tools/ExportAppTest.java | 62 +- .../usergrid/tools/ExportImportAdminsTest.java | 43 +- .../test/resources/usergrid-test-context.xml | 63 + .../websocket/WebSocketChannelHandler.java | 16 +- .../test/resources/testApplicationContext.xml | 273 +- tests/integration/.gitignore | 3 + 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/connections.js | 63 + tests/integration/lib/devices.js | 43 + tests/integration/lib/entities.js | 126 + tests/integration/lib/groups.js | 43 + tests/integration/lib/notifications.js | 34 + 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 | 17 + .../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 | 47 + tests/integration/test/entities/deleteAll.js | 39 + tests/integration/test/entities/get.js | 60 + tests/integration/test/entities/update.js | 44 + tests/integration/test/groups/groups.js | 192 + tests/integration/test/main.js | 69 + tests/integration/test/management/shawn | 1 + tests/integration/test/mocha.opts | 3 + .../test/queries/integerComparison.js | 77 + tests/integration/test/setup.js | 111 + tests/integration/test/teardown.js | 80 + 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 + website/README.md | 4 +- website/crash.log | 143 - website/lib/default.rb | 4 +- website/nanoc.yaml | 2 + website/run.sh | 3 +- website/tmp/checksums | 2 - website/tmp/compiled_content | 7076 -- website/tmp/dependencies | 6 - website/tmp/rule_memory | Bin 5214 -> 0 bytes 1031 files changed, 219989 insertions(+), 224483 deletions(-) ----------------------------------------------------------------------