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 2014/06/13 20:54:27 UTC
[48/50] [abbrv] git commit: Merge
34c451d562c2da09dd296f6c2d5666845c404f1d into
416a60326aef7fe0aefd0100bc4c1124a9fd3c32
Merge 34c451d562c2da09dd296f6c2d5666845c404f1d into 416a60326aef7fe0aefd0100bc4c1124a9fd3c32
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d507019e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d507019e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d507019e
Branch: refs/pull/201/merge
Commit: d507019e16dbb3d535bbeb66c2029c5ecc0ee2b8
Parents: 416a603 34c451d
Author: GERey <gr...@apigee.com>
Authored: Fri Jun 13 14:54:56 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Fri Jun 13 14:54:56 2014 +0000
----------------------------------------------------------------------
.gitignore | 5 +
README.md | 7 +
.../chop/api/store/amazon/AmazonInstance.java | 94 -
.../api/store/amazon/EC2InstanceManager.java | 5 +-
chop/check_style.xml | 70 +
chop/example/pom.xml | 6 +
chop/example/src/main/resources/stack.json | 2 +-
.../usergrid/chop/example/DigitalWatchTest.java | 23 +
.../usergrid/chop/example/MainspringTest.java | 1 -
.../chop/example/MechanicalWatchTest.java | 23 +
.../apache/usergrid/chop/plugin/DeployMojo.java | 1 +
.../apache/usergrid/chop/plugin/ResetMojo.java | 20 +
.../apache/usergrid/chop/plugin/RunnerMojo.java | 6 +
.../apache/usergrid/chop/plugin/SetupMojo.java | 49 +-
.../apache/usergrid/chop/plugin/StartMojo.java | 18 +-
chop/pom.xml | 11 +
.../apache/usergrid/chop/runner/Controller.java | 70 +
.../chop/runner/RunnerRegistryImpl.java | 29 +
.../usergrid/chop/spi/RunnerRegistry.java | 10 +-
.../usergrid/chop/stack/BasicInstance.java | 181 ++
.../apache/usergrid/chop/stack/ChopCluster.java | 41 +
.../stack/CoordinatedClusterDeserializer.java | 88 +
.../stack/CoordinatedClusterSerializer.java | 57 +
.../usergrid/chop/stack/CoordinatedStack.java | 2 +-
.../chop/stack/ICoordinatedCluster.java | 10 +
.../apache/usergrid/chop/stack/Instance.java | 20 +
.../usergrid/chop/stack/SetupStackState.java | 23 +-
.../apache/usergrid/chop/stack/ClusterTest.java | 114 +
.../usergrid/chop/webapp/ChopUiConfig.java | 5 +-
.../usergrid/chop/webapp/ChopUiJettyRunner.java | 1 +
.../webapp/coordinator/CoordinatorUtils.java | 5 +-
.../webapp/coordinator/StackCoordinator.java | 4 +-
.../coordinator/rest/PropertiesResource.java | 90 +-
.../webapp/coordinator/rest/SetupResource.java | 44 +-
.../webapp/coordinator/rest/StartResource.java | 18 +-
.../elasticsearch/ElasticSearchClient.java | 112 +-
.../webapp/elasticsearch/ElasticSearchFig.java | 8 +
.../webapp/elasticsearch/ElasticSearchNode.java | 112 +
.../ElasticSearchNodeResponse.java | 72 +
.../elasticsearch/IElasticSearchClient.java | 11 +-
.../chop/webapp/view/log/LogLayout.java | 113 +
.../chop/webapp/view/main/MainView.java | 7 +
.../usergrid/chop/webapp/ChopUiTestUtils.java | 4 +-
portal/Gruntfile.js | 7 +-
portal/bower.json | 2 +-
portal/config.js | 2 +-
portal/js/data/data-controller.js | 6 +
portal/js/global/ug-service.js | 3 +-
portal/js/menu.html | 2 +-
portal/package.json | 2 +-
.../main/resources/corepersistence.properties | 45 +
stack/core/pom.xml | 12 +-
.../batch/service/SchedulerServiceImpl.java | 11 +-
.../corepersistence/CpEntityDeleteListener.java | 95 +
.../CpEntityIndexDeleteListener.java | 92 +
.../corepersistence/CpEntityManager.java | 2181 +++++++++++++-----
.../corepersistence/CpEntityManagerFactory.java | 70 +-
.../corepersistence/CpEntityMapUtils.java | 2 +-
.../corepersistence/CpRelationManager.java | 1765 ++++++++++++--
.../usergrid/corepersistence/CpSetup.java | 20 +-
.../usergrid/corepersistence/GuiceModule.java | 86 +-
.../usergrid/persistence/EntityManager.java | 8 +-
.../persistence/EntityManagerFactory.java | 2 +
.../apache/usergrid/persistence/QueryUtils.java | 69 +
.../usergrid/persistence/RelationManager.java | 6 +
.../apache/usergrid/persistence/Results.java | 6 +
.../cassandra/EntityManagerFactoryImpl.java | 5 +
.../cassandra/EntityManagerImpl.java | 81 +-
.../usergrid/persistence/cassandra/Setup.java | 4 +
.../persistence/cassandra/SetupImpl.java | 1 +
.../main/resources/usergrid-core-context.xml | 33 +-
.../usergrid/ConcurrentCoreTestSuite.java | 5 +-
.../java/org/apache/usergrid/CoreTestSuite.java | 5 +-
.../CpEntityDeleteListenerTest.java | 99 +
.../CpEntityIndexDeleteListenerTest.java | 107 +
.../usergrid/persistence/CollectionIT.java | 19 +-
.../apache/usergrid/persistence/CounterIT.java | 17 +-
.../persistence/EntityConnectionsIT.java | 53 +
.../usergrid/persistence/EntityManagerIT.java | 27 +-
.../org/apache/usergrid/persistence/GeoIT.java | 16 +-
.../usergrid/persistence/PermissionsIT.java | 2 +
.../cassandra/QueryProcessorTest.java | 5 +
.../query/AbstractIteratingQueryIT.java | 17 +-
.../query/AllInConnectionNoTypeIT.java | 13 +-
.../query/IntersectionUnionPagingIT.java | 13 +-
.../persistence/query/tree/GrammarTreeTest.java | 608 -----
.../persistence/query/tree/LongLiteralTest.java | 63 -
.../query/tree/StringLiteralTest.java | 89 -
stack/core/src/test/resources/config.properties | 44 +
.../resources/corepersistence-UNIT.properties | 45 +-
.../test/resources/corepersistence.properties | 23 -
stack/core/src/test/resources/log4j.properties | 11 +-
stack/corepersistence/collection/pom.xml | 1 +
.../collection/EntityCollectionManager.java | 7 +
.../exception/CollectionRuntimeException.java | 13 +-
.../exception/WriteCommitException.java | 9 +-
.../WriteOptimisticVerifyException.java | 9 +-
.../exception/WriteStartException.java | 9 +-
.../exception/WriteUniqueVerifyException.java | 9 +-
.../collection/guice/CollectionModule.java | 99 +-
.../persistence/collection/guice/Write.java | 17 +
.../collection/guice/WriteUpdate.java | 17 +
.../impl/EntityCollectionManagerImpl.java | 227 +-
.../impl/EntityCollectionManagerListener.java | 46 +
.../mvcc/changelog/ChangeLogGenerator.java | 2 +-
.../collection/mvcc/entity/MvccId.java | 18 +
.../mvcc/entity/impl/MvccEntityDeleteEvent.java | 5 +-
.../entity/impl/MvccEntityDeleteListener.java | 96 -
.../mvcc/entity/impl/MvccEntityEvent.java | 1 -
.../collection/mvcc/entity/impl/MvccIdImpl.java | 34 +
.../mvcc/stage/CollectionIoEvent.java | 4 +-
.../mvcc/stage/EntityUpdateEvent.java | 35 +
.../mvcc/stage/delete/MarkCommit.java | 56 +-
.../collection/mvcc/stage/load/Load.java | 37 +-
.../mvcc/stage/write/RollbackAction.java | 67 +-
.../mvcc/stage/write/UniqueValueImpl.java | 2 +-
.../mvcc/stage/write/WriteCommit.java | 10 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 8 +-
.../collection/mvcc/stage/write/WriteStart.java | 31 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 10 +-
.../MvccEntitySerializationStrategyImpl.java | 39 +-
.../persistence/collection/util/RepairUtil.java | 138 ++
.../collection/EntityCollectionManagerIT.java | 127 +-
.../impl/MvccEntityDeleteListenerTest.java | 102 -
.../mvcc/stage/AbstractEntityStageTest.java | 2 +
.../mvcc/stage/TestEntityGenerator.java | 16 +
.../mvcc/stage/delete/MarkCommitTest.java | 6 +-
.../collection/mvcc/stage/load/LoadTest.java | 246 +-
.../mvcc/stage/write/WriteStartTest.java | 11 +-
.../mvcc/stage/write/WriteUniqueVerifyIT.java | 4 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 2 -
.../persistence/collection/rx/ParallelTest.java | 15 +-
.../serialization/impl/IdRowSerializerTest.java | 19 +
...MvccEntitySerializationStrategyImplTest.java | 23 +-
.../impl/MvccLESSTransientTest.java | 24 +-
...ccLogEntrySerializationStrategyImplTest.java | 19 +
.../impl/ScopedRowKeySerializerTest.java | 19 +
.../impl/SerializationComparison.java | 23 +-
stack/corepersistence/common/pom.xml | 1 +
.../persistence/core/astyanax/ColumnTypes.java | 20 +-
.../core/consistency/AsyncProcessor.java | 9 +
.../consistency/AsyncProcessorFactoryImpl.java | 49 +-
.../core/consistency/AsyncProcessorImpl.java | 52 +-
.../persistence/core/guice/CommonModule.java | 2 +-
.../core/hystrix/HystrixGraphObservable.java | 71 -
.../core/hystrix/HystrixObservable.java | 92 +
.../core/scope/ApplicationScopeImpl.java | 14 +-
.../persistence/core/util/ValidationUtils.java | 5 +-
stack/corepersistence/graph/pom.xml | 2 +
.../apache/usergrid/persistence/graph/Edge.java | 2 +-
.../persistence/graph/GraphManager.java | 6 +-
.../persistence/graph/SearchByEdge.java | 8 +-
.../persistence/graph/SearchByEdgeType.java | 2 +-
.../persistence/graph/SearchEdgeType.java | 6 +
.../graph/impl/EdgeDeleteListener.java | 6 +-
.../graph/impl/GraphManagerImpl.java | 104 +-
.../persistence/graph/impl/NodeDeleteEvent.java | 8 +-
.../graph/impl/NodeDeleteListener.java | 54 +-
.../persistence/graph/impl/SimpleEdge.java | 43 +-
.../graph/impl/SimpleMarkedEdge.java | 14 +-
.../graph/impl/SimpleSearchByEdge.java | 15 +-
.../graph/impl/SimpleSearchByEdgeType.java | 23 +-
.../graph/impl/SimpleSearchByIdType.java | 6 +-
.../graph/impl/SimpleSearchEdgeType.java | 16 +-
.../graph/impl/SimpleSearchIdType.java | 4 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 2 +-
.../graph/impl/stage/EdgeMetaRepair.java | 8 +-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 69 +-
.../graph/impl/stage/EdgeWriteCompactImpl.java | 10 +-
.../EdgeMetadataSerialization.java | 16 +-
.../graph/serialization/NodeSerialization.java | 14 +-
.../impl/EdgeMetadataSerializationImpl.java | 126 +-
.../impl/EdgeSerializationImpl.java | 242 +-
.../impl/MergedEdgeReaderImpl.java | 21 +-
.../impl/NodeSerializationImpl.java | 26 +-
.../impl/shard/EdgeShardStrategy.java | 21 +-
.../impl/shard/NodeShardCache.java | 8 +-
.../shard/impl/NodeShardApproximationImpl.java | 24 +-
.../impl/shard/impl/NodeShardCacheImpl.java | 8 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 8 +-
.../shard/impl/TimebasedEdgeShardStrategy.java | 4 +-
.../graph/serialization/util/EdgeUtils.java | 16 +-
.../graph/ComittedGraphManagerIT.java | 4 +-
.../persistence/graph/GraphManagerIT.java | 453 ++--
.../persistence/graph/GraphManagerLoadTest.java | 10 +-
.../graph/GraphManagerStressTest.java | 13 +-
.../usergrid/persistence/graph/SimpleTest.java | 82 +
.../graph/StorageGraphManagerIT.java | 24 +-
.../graph/impl/EdgeDeleteListenerTest.java | 50 +-
.../graph/impl/EdgeWriteListenerTest.java | 38 +-
.../graph/impl/NodeDeleteListenerTest.java | 34 +-
.../graph/impl/stage/EdgeDeleteRepairTest.java | 10 +-
.../graph/impl/stage/EdgeMetaRepairTest.java | 42 +-
.../EdgeMetadataSerializationTest.java | 25 +-
.../EdgeSerializationChopTest.java | 2 +-
.../serialization/EdgeSerializationTest.java | 125 +-
.../serialization/NodeSerializationTest.java | 28 +-
.../MergedEdgeReaderImplComparatorTest.java | 32 +-
.../impl/MergedEdgeReaderTest.java | 170 +-
.../impl/shard/NodeShardCacheTest.java | 26 +-
.../graph/test/util/EdgeTestUtils.java | 228 +-
stack/corepersistence/model/pom.xml | 55 +-
.../persistence/model/entity/Entity.java | 5 +-
.../model/field/value/EntityObject.java | 12 +-
.../persistence/model/field/value/Location.java | 4 +-
stack/corepersistence/pom.xml | 23 +-
stack/corepersistence/queryindex/pom.xml | 1 +
.../persistence/index/guice/IndexModule.java | 3 -
.../index/impl/EsEntityIndexDeleteListener.java | 95 -
.../index/impl/EsEntityIndexImpl.java | 49 +-
.../persistence/index/impl/EsProvider.java | 103 +-
.../persistence/index/impl/EsQueryVistor.java | 17 +-
.../persistence/index/query/EntityRef.java | 30 -
.../usergrid/persistence/index/query/Query.java | 12 +-
.../index/query/SimpleEntityRef.java | 131 --
.../index/query/tree/StringLiteral.java | 21 +-
.../index/utils/IndexValidationUtils.java | 3 -
.../index/impl/ElasticSearchTest.java | 12 +-
.../impl/EntityConnectionIndexImplTest.java | 3 -
.../persistence/index/impl/EntityIndexTest.java | 15 +-
.../impl/EsEntityIndexDeleteListenerTest.java | 96 -
.../query/tree/StringLiteralTest.java | 39 +-
.../src/test/resources/log4j.properties | 7 +-
.../src/test/resources/project.properties | 1 +
stack/pom.xml | 2 +
.../rest/applications/ServiceResource.java | 3 +-
.../exceptions/QueryTokenExceptionMapper.java | 2 -
.../rest/management/users/UsersResource.java | 16 +-
.../rest/applications/users/UserResourceIT.java | 315 ++-
.../resources/corepersistence-UNIT.properties | 17 +
stack/rest/src/test/resources/log4j.properties | 35 +-
.../test/resources/usergrid-test-context.xml | 47 +-
.../usergrid/management/ManagementService.java | 2 +-
.../cassandra/ManagementServiceImpl.java | 123 +-
.../management/export/ExportServiceImpl.java | 1 -
.../security/shiro/utils/SubjectUtils.java | 2 +-
.../services/AbstractCollectionService.java | 9 +-
.../services/AbstractConnectionsService.java | 15 +-
.../usergrid/services/ServiceResults.java | 5 +-
.../users/activities/ActivitiesService.java | 4 +-
.../org/apache/usergrid/ServiceApplication.java | 37 +-
.../apache/usergrid/management/EmailFlowIT.java | 9 +-
.../usergrid/management/OrganizationIT.java | 9 +
.../org/apache/usergrid/management/RoleIT.java | 2 +
.../management/cassandra/ExportServiceIT.java | 9 +-
.../cassandra/ManagementServiceIT.java | 17 +
.../usergrid/services/CollectionServiceIT.java | 23 +-
.../usergrid/services/ConnectionsServiceIT.java | 14 +-
.../usergrid/services/GroupServiceIT.java | 4 +
.../usergrid/services/RolesServiceIT.java | 13 +-
.../usergrid/services/ServiceInvocationIT.java | 15 +-
.../usergrid/services/UsersServiceIT.java | 2 +
.../src/test/resources/log4j.properties | 44 +-
.../test/resources/usergrid-test-context.xml | 50 +-
.../usergrid/cassandra/CassandraResource.java | 1 +
.../org/apache/usergrid/tools/DupOrgRepair.java | 9 +-
256 files changed, 9149 insertions(+), 4302 deletions(-)
----------------------------------------------------------------------