You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/04/17 17:27:04 UTC
[47/51] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o-dev' into two-dot-o-import
Merge branch 'two-dot-o-dev' into two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/79961615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/79961615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/79961615
Branch: refs/heads/two-dot-o-import
Commit: 799616158ddcf20758aff44545893527bec61607
Parents: 16bf265 3be95f9
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Apr 7 12:05:20 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Apr 7 12:05:20 2015 -0400
----------------------------------------------------------------------
.../Client/IUsergridClient.cs | 2 +-
.../Usergrid.Notifications/Client/PushClient.cs | 24 +
.../Usergrid.Notifications/MainPage.xaml | 1 +
.../Usergrid.Notifications/MainPage.xaml.cs | 29 +-
.../main/dist/init_instance/init_rest_server.sh | 29 +-
.../dist/init_instance/install_elasticsearch.sh | 22 +-
.../main/groovy/configure_elasticsearch.groovy | 80 +-
.../src/main/groovy/configure_usergrid.groovy | 18 +-
stack/awscluster/ugcluster-cf.json | 470 +-
.../main/resources/usergrid-default.properties | 2 +
stack/core/pom.xml | 61 +-
.../batch/service/JobSchedulerService.java | 35 +-
.../batch/service/SchedulerServiceImpl.java | 17 +-
.../AllApplicationsObservable.java | 35 +
.../corepersistence/ApplicationIdCache.java | 52 +
.../corepersistence/ApplicationIdCacheImpl.java | 135 +
.../usergrid/corepersistence/CoreModule.java | 90 +-
.../corepersistence/CpEntityManager.java | 513 +-
.../corepersistence/CpEntityManagerFactory.java | 596 ++-
.../corepersistence/CpManagerCache.java | 65 +-
.../corepersistence/CpRelationManager.java | 530 +-
.../CpRelationManagerFactory.java | 46 +
.../usergrid/corepersistence/CpSetup.java | 32 +-
.../usergrid/corepersistence/CpWalker.java | 87 +-
.../usergrid/corepersistence/ManagerCache.java | 17 +-
.../events/EntityDeletedHandler.java | 69 +-
.../events/EntityVersionCreatedHandler.java | 70 +-
.../events/EntityVersionDeletedHandler.java | 151 +-
.../migration/AppInfoMigrationPlugin.java | 333 ++
.../migration/AppInfoVersions.java | 40 +
.../migration/CoreDataVersions.java | 45 +
.../migration/CoreMigration.java | 53 +
.../migration/CoreMigrationPlugin.java | 64 +
.../migration/EntityDataMigration.java | 147 -
.../migration/EntityTypeMappingMigration.java | 69 +-
.../migration/GraphShardVersionMigration.java | 152 -
.../migration/MigrationModuleVersionPlugin.java | 145 +
.../migration/MigrationSystemVersions.java | 43 +
.../corepersistence/migration/Versions.java | 14 -
.../results/CollectionRefsVerifier.java | 44 +
.../CollectionResultsLoaderFactoryImpl.java | 60 +
.../results/ConnectionRefsVerifier.java | 61 +
.../ConnectionResultsLoaderFactoryImpl.java | 65 +
.../results/ElasticSearchQueryExecutor.java | 217 +
.../corepersistence/results/EntityVerifier.java | 4 +-
.../results/FilteringLoader.java | 150 +-
.../corepersistence/results/QueryExecutor.java | 37 +
.../corepersistence/results/RefsVerifier.java | 42 -
.../results/ResultsLoaderFactory.java | 3 +-
.../results/ResultsLoaderFactoryImpl.java | 62 -
.../rx/AllEntitiesInSystemObservable.java | 101 -
.../rx/ApplicationObservable.java | 128 -
.../rx/EdgesFromSourceObservable.java | 63 -
.../rx/EdgesToTargetObservable.java | 63 -
.../corepersistence/rx/TargetIdObservable.java | 66 -
.../rx/impl/AbstractGraphVisitorImpl.java | 107 +
.../rx/impl/AllApplicationsObservableImpl.java | 134 +
.../rx/impl/AllEntitiesInSystemImpl.java | 57 +
.../rx/impl/AllNodesInGraphImpl.java | 55 +
.../corepersistence/util/CpEntityMapUtils.java | 19 +-
.../corepersistence/util/CpNamingUtils.java | 181 +-
.../usergrid/exception/ConflictException.java | 36 +
.../apache/usergrid/metrics/MetricsFactory.java | 112 -
.../usergrid/persistence/EntityManager.java | 42 +-
.../persistence/EntityManagerFactory.java | 58 +-
.../persistence/MultiQueryIterator.java | 6 +-
.../persistence/ObservableIterator.java | 1 +
.../apache/usergrid/persistence/Results.java | 26 +-
.../org/apache/usergrid/persistence/Schema.java | 5 +-
.../cassandra/CassandraPersistenceUtils.java | 2 +-
.../cassandra/EntityManagerFactoryImpl.java | 41 +-
.../cassandra/EntityManagerImpl.java | 55 +-
.../cassandra/QueryProcessorImpl.java | 12 +-
.../cassandra/RelationManagerImpl.java | 58 +-
.../persistence/cassandra/SetupImpl.java | 2 -
.../cassandra/index/ConnectedIndexScanner.java | 2 -
.../cassandra/index/IndexBucketScanner.java | 2 -
.../main/resources/usergrid-core-context.xml | 15 +-
.../org/apache/usergrid/CoreApplication.java | 28 +-
.../java/org/apache/usergrid/CoreITSetup.java | 8 +-
.../org/apache/usergrid/CoreITSetupImpl.java | 61 +-
.../org/apache/usergrid/TestEntityIndex.java | 27 +
.../corepersistence/StaleIndexCleanupTest.java | 188 +-
.../migration/EntityDataMigrationIT.java | 262 -
.../migration/EntityTypeMappingMigrationIT.java | 183 +-
.../migration/GraphShardVersionMigrationIT.java | 226 -
.../MigrationModuleVersionPluginTest.java | 259 +
.../migration/MigrationTestRule.java | 99 -
.../migration/TestProgressObserver.java | 71 -
.../rx/AllEntitiesInSystemObservableIT.java | 71 +-
.../rx/ApplicationObservableTestIT.java | 16 +-
.../rx/EdgesFromSourceObservableIT.java | 19 +-
.../rx/EdgesToTargetObservableIT.java | 57 +-
.../rx/TargetIdObservableTestIT.java | 7 +-
.../usergrid/persistence/CollectionIT.java | 83 +-
.../apache/usergrid/persistence/CounterIT.java | 9 +-
.../usergrid/persistence/CountingMutatorIT.java | 4 +-
.../persistence/EntityConnectionsIT.java | 14 +-
.../usergrid/persistence/EntityManagerIT.java | 27 +-
.../org/apache/usergrid/persistence/GeoIT.java | 27 +-
.../persistence/GeoQueryBooleanTest.java | 4 +-
.../apache/usergrid/persistence/IndexIT.java | 14 +-
.../usergrid/persistence/LargeEntityIT.java | 3 +-
.../usergrid/persistence/PathQueryIT.java | 52 +-
.../PerformanceEntityRebuildIndexTest.java | 38 +-
.../usergrid/persistence/PermissionsIT.java | 4 +-
.../cassandra/EntityManagerFactoryImplIT.java | 136 +-
.../persistence/query/CollectionIoHelper.java | 2 +-
.../persistence/query/ConnectionHelper.java | 2 +-
.../query/IntersectionTransitivePagingIT.java | 2 +-
.../query/IntersectionUnionPagingIT.java | 2 +-
.../persistence/query/IteratingQueryIT.java | 27 +-
.../apache/usergrid/utils/EdgeTestUtils.java | 50 +
stack/core/src/test/resources/log4j.properties | 2 +
.../resources/usergrid-custom-test.properties | 1 +
stack/corepersistence/collection/pom.xml | 14 +-
.../persistence/collection/CollectionScope.java | 45 -
.../collection/EntityCollectionManager.java | 54 +-
.../EntityCollectionManagerFactory.java | 36 +-
.../collection/EntityCollectionManagerSync.java | 49 -
.../collection/EntityDeletedFactory.java | 34 -
.../collection/EntityVersionCleanupFactory.java | 35 -
.../collection/EntityVersionCreatedFactory.java | 31 -
.../persistence/collection/FieldSet.java | 48 +
.../persistence/collection/MvccEntity.java | 5 +-
.../persistence/collection/MvccLogEntry.java | 1 +
.../cache/CachedEntityCollectionManager.java | 20 +-
.../collection/event/EntityDeleted.java | 8 +-
.../collection/event/EntityVersionCreated.java | 7 +-
.../collection/event/EntityVersionDeleted.java | 11 +-
.../exception/CollectionRuntimeException.java | 30 +-
.../exception/EntityTooLargeException.java | 6 +-
.../exception/WriteCommitException.java | 11 +-
.../WriteOptimisticVerifyException.java | 11 +-
.../exception/WriteStartException.java | 11 +-
.../exception/WriteUniqueVerifyException.java | 6 +-
.../collection/guice/CollectionModule.java | 66 +-
.../guice/CollectionTaskExecutor.java | 4 +-
.../persistence/collection/guice/Write.java | 17 -
.../collection/guice/WriteUpdate.java | 17 -
.../collection/impl/CollectionScopeImpl.java | 102 -
.../EntityCollectionManagerFactoryImpl.java | 128 +-
.../impl/EntityCollectionManagerImpl.java | 292 +-
.../impl/EntityCollectionManagerSyncImpl.java | 71 -
.../collection/impl/EntityDeletedTask.java | 77 +-
.../impl/EntityVersionCleanupTask.java | 199 +-
.../impl/EntityVersionCreatedTask.java | 39 +-
.../impl/EntityVersionTaskFactory.java | 60 +
.../mvcc/MvccEntitySerializationStrategy.java | 102 -
.../mvcc/MvccLogEntrySerializationStrategy.java | 80 -
.../collection/mvcc/changelog/ChangeLog.java | 2 -
.../mvcc/entity/MvccValidationUtils.java | 16 -
.../mvcc/entity/impl/MvccEntityDeleteEvent.java | 8 +-
.../mvcc/entity/impl/MvccEntityEvent.java | 11 +-
.../mvcc/entity/impl/MvccEntityWriteEvent.java | 6 +-
.../mvcc/stage/CollectionIoEvent.java | 9 +-
.../mvcc/stage/EntityUpdateEvent.java | 34 -
.../mvcc/stage/delete/MarkCommit.java | 15 +-
.../collection/mvcc/stage/delete/MarkStart.java | 20 +-
.../mvcc/stage/write/RollbackAction.java | 12 +-
.../mvcc/stage/write/WriteCommit.java | 32 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 12 +-
.../collection/mvcc/stage/write/WriteStart.java | 22 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 149 +-
.../collection/serialization/EntityRepair.java | 38 -
.../MvccEntitySerializationStrategy.java | 117 +
.../MvccLogEntrySerializationStrategy.java | 82 +
.../serialization/OptimisticUpdate.java | 23 -
.../collection/serialization/UniqueValue.java | 1 -
.../UniqueValueSerializationStrategy.java | 68 +-
.../serialization/UniqueValueSet.java | 1 +
.../impl/CollectionDataVersions.java | 54 +
.../serialization/impl/EntityRepairImpl.java | 149 -
.../impl/EntityVersionSerializer.java | 11 +-
.../serialization/impl/FieldSerializer.java | 118 -
.../serialization/impl/LogEntryIterator.java | 8 +-
.../serialization/impl/MutableFieldSet.java | 63 +
.../MvccEntitySerializationStrategyImpl.java | 177 +-
...vccEntitySerializationStrategyProxyImpl.java | 163 +-
.../MvccEntitySerializationStrategyV1Impl.java | 9 +-
.../MvccEntitySerializationStrategyV2Impl.java | 8 +-
.../MvccEntitySerializationStrategyV3Impl.java | 574 +++
.../MvccLogEntrySerializationProxyImpl.java | 149 +
.../MvccLogEntrySerializationStrategyImpl.java | 92 +-
...MvccLogEntrySerializationStrategyV1Impl.java | 118 +
...MvccLogEntrySerializationStrategyV2Impl.java | 106 +
.../serialization/impl/SerializationModule.java | 170 +-
.../serialization/impl/TypeField.java | 43 +
.../serialization/impl/UniqueFieldEntry.java | 60 +
.../impl/UniqueFieldEntrySerializer.java | 138 +
.../impl/UniqueFieldRowKeySerializer.java | 122 +
.../impl/UniqueTypeFieldRowKeySerializer.java | 60 +
.../serialization/impl/UniqueValueImpl.java | 5 +-
.../UniqueValueSerializationStrategyImpl.java | 317 +-
...iqueValueSerializationStrategyProxyImpl.java | 179 +
.../UniqueValueSerializationStrategyV1Impl.java | 159 +
.../UniqueValueSerializationStrategyV2Impl.java | 139 +
.../impl/migration/CollectionMigration.java | 53 +
.../migration/CollectionMigrationPlugin.java | 68 +
.../impl/migration/EntityIdScope.java | 47 +
.../migration/MvccEntityDataMigrationImpl.java | 280 ++
.../serialization/impl/util/Inflector.java | 370 ++
.../impl/util/LegacyScopeUtils.java | 51 +
.../collection/util/EntityUtils.java | 49 -
.../collection/ApplicationContextImplTest.java | 33 +
.../collection/CollectionContextImplTest.java | 53 -
.../EntityCollectionManagerFactoryTest.java | 9 +-
.../collection/EntityCollectionManagerIT.java | 323 +-
.../EntityCollectionManagerStressTest.java | 14 +-
.../EntityCollectionManagerSyncIT.java | 193 -
.../collection/guice/TestCollectionModule.java | 22 +-
.../impl/EntityVersionCleanupTaskTest.java | 677 ++-
.../impl/EntityVersionCreatedTaskTest.java | 29 +-
.../mvcc/stage/AbstractEntityStageTest.java | 6 +-
.../mvcc/stage/AbstractIdStageTest.java | 4 +-
.../mvcc/stage/AbstractMvccEntityStageTest.java | 6 +-
.../mvcc/stage/TestEntityGenerator.java | 2 +-
.../mvcc/stage/delete/MarkCommitTest.java | 14 +-
.../mvcc/stage/delete/MarkStartTest.java | 6 +-
.../mvcc/stage/write/FieldSerializerTest.java | 52 -
.../write/UniqueFieldRowKeySerializerTest.java | 52 +
...niqueValueSerializationStrategyImplTest.java | 185 -
.../mvcc/stage/write/WriteCommitTest.java | 12 +-
.../stage/write/WriteOptimisticVerifyTest.java | 35 +-
.../mvcc/stage/write/WriteStartTest.java | 26 +-
.../mvcc/stage/write/WriteUniqueVerifyIT.java | 34 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 17 +-
.../persistence/collection/rx/ParallelTest.java | 10 +-
.../serialization/EntityRepairImplTest.java | 147 -
.../impl/LogEntryIteratorTest.java | 17 +-
...MvccEntitySerializationStrategyImplTest.java | 165 +-
...cEntitySerializationStrategyProxyV1Test.java | 85 -
...ntitySerializationStrategyProxyV1_3Test.java | 81 +
...cEntitySerializationStrategyProxyV2Test.java | 83 -
...ntitySerializationStrategyProxyV2_3Test.java | 82 +
...ccEntitySerializationStrategyV1ImplTest.java | 78 +-
...ccEntitySerializationStrategyV2ImplTest.java | 73 +-
.../MvccEntitySerializationStrategyV2Test.java | 27 +-
...ccEntitySerializationStrategyV3ImplTest.java | 70 +
.../impl/MvccLESSTransientTest.java | 27 +-
...ccLogEntrySerializationStrategyImplTest.java | 107 +-
...EntrySerializationStrategyProxyImplTest.java | 90 +
...LogEntrySerializationStrategyV1ImplTest.java | 55 +
...LogEntrySerializationStrategyV2ImplTest.java | 53 +
.../impl/ScopedRowKeySerializerTest.java | 2 +-
.../impl/SerializationComparison.java | 4 +-
.../impl/SettingsValidationTest.java | 1 -
.../impl/UniqueFieldEntrySerializerTest.java | 108 +
...niqueValueSerializationStrategyImplTest.java | 344 ++
...ValueSerializationStrategyProxyImplTest.java | 100 +
...queValueSerializationStrategyV1ImplTest.java | 57 +
...queValueSerializationStrategyV2ImplTest.java | 58 +
...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 214 +
.../MvccEntityDataMigrationV1ToV3ImplTest.java | 99 +
.../MvccEntityDataMigrationV2ToV3ImplTest.java | 99 +
.../collection/util/EntityHelper.java | 1 -
.../collection/util/InvalidEntityGenerator.java | 1 +
.../collection/util/LogEntryMock.java | 47 +-
.../collection/util/UniqueValueEntryMock.java | 150 +
.../collection/util/VersionGenerator.java | 55 +
stack/corepersistence/common/pom.xml | 27 +-
.../usergrid/persistence/core/CPManager.java | 28 +
.../core/astyanax/CassandraConfig.java | 6 +
.../core/astyanax/CassandraConfigImpl.java | 8 +-
.../persistence/core/astyanax/CassandraFig.java | 9 +-
.../astyanax/DynamicCompositeParserImpl.java | 81 +
.../core/astyanax/FieldBufferBuilder.java | 15 +
.../core/astyanax/FieldBufferParser.java | 13 +
.../astyanax/MultiKeyColumnNameIterator.java | 4 +-
.../core/astyanax/MultiRowColumnIterator.java | 12 +-
.../persistence/core/future/BetterFuture.java | 68 +
.../persistence/core/guice/CommonModule.java | 23 +-
.../persistence/core/guice/CurrentImpl.java | 42 -
.../persistence/core/guice/PreviousImpl.java | 42 -
.../persistence/core/guice/ProxyImpl.java | 42 -
.../core/hystrix/HystrixCassandra.java | 94 -
.../core/metrics/MetricsFactory.java | 43 +
.../core/metrics/MetricsFactoryImpl.java | 149 +
.../persistence/core/metrics/MetricsFig.java | 33 +
.../migration/data/AbstractMigrationPlugin.java | 128 +
.../core/migration/data/DataMigration.java | 97 +-
.../migration/data/DataMigrationManager.java | 18 +-
.../data/DataMigrationManagerImpl.java | 237 +-
.../migration/data/MigrationDataProvider.java | 43 +
.../core/migration/data/MigrationInfoCache.java | 52 +
.../migration/data/MigrationInfoCacheImpl.java | 84 +
.../data/MigrationInfoSerialization.java | 28 +-
.../data/MigrationInfoSerializationImpl.java | 67 +-
.../core/migration/data/MigrationPlugin.java | 56 +
.../migration/data/MigrationRelationship.java | 100 +
.../core/migration/data/PluginPhase.java | 42 +
.../core/migration/data/ProgressObserver.java | 63 +
.../core/migration/data/VersionedData.java | 38 +
.../migration/data/VersionedMigrationSet.java | 153 +
.../core/migration/schema/Migration.java | 2 +-
.../persistence/core/rx/ObservableIterator.java | 2 +
.../core/scope/ApplicationScope.java | 1 +
.../core/scope/ApplicationScopeImpl.java | 3 +
.../persistence/core/task/TaskExecutor.java | 4 +-
.../core/astyanax/ColumnNameIteratorTest.java | 7 +-
.../MultiKeyColumnNameIteratorTest.java | 194 +-
.../astyanax/MultiRowColumnIteratorTest.java | 57 +-
.../core/guice/DataMigrationResetRule.java | 88 +
.../core/guice/MaxMigrationModule.java | 39 -
.../core/guice/MaxMigrationVersion.java | 40 -
.../core/guice/MigrationManagerRule.java | 7 +
.../core/guice/TestCommonModule.java | 1 +
.../persistence/core/guice/TestModule.java | 5 +-
.../data/DataMigrationManagerImplTest.java | 350 +-
.../data/MigrationInfoSerializationTest.java | 32 +-
.../data/TestMigrationDataProvider.java | 61 +
.../migration/data/TestProgressObserver.java | 89 +
.../data/VersionedMigrationSetTest.java | 198 +
.../persistence/core/util/IdGenerator.java | 51 +
stack/corepersistence/graph/pom.xml | 28 +-
.../persistence/graph/GraphManager.java | 3 +-
.../persistence/graph/GraphManagerFactory.java | 2 +
.../persistence/graph/guice/GraphModule.java | 106 +-
.../graph/impl/GraphManagerImpl.java | 317 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 9 +-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 21 +-
.../impl/stage/NodeDeleteListenerImpl.java | 21 +-
.../EdgeMetadataSerialization.java | 3 +-
.../graph/serialization/EdgesObservable.java | 33 +
.../graph/serialization/TargetIdObservable.java | 38 +
.../EdgeMetadataSerializationProxyImpl.java | 161 +-
.../impl/EdgeMetadataSerializationV1Impl.java | 6 +
.../impl/EdgeMetadataSerializationV2Impl.java | 6 +
.../serialization/impl/EdgesObservableImpl.java | 80 +
.../serialization/impl/GraphDataVersions.java | 43 +
.../impl/GraphManagerFactoryImpl.java | 95 +
.../impl/NodeSerializationImpl.java | 36 +-
.../impl/TargetIdObservableImpl.java | 72 +
.../impl/migration/EdgeDataMigrationImpl.java | 138 +
.../impl/migration/GraphMigration.java | 53 +
.../impl/migration/GraphMigrationPlugin.java | 69 +
.../serialization/impl/migration/GraphNode.java | 39 +
.../shard/count/NodeShardApproximationImpl.java | 13 +-
.../NodeShardCounterSerializationImpl.java | 25 +-
.../shard/impl/NodeShardAllocationImpl.java | 16 +-
.../shard/impl/ShardGroupCompactionImpl.java | 64 +-
.../persistence/graph/GraphManagerIT.java | 36 +-
.../persistence/graph/GraphManagerLoadTest.java | 13 +-
.../graph/GraphManagerShardConsistencyIT.java | 12 +-
.../graph/GraphManagerShardingIT.java | 13 +-
.../graph/GraphManagerStressTest.java | 11 +-
.../usergrid/persistence/graph/SimpleTest.java | 12 +-
.../graph/guice/TestGraphModule.java | 27 +-
.../graph/impl/EdgeDeleteListenerTest.java | 12 +-
.../graph/impl/NodeDeleteListenerTest.java | 10 +-
.../graph/impl/stage/EdgeDeleteRepairTest.java | 7 +-
.../graph/impl/stage/EdgeMetaRepairTest.java | 30 +-
.../EdgeMetaDataSerializationProxyV1Test.java | 15 +-
.../EdgeMetaDataSerializationProxyV2Test.java | 23 +-
.../EdgeMetaDataSerializationV1Test.java | 7 +-
.../EdgeMetaDataSerializationV2Test.java | 7 +-
.../EdgeMetadataSerializationTest.java | 39 +-
.../EdgeSerializationChopTest.java | 7 +-
.../serialization/EdgeSerializationTest.java | 21 +-
.../serialization/NodeSerializationTest.java | 15 +-
.../migration/EdgeDataMigrationImplTest.java | 177 +
.../impl/shard/EdgeShardSerializationTest.java | 7 +-
.../impl/shard/NodeShardAllocationTest.java | 27 +-
.../impl/shard/NodeShardCacheTest.java | 7 +-
.../impl/shard/ShardGroupCompactionTest.java | 7 +-
.../shard/count/NodeShardApproximationTest.java | 9 +-
.../NodeShardCounterSerializationTest.java | 6 +-
.../shard/impl/ShardEntryGroupIteratorTest.java | 15 +-
...rceDirectedEdgeDescendingComparatorTest.java | 23 +-
...getDirectedEdgeDescendingComparatorTest.java | 23 +-
.../graph/test/util/EdgeTestUtils.java | 29 +-
.../usergrid/persistence/map/MapManager.java | 18 +
.../persistence/map/MapManagerFactory.java | 2 +
.../persistence/map/guice/MapModule.java | 10 +-
.../map/impl/MapManagerFactoryImpl.java | 67 +
.../persistence/map/impl/MapManagerImpl.java | 14 +
.../persistence/map/impl/MapSerialization.java | 29 +-
.../map/impl/MapSerializationImpl.java | 199 +-
.../persistence/map/MapManagerTest.java | 94 +-
.../persistence/map/guice/TestMapModule.java | 3 +-
stack/corepersistence/model/pom.xml | 1 -
.../persistence/model/entity/Entity.java | 23 +-
.../persistence/model/entity/EntityMap.java | 66 +
.../model/entity/EntityToMapConverter.java | 133 +
.../model/entity/MapToEntityConverter.java | 203 +
.../persistence/model/entity/SimpleId.java | 1 -
.../persistence/model/field/AbstractField.java | 8 +
.../persistence/model/field/ListField.java | 2 +-
.../persistence/model/field/StringField.java | 20 +
.../persistence/model/util/EntityUtils.java | 72 +
stack/corepersistence/pom.xml | 9 +-
stack/corepersistence/queryindex/pom.xml | 78 +-
.../persistence/index/AliasedEntityIndex.java | 7 +-
.../index/ApplicationEntityIndex.java | 57 +
.../usergrid/persistence/index/EntityIndex.java | 67 +-
.../persistence/index/EntityIndexBatch.java | 35 +-
.../persistence/index/EntityIndexFactory.java | 4 +-
.../usergrid/persistence/index/IndexAlias.java | 38 +
.../persistence/index/IndexBatchBuffer.java | 36 +
.../persistence/index/IndexBufferConsumer.java | 37 +
.../persistence/index/IndexBufferProducer.java | 37 +
.../usergrid/persistence/index/IndexCache.java | 39 +
.../usergrid/persistence/index/IndexFig.java | 118 +-
.../persistence/index/IndexIdentifier.java | 63 +-
.../index/IndexOperationMessage.java | 138 +
.../usergrid/persistence/index/SearchType.java | 51 +
.../usergrid/persistence/index/SearchTypes.java | 15 +-
.../persistence/index/guice/IndexModule.java | 63 +-
.../persistence/index/guice/QueueProvider.java | 116 +
.../persistence/index/impl/BatchRequest.java | 41 +
.../persistence/index/impl/BufferQueue.java | 68 +
.../index/impl/BufferQueueInMemoryImpl.java | 116 +
.../index/impl/BufferQueueSQSImpl.java | 307 ++
.../persistence/index/impl/DeIndexRequest.java | 127 +
.../index/impl/EntityToMapConverter.java | 167 +
.../impl/EsApplicationEntityIndexImpl.java | 309 ++
.../index/impl/EsEntityIndexBatchImpl.java | 361 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 90 +
.../index/impl/EsEntityIndexImpl.java | 546 +--
.../index/impl/EsIndexBufferConsumerImpl.java | 315 ++
.../index/impl/EsIndexBufferProducerImpl.java | 65 +
.../persistence/index/impl/EsIndexCache.java | 116 -
.../index/impl/EsIndexCacheImpl.java | 141 +
.../persistence/index/impl/EsQueryVistor.java | 88 +-
.../index/impl/IndexIdentifierImpl.java | 68 +
.../persistence/index/impl/IndexRequest.java | 139 +
.../persistence/index/impl/IndexingUtils.java | 153 +-
.../impl/SearchRequestBuilderStrategy.java | 195 +
.../migration/EsIndexDataMigrationImpl.java | 105 +
.../index/migration/EsIndexMigrationPlugin.java | 46 +
.../index/migration/IndexDataVersions.java | 39 +
.../index/migration/IndexMigration.java | 35 +
.../index/migration/LegacyIndexIdentifier.java | 78 +
.../index/query/CandidateResults.java | 24 +-
.../persistence/index/query/EntityResults.java | 108 -
.../usergrid/persistence/index/query/Query.java | 92 +-
.../persistence/index/query/Results.java | 148 -
.../persistence/index/utils/ListUtils.java | 3 +-
.../persistence/index/utils/StringUtils.java | 126 +-
.../persistence/index/utils/UUIDUtils.java | 4 -
.../persistence/index/guice/IndexTestFig.java | 62 +
.../index/guice/TestIndexModule.java | 59 +-
.../index/impl/BufferQueueSQSImplTest.java | 173 +
.../index/impl/CorePerformanceIT.java | 339 --
.../impl/EntityConnectionIndexImplTest.java | 308 --
.../index/impl/EntityIndexMapUtils.java | 52 +-
.../persistence/index/impl/EntityIndexTest.java | 412 +-
.../persistence/index/impl/EsTestUtils.java | 48 -
.../index/impl/IndexLoadTestsIT.java | 390 ++
.../index/impl/IndexMigrationTest.java | 106 +
.../persistence/query/tree/GrammarTreeTest.java | 10 +-
.../persistence/queue/QueueManager.java | 4 +-
.../usergrid/persistence/queue/QueueScope.java | 2 +-
.../persistence/queue/QueueScopeFactory.java | 34 -
.../persistence/queue/guice/QueueModule.java | 17 +-
.../queue/impl/QueueScopeFactoryImpl.java | 48 -
.../persistence/queue/impl/QueueScopeImpl.java | 27 +-
.../queue/impl/SQSQueueManagerImpl.java | 214 +-
.../persistence/queue/NoAWSCredsRule.java | 98 +
.../persistence/queue/QueueManagerTest.java | 29 +-
.../queue/guice/TestQueueModule.java | 3 +-
.../datagenerators/EntityDataGenerator.scala | 25 +
.../datagenerators/FeederGenerator.scala | 18 +-
.../usergrid/scenarios/EntityScenarios.scala | 8 +-
.../org/apache/usergrid/settings/Settings.scala | 4 +-
.../simulations/PutCustomEntitySimulation.scala | 75 +
.../usergrid/mongo/protocol/OpDelete.java | 4 +-
.../apache/usergrid/mongo/protocol/OpQuery.java | 6 +-
.../usergrid/mongo/protocol/OpUpdate.java | 4 +-
stack/pom.xml | 90 +-
stack/rest/catalina_base/bin/setenv.sh | 8 -
stack/rest/catalina_base/conf/server.xml | 144 -
stack/rest/catalina_base/conf/tomcat-users.xml | 36 -
stack/rest/catalina_base/conf/web.xml | 4614 ------------------
.../lib/usergrid-deployment.properties | 113 -
.../webapps/host-manager/META-INF/context.xml | 27 -
.../webapps/host-manager/WEB-INF/jsp/401.jsp | 70 -
.../webapps/host-manager/WEB-INF/jsp/403.jsp | 84 -
.../webapps/host-manager/WEB-INF/jsp/404.jsp | 61 -
.../webapps/host-manager/WEB-INF/web.xml | 144 -
.../webapps/host-manager/images/add.gif | Bin 1037 -> 0 bytes
.../webapps/host-manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
.../webapps/host-manager/images/code.gif | Bin 394 -> 0 bytes
.../webapps/host-manager/images/design.gif | Bin 608 -> 0 bytes
.../webapps/host-manager/images/docs.gif | Bin 261 -> 0 bytes
.../webapps/host-manager/images/fix.gif | Bin 345 -> 0 bytes
.../webapps/host-manager/images/tomcat.gif | Bin 1934 -> 0 bytes
.../webapps/host-manager/images/update.gif | Bin 627 -> 0 bytes
.../webapps/host-manager/images/void.gif | Bin 43 -> 0 bytes
.../webapps/host-manager/index.jsp | 18 -
.../webapps/host-manager/manager.xml | 26 -
.../webapps/manager/META-INF/context.xml | 27 -
.../webapps/manager/WEB-INF/jsp/401.jsp | 79 -
.../webapps/manager/WEB-INF/jsp/403.jsp | 94 -
.../webapps/manager/WEB-INF/jsp/404.jsp | 62 -
.../manager/WEB-INF/jsp/sessionDetail.jsp | 197 -
.../manager/WEB-INF/jsp/sessionsList.jsp | 172 -
.../webapps/manager/WEB-INF/web.xml | 209 -
.../webapps/manager/images/add.gif | Bin 1037 -> 0 bytes
.../webapps/manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
.../webapps/manager/images/code.gif | Bin 394 -> 0 bytes
.../webapps/manager/images/design.gif | Bin 608 -> 0 bytes
.../webapps/manager/images/docs.gif | Bin 261 -> 0 bytes
.../webapps/manager/images/fix.gif | Bin 345 -> 0 bytes
.../webapps/manager/images/tomcat.gif | Bin 2066 -> 0 bytes
.../webapps/manager/images/update.gif | Bin 627 -> 0 bytes
.../webapps/manager/images/void.gif | Bin 43 -> 0 bytes
.../catalina_base/webapps/manager/index.jsp | 18 -
.../catalina_base/webapps/manager/status.xsd | 84 -
.../catalina_base/webapps/manager/xform.xsl | 125 -
stack/rest/catalina_base/webapps/portal | 1 -
.../manager/org/apache/jsp/index_jsp.java | 83 -
stack/rest/pom.xml | 40 +-
.../usergrid/rest/AbstractContextResource.java | 102 +-
.../org/apache/usergrid/rest/ApiResponse.java | 50 +-
.../org/apache/usergrid/rest/IndexResource.java | 33 +-
.../usergrid/rest/JobServiceBoostrap.java | 12 +
.../apache/usergrid/rest/MigrateResource.java | 122 +-
.../org/apache/usergrid/rest/RootResource.java | 14 +-
.../rest/applications/ApplicationResource.java | 38 +-
.../rest/applications/ServiceResource.java | 8 +-
.../exceptions/AbstractExceptionMapper.java | 11 +-
.../exceptions/ConflictExceptionMapper.java | 35 +
.../exceptions/NotFoundExceptionMapper.java | 35 +
.../rest/exceptions/UncaughtException.java | 36 +
.../organizations/OrganizationResource.java | 26 +-
.../applications/ApplicationResource.java | 61 +-
.../applications/ApplicationsResource.java | 40 +-
.../imports/FileIncludesResource.java | 9 -
.../applications/imports/ImportsResource.java | 83 +-
.../organizations/OrganizationResource.java | 23 +-
.../OAuth2AccessTokenSecurityFilter.java | 2 +-
.../usergrid/rest/test/PropertiesResource.java | 2 +-
.../rest/test/RefreshIndexResource.java | 17 +-
.../apache/usergrid/rest/AbstractRestIT.java | 8 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 302 +-
.../apache/usergrid/rest/IndexResourceIT.java | 2 +
.../org/apache/usergrid/rest/SimplestTest.java | 35 -
.../apache/usergrid/rest/SystemResourceIT.java | 56 +
.../applications/ApplicationDeleteTest.java | 373 +-
.../applications/ApplicationResourceIT.java | 63 +-
.../collection/BrowserCompatibilityTest.java | 5 +-
.../collection/CollectionsResourceIT.java | 22 +-
.../collection/users/OwnershipResourceIT.java | 4 +-
.../collection/users/PermissionsResourceIT.java | 15 -
.../collection/users/RetrieveUsersTest.java | 4 +-
.../collection/users/UserResourceIT.java | 16 +-
.../applications/queries/GeoPagingTest.java | 44 +-
.../rest/applications/queries/OrderByTest.java | 2 +-
.../usergrid/rest/management/AccessTokenIT.java | 418 +-
.../usergrid/rest/management/AdminUsersIT.java | 995 ++--
.../rest/management/ExportResourceIT.java | 652 +--
.../rest/management/ImportResourceIT.java | 170 +-
.../rest/management/OrganizationsIT.java | 16 +-
.../organizations/AdminEmailEncodingIT.java | 9 +-
.../test/resource2point0/AbstractRestIT.java | 4 +-
.../rest/test/resource2point0/ClientSetup.java | 59 +-
.../rest/test/resource2point0/RestClient.java | 19 +
.../resource2point0/TestPropertiesResource.java | 47 +
.../endpoints/ApplicationsResource.java | 34 +-
.../endpoints/CollectionEndpoint.java | 155 +-
.../endpoints/DatabaseResource.java | 39 +
.../endpoints/NamedResource.java | 112 +-
.../endpoints/OrganizationResource.java | 6 +-
.../endpoints/SetupResource.java | 52 +
.../endpoints/SystemResource.java | 36 +
.../endpoints/mgmt/ApplicationResource.java | 54 +-
.../endpoints/mgmt/ApplicationsResource.java | 58 +
.../endpoints/mgmt/ConfirmResource.java | 46 +
.../endpoints/mgmt/FeedResource.java | 48 +
.../endpoints/mgmt/ManagementResource.java | 4 +
.../endpoints/mgmt/ManagementResponse.java | 72 +
.../endpoints/mgmt/MeResource.java | 32 +
.../endpoints/mgmt/OrgResource.java | 93 +-
.../mgmt/OrganizationApplicationResponse.java | 60 +
.../endpoints/mgmt/OrganizationResource.java | 5 +-
.../endpoints/mgmt/PasswordResource.java | 45 +
.../endpoints/mgmt/ReactivateResource.java | 46 +
.../endpoints/mgmt/ResetResource.java | 42 +
.../endpoints/mgmt/RevokeTokenResource.java | 32 +
.../endpoints/mgmt/RevokeTokensResource.java | 33 +
.../endpoints/mgmt/TokenResource.java | 29 +-
.../endpoints/mgmt/UserResource.java | 88 +
.../endpoints/mgmt/UsersResource.java | 8 +-
.../test/resource2point0/model/Credentials.java | 4 +-
.../rest/test/resource2point0/model/Entity.java | 6 -
stack/rest/src/test/resources/log4j.properties | 10 +-
.../resources/testImportCorrect.testCol.1.json | 18 -
...testImportInvalidJson.testApplication.3.json | 153 -
.../testimport-bad-json-testapp.3.json | 153 +
.../src/test/resources/testimport-bad-json.json | 67 +
.../resources/testimport-correct-testcol.1.json | 18 +
.../test/resources/testimport-test-app.2.json | 56 +
.../resources/usergrid-custom-test.properties | 8 +
stack/services/pom.xml | 27 +-
.../usergrid/management/ApplicationInfo.java | 4 +
.../usergrid/management/ManagementService.java | 10 +-
.../cassandra/ApplicationCreatorImpl.java | 12 +-
.../cassandra/ManagementServiceImpl.java | 264 +-
.../management/importer/FileImportJob.java | 6 +-
.../management/importer/FileImportTracker.java | 6 +-
.../usergrid/management/importer/ImportJob.java | 4 +-
.../management/importer/ImportServiceImpl.java | 78 +-
.../usergrid/security/AuthPrincipalType.java | 3 +-
.../providers/PingIdentityProvider.java | 5 +-
.../shiro/PrincipalCredentialsToken.java | 20 +-
.../services/AbstractCollectionService.java | 40 +-
.../services/AbstractConnectionsService.java | 39 +-
.../services/ServiceManagerFactory.java | 4 -
.../usergrid/services/guice/ServiceModule.java | 2 -
.../notifications/NotificationsService.java | 54 +-
.../services/notifications/QueueJob.java | 6 +-
.../services/notifications/QueueListener.java | 22 +-
.../apns/FailedConnectionListener.java | 31 +-
.../impl/ApplicationQueueManagerImpl.java | 197 +-
.../services/notifications/wns/WNSAdapter.java | 39 +
.../services/queues/ImportQueueListener.java | 7 +-
.../usergrid/services/queues/QueueListener.java | 12 +-
.../resources/usergrid-services-context.xml | 12 +-
.../org/apache/usergrid/ServiceApplication.java | 18 +-
.../org/apache/usergrid/ServiceITSetup.java | 5 +
.../org/apache/usergrid/ServiceITSetupImpl.java | 43 +-
.../migration/AppInfoMigrationPluginTest.java | 221 +
.../apache/usergrid/management/EmailFlowIT.java | 9 +-
.../usergrid/management/OrganizationIT.java | 18 +-
.../org/apache/usergrid/management/RoleIT.java | 4 +-
.../cassandra/ApplicationCreatorIT.java | 14 +-
.../cassandra/ManagementServiceIT.java | 35 +-
.../management/export/ExportServiceIT.java | 20 +-
.../importer/FileImportTrackerTest.java | 12 +-
.../management/importer/ImportCollectionIT.java | 16 +-
.../importer/ImportConnectionsTest.java | 7 +-
.../security/tokens/TokenServiceIT.java | 2 -
.../usergrid/services/CollectionServiceIT.java | 2 +
.../usergrid/services/ConnectionsServiceIT.java | 10 +-
.../usergrid/services/GroupServiceIT.java | 6 +-
.../usergrid/services/RolesServiceIT.java | 2 +-
.../usergrid/services/ServiceFactoryIT.java | 8 +-
.../usergrid/services/ServiceRequestIT.java | 9 +-
.../usergrid/services/UsersServiceIT.java | 2 +-
.../AbstractServiceNotificationIT.java | 2 +-
.../notifications/NotifiersServiceIT.java | 6 +
.../apns/NotificationsServiceIT.java | 42 +-
.../gcm/NotificationsServiceIT.java | 8 +-
.../src/test/resources/log4j.properties | 6 +-
.../resources/usergrid-custom-test.properties | 5 +
stack/test-utils/pom.xml | 16 -
.../usergrid/cassandra/ClearShiroSubject.java | 19 +-
.../setup/ConcurrentProcessSingleton.java | 49 +-
.../org/apache/usergrid/tools/AppAudit.java | 3 +-
.../org/apache/usergrid/tools/CredExport.java | 2 +-
.../org/apache/usergrid/tools/DupOrgRepair.java | 1 -
.../java/org/apache/usergrid/tools/Import.java | 14 +-
.../usergrid/tools/UniqueIndexCleanup.java | 6 +-
654 files changed, 26658 insertions(+), 20997 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79961615/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------