Merge remote-tracking branch 'origin/master' into USERGRID-1200
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a33698b1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a33698b1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a33698b1 Branch: refs/heads/master Commit: a33698b166abfc3e96c9f88af5dddb41d7e5fa9e Parents: 90d5d66 d796b68 Author: Mike Dunker <[email protected]> Authored: Tue Jan 19 11:14:23 2016 -0800 Committer: Mike Dunker <[email protected]> Committed: Tue Jan 19 11:14:23 2016 -0800 ---------------------------------------------------------------------- .../src/main/dist/lib/log4j.properties | 1 - .../src/test/resources/usergrid-test.properties | 5 - stack/core/pom.xml | 10 +- .../apache/usergrid/batch/job/OnlyOnceJob.java | 3 +- .../usergrid/corepersistence/CoreModule.java | 2 + .../asyncevents/AsyncEventsSchedulerFig.java | 2 +- .../index/IndexProcessorFig.java | 2 +- .../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 | 96 -- .../zookeeper/ZooKeeperLockManagerImpl.java | 115 --- .../locking/zookeeper/ZookeeperLockImpl.java | 88 -- .../mq/cassandra/QueueManagerFactoryImpl.java | 5 +- .../apache/usergrid/mq/cassandra/QueuesCF.java | 2 +- .../persistence/cassandra/CassandraService.java | 5 +- .../main/resources/usergrid-core-context.xml | 36 +- .../org/apache/usergrid/CoreITSetupImpl.java | 4 + .../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 ---- .../org/apache/usergrid/persistence/GeoIT.java | 62 +- stack/core/src/test/resources/log4j.properties | 1 - .../impl/ScopedCacheSerializationImpl.java | 12 +- .../MvccEntitySerializationStrategyImpl.java | 14 +- ...vccEntitySerializationStrategyProxyImpl.java | 4 +- .../MvccEntitySerializationStrategyV1Impl.java | 8 +- .../MvccEntitySerializationStrategyV2Impl.java | 13 +- .../MvccEntitySerializationStrategyV3Impl.java | 14 +- .../MvccLogEntrySerializationProxyImpl.java | 4 +- .../MvccLogEntrySerializationStrategyImpl.java | 6 +- ...MvccLogEntrySerializationStrategyV1Impl.java | 18 +- ...MvccLogEntrySerializationStrategyV2Impl.java | 18 +- .../UniqueValueSerializationStrategyImpl.java | 28 +- ...iqueValueSerializationStrategyProxyImpl.java | 4 +- .../UniqueValueSerializationStrategyV1Impl.java | 31 +- .../UniqueValueSerializationStrategyV2Impl.java | 31 +- stack/corepersistence/common/pom.xml | 351 ++++---- .../core/astyanax/AstyanaxKeyspaceProvider.java | 46 +- .../core/astyanax/CassandraCluster.java | 20 + .../core/astyanax/CassandraClusterImpl.java | 198 +++++ .../persistence/core/astyanax/CassandraFig.java | 72 +- .../core/astyanax/MultiTenantColumnFamily.java | 47 + .../MultiTenantColumnFamilyDefinition.java | 138 +++ .../core/astyanax/MultiTennantColumnFamily.java | 47 - .../MultiTennantColumnFamilyDefinition.java | 138 --- .../persistence/core/guice/CommonModule.java | 11 +- .../data/MigrationInfoSerializationImpl.java | 24 +- .../core/migration/schema/Migration.java | 4 +- .../migration/schema/MigrationManagerImpl.java | 9 +- .../core/astyanax/ColumnNameIteratorTest.java | 5 +- .../MultiKeyColumnNameIteratorTest.java | 5 +- .../astyanax/MultiRowColumnIteratorTest.java | 5 +- .../persistence/core/astyanax/TestUtils.java | 8 +- .../EdgeMetadataSerializationProxyImpl.java | 4 +- .../impl/EdgeMetadataSerializationV1Impl.java | 36 +- .../impl/EdgeMetadataSerializationV2Impl.java | 36 +- .../impl/NodeSerializationImpl.java | 14 +- .../impl/shard/EdgeColumnFamilies.java | 12 +- .../shard/impl/EdgeShardSerializationImpl.java | 14 +- .../impl/ShardedEdgeSerializationImpl.java | 58 +- .../impl/shard/impl/ShardsColumnIterator.java | 15 +- .../shard/impl/SizebasedEdgeColumnFamilies.java | 46 +- .../map/impl/MapSerializationImpl.java | 28 +- .../resources/usergrid-standalone.properties | 4 - stack/pom.xml | 39 +- stack/rest/pom.xml | 32 +- .../rest/applications/ServiceResource.java | 12 +- .../notifiers/NotifierResource.java | 49 +- .../notifiers/NotifiersResource.java | 38 +- .../usergrid/rest/utils/CertificateUtils.java | 108 +++ .../applications/assets/AssetResourceIT.java | 80 ++ .../applications/notifiers/NotifiersIT.java | 116 +++ 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/valid_non_apple_2036_01_07.p12 | Bin 0 -> 2661 bytes stack/services/pom.xml | 889 ++++++++++--------- .../cassandra/ManagementServiceImpl.java | 35 +- .../services/ServiceManagerFactory.java | 6 +- .../services/guice/ServiceModuleImpl.java | 3 + .../services/notifications/QueueListener.java | 3 +- .../usergrid/services/queues/QueueListener.java | 3 +- .../resources/usergrid-services-context.xml | 133 +-- .../notifications/NotifiersServiceIT.java | 3 +- .../apns/MockSuccessfulProviderAdapter.java | 101 --- .../apns/NotificationsServiceIT.java | 251 ++---- .../gcm/MockSuccessfulProviderAdapter.java | 85 -- .../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 stack/tools/src/main/resources/log4j.properties | 1 - .../test/resources/testApplicationContext.xml | 273 +++--- tests/integration/.gitignore | 1 + tests/integration/package.json | 5 +- 101 files changed, 2711 insertions(+), 3201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a33698b1/stack/config/src/test/resources/usergrid-test.properties ---------------------------------------------------------------------- diff --cc stack/config/src/test/resources/usergrid-test.properties index c934653,0824673..4693f8d --- a/stack/config/src/test/resources/usergrid-test.properties +++ b/stack/config/src/test/resources/usergrid-test.properties @@@ -114,12 -114,7 +114,7 @@@ usergrid.binary.bucketname=usergrid-tes # Where to store temporary files usergrid.temp.files=/tmp/usergrid - # Zookeeper instances - zookeeper.hosts=localhost:2180 - zookeeper.sessionTimeout = 3000 - zookeeper.maxAttempts = 3 - -swagger.basepath=http://localhost:8080 +usergrid.api.url.base=http://localhost:8080 AWS_ACCESS_KEY_ID= AWS_ACCESS_KEY_SECRET= http://git-wip-us.apache.org/repos/asf/usergrid/blob/a33698b1/stack/launcher/src/main/resources/usergrid-standalone.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a33698b1/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a33698b1/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a33698b1/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ----------------------------------------------------------------------
