Merge commit 'refs/pull/458/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/63091f34 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/63091f34 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/63091f34 Branch: refs/heads/master Commit: 63091f3497cede3fab597fbad44e86ee13ddabe1 Parents: 5034844 000e1ce Author: Michael Russo <[email protected]> Authored: Fri Jan 8 09:20:47 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Jan 8 09:20:47 2016 -0800 ---------------------------------------------------------------------- .../batch/service/JobSchedulerService.java | 55 +++++---- .../batch/service/SchedulerServiceImpl.java | 30 ++--- .../usergrid/count/Slf4JBatchSubmitter.java | 6 +- .../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/TestJobListenerTest.java | 6 +- .../count/BatchCountParallelismTest.java | 11 +- .../locking/cassandra/HectorLockManagerIT.java | 10 +- .../SingleNodeLockTestSingleNode.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 +++---- .../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 +- .../EntityCollectionManagerStressTest.java | 9 +- .../changelog/ChangeLogGeneratorImplTest.java | 8 +- .../stage/write/WriteOptimisticVerifyTest.java | 4 +- .../migration/data/AbstractMigrationPlugin.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/ShardGroupCompactionImpl.java | 30 +++-- .../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/impl/EntityIndexTest.java | 12 +- .../usergrid/launcher/EmbeddedServerHelper.java | 10 +- .../apache/usergrid/rest/PartialUpdateTest.java | 8 +- .../org/apache/usergrid/rest/TomcatRuntime.java | 12 +- .../applications/assets/AssetResourceIT.java | 10 +- .../applications/assets/AwsAssetResourceIT.java | 12 +- .../collection/users/UserResourceIT.java | 13 +- .../users/extensions/TestResource.java | 5 +- .../applications/queries/AndOrQueryTest.java | 6 +- .../rest/applications/queries/OrderByTest.java | 8 +- .../applications/queries/QueryTestBase.java | 4 +- .../services/notifications/JobScheduler.java | 9 +- .../notifications/NotificationsService.java | 12 +- .../services/notifications/QueueListener.java | 52 ++++---- .../services/notifications/TaskManager.java | 43 +++---- .../impl/ApplicationQueueManagerImpl.java | 80 ++++++------- .../services/notifications/wns/WNSAdapter.java | 6 +- .../usergrid/services/queues/QueueListener.java | 35 +++--- .../org/apache/usergrid/NewOrgAppAdminRule.java | 4 +- .../org/apache/usergrid/ServiceApplication.java | 14 +-- .../apache/usergrid/management/EmailFlowIT.java | 22 ++-- .../org/apache/usergrid/management/RoleIT.java | 8 +- .../cassandra/ManagementServiceIT.java | 12 +- .../security/tokens/TokenServiceIT.java | 10 +- .../usergrid/services/ServiceInvocationIT.java | 4 +- .../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 +- .../apache/usergrid/tools/WarehouseExport.java | 18 +-- .../apache/usergrid/tools/WarehouseUpsert.java | 30 ++--- .../websocket/WebSocketChannelHandler.java | 16 +-- 82 files changed, 742 insertions(+), 789 deletions(-) ----------------------------------------------------------------------
