usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [4/8] git commit: Merge branch 'two-dot-o' into corepersistence-off
Date Wed, 16 Jul 2014 13:54:42 GMT
Merge branch 'two-dot-o' into corepersistence-off

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
	stack/core/src/main/resources/usergrid-core-context.xml
	stack/core/src/test/resources/log4j.properties


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0ef3be0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0ef3be0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0ef3be0d

Branch: refs/heads/two-dot-o
Commit: 0ef3be0dbfb0840fbc2414a25a7b2916561e1e11
Parents: 0dacfa2 71cb9c2
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Thu Jul 10 12:06:05 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Thu Jul 10 12:06:05 2014 -0400

----------------------------------------------------------------------
 .../chop/api/store/amazon/AmazonInstance.java   |   94 -
 .../api/store/amazon/EC2InstanceManager.java    |    5 +-
 chop/check_style.xml                            |   70 +
 .../apache/usergrid/chop/client/ssh/Job.java    |    2 +-
 chop/example/pom.xml                            |   27 +
 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 |   62 +-
 .../apache/usergrid/chop/plugin/ResetMojo.java  |   20 +
 .../apache/usergrid/chop/plugin/RunnerMojo.java |  125 +-
 .../apache/usergrid/chop/plugin/SetupMojo.java  |   50 +-
 .../apache/usergrid/chop/plugin/StartMojo.java  |   18 +-
 .../apache/usergrid/chop/plugin/StatusMojo.java |   94 +
 .../org/apache/usergrid/chop/plugin/Utils.java  |   65 +-
 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   |   21 +-
 .../chop/stack/ICoordinatedCluster.java         |   10 +
 .../apache/usergrid/chop/stack/Instance.java    |   20 +
 .../usergrid/chop/stack/SetupStackSignal.java   |   56 +
 .../usergrid/chop/stack/SetupStackState.java    |  219 ++-
 .../apache/usergrid/chop/stack/ClusterTest.java |  114 ++
 chop/webapp/pom.xml                             |    2 +
 .../usergrid/chop/webapp/ChopUiConfig.java      |    5 +-
 .../usergrid/chop/webapp/ChopUiJettyRunner.java |    1 +
 .../webapp/coordinator/CoordinatorUtils.java    |    5 +-
 .../webapp/coordinator/SetupStackThread.java    |   16 +-
 .../webapp/coordinator/StackCoordinator.java    |   70 +-
 .../chop/webapp/coordinator/StackDestroyer.java |    3 +-
 .../coordinator/rest/DestroyResource.java       |    6 +-
 .../coordinator/rest/PropertiesResource.java    |   90 +-
 .../coordinator/rest/RunManagerResource.java    |   21 +-
 .../webapp/coordinator/rest/SetupResource.java  |   28 +-
 .../webapp/coordinator/rest/StartResource.java  |   18 +-
 .../webapp/coordinator/rest/StatusResource.java |   91 +
 .../webapp/coordinator/rest/UploadResource.java |  117 +-
 .../chop/webapp/dao/ProviderParamsDao.java      |   12 +-
 .../usergrid/chop/webapp/dao/UserDao.java       |   12 +-
 .../elasticsearch/ElasticSearchClient.java      |  112 +-
 .../webapp/elasticsearch/ElasticSearchFig.java  |    8 +
 .../webapp/elasticsearch/ElasticSearchNode.java |  112 ++
 .../ElasticSearchNodeResponse.java              |   72 +
 .../elasticsearch/IElasticSearchClient.java     |   11 +-
 .../service/shiro/CustomShiroWebModule.java     |   12 +-
 .../chop/webapp/service/shiro/ShiroRealm.java   |  135 +-
 .../chop/webapp/service/util/FileUtil.java      |    5 +-
 .../webapp/view/chart/layout/ChartLayout.java   |   12 +-
 .../chop/webapp/view/log/LogLayout.java         |  119 ++
 .../usergrid/chop/webapp/view/main/Login.java   |  114 ++
 .../chop/webapp/view/main/MainView.java         |  158 +-
 .../chop/webapp/view/main/TabSheetManager.java  |    8 +-
 .../chop/webapp/view/module/ModuleLayout.java   |   83 +
 .../webapp/view/module/ModuleListWindow.java    |  114 --
 .../chop/webapp/view/runner/RunnersLayout.java  |   19 +-
 .../chop/webapp/view/user/KeyListLayout.java    |    6 +-
 .../chop/webapp/view/user/UserLayout.java       |  155 +-
 .../chop/webapp/view/user/UserListWindow.java   |   30 +-
 .../chop/webapp/view/util/VaadinServlet.java    |    5 +-
 .../usergrid/chop/webapp/ChopUiTestUtils.java   |    4 +-
 sdks/java/pom.xml                               |    8 +-
 .../main/dist/init_instance/init_rest_server.sh |    2 +-
 .../src/main/groovy/wait_for_instances.groovy   |    2 +-
 stack/awscluster/ugcluster-cf.json              |   25 +-
 .../main/resources/corepersistence.properties   |   45 -
 .../main/resources/usergrid-default.properties  |   25 +
 stack/core/pom.xml                              |   15 -
 .../batch/service/SchedulerServiceImpl.java     |    9 +-
 .../corepersistence/CpEntityDeleteListener.java |   34 +-
 .../CpEntityIndexDeleteListener.java            |   10 +-
 .../corepersistence/CpEntityManager.java        | 1811 ++++++++++++------
 .../corepersistence/CpEntityManagerFactory.java |   34 +-
 .../corepersistence/CpEntityMapUtils.java       |   35 +-
 .../corepersistence/CpRelationManager.java      | 1033 ++++++++--
 .../usergrid/corepersistence/CpSetup.java       |   57 +-
 .../usergrid/corepersistence/GuiceModule.java   |    9 +-
 .../org/apache/usergrid/count/common/Count.java |   12 +-
 .../usergrid/count/common/CountSerDeUtils.java  |   14 +-
 .../java/org/apache/usergrid/mq/Message.java    |   11 +-
 .../main/java/org/apache/usergrid/mq/Queue.java |    9 +-
 .../org/apache/usergrid/mq/QueueResults.java    |   13 +-
 .../java/org/apache/usergrid/mq/QueueSet.java   |    5 +-
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |   12 +-
 .../usergrid/persistence/AbstractEntity.java    |   27 +-
 .../persistence/AggregateCounterSet.java        |   18 +-
 .../usergrid/persistence/CredentialsInfo.java   |   19 +-
 .../org/apache/usergrid/persistence/Entity.java |   10 +-
 .../usergrid/persistence/EntityManager.java     |    3 +
 .../persistence/EntityManagerFactory.java       |    2 +
 .../apache/usergrid/persistence/EntityRef.java  |    1 -
 .../apache/usergrid/persistence/Results.java    |   21 +-
 .../org/apache/usergrid/persistence/Schema.java |   23 +-
 .../cassandra/CassandraPersistenceUtils.java    |   19 +-
 .../cassandra/EntityManagerFactoryImpl.java     |    5 +
 .../cassandra/EntityManagerImpl.java            |   48 +-
 .../persistence/cassandra/IndexUpdate.java      |   10 +-
 .../usergrid/persistence/cassandra/Setup.java   |    4 +
 .../persistence/cassandra/SetupImpl.java        |    1 +
 .../usergrid/persistence/entities/Activity.java |    9 +-
 .../persistence/entities/Application.java       |    6 +-
 .../usergrid/persistence/entities/Asset.java    |    7 +-
 .../usergrid/persistence/entities/Device.java   |    5 +-
 .../usergrid/persistence/entities/Event.java    |    5 +-
 .../usergrid/persistence/entities/Export.java   |    4 +-
 .../usergrid/persistence/entities/Folder.java   |    5 +-
 .../usergrid/persistence/entities/Group.java    |    5 +-
 .../usergrid/persistence/entities/Message.java  |    5 +-
 .../usergrid/persistence/entities/Role.java     |    5 +-
 .../usergrid/persistence/entities/User.java     |    7 +-
 .../org/apache/usergrid/utils/IndexUtils.java   |   20 +-
 .../org/apache/usergrid/utils/JsonUtils.java    |   25 +-
 .../main/resources/usergrid-core-context.xml    |    8 +-
 .../usergrid/ConcurrentCoreTestSuite.java       |    5 +-
 .../java/org/apache/usergrid/CoreTestSuite.java |    5 +-
 .../CpEntityDeleteListenerTest.java             |   37 +-
 .../CpEntityIndexDeleteListenerTest.java        |   36 +-
 .../usergrid/persistence/CollectionIT.java      |    6 +-
 .../apache/usergrid/persistence/CounterIT.java  |   17 +-
 .../persistence/EntityConnectionsIT.java        |   53 +
 .../usergrid/persistence/EntityManagerIT.java   |   25 +
 .../org/apache/usergrid/persistence/GeoIT.java  |   16 +-
 .../cassandra/QueryProcessorTest.java           |    5 +
 .../persistence/entities/SampleEntity.java      |    5 +-
 .../persistence/query/tree/GrammarTreeTest.java |  608 ------
 .../persistence/query/tree/LongLiteralTest.java |   63 -
 .../query/tree/StringLiteralTest.java           |   89 -
 .../apache/usergrid/utils/JsonUtilsTest.java    |    5 +-
 stack/core/src/test/resources/log4j.properties  |   30 +-
 stack/corepersistence/collection/pom.xml        |   35 +-
 .../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      |   48 +-
 .../persistence/collection/guice/Write.java     |   17 +
 .../collection/guice/WriteUpdate.java           |   17 +
 .../impl/EntityCollectionManagerImpl.java       |  196 +-
 .../impl/EntityCollectionManagerSyncImpl.java   |    6 +-
 .../mvcc/changelog/ChangeLogGenerator.java      |    2 +-
 .../collection/mvcc/entity/MvccId.java          |   18 +
 .../collection/mvcc/entity/impl/MvccIdImpl.java |   34 +
 .../mvcc/stage/CollectionIoEvent.java           |    4 +-
 .../mvcc/stage/EntityUpdateEvent.java           |   35 +
 .../mvcc/stage/delete/MarkCommit.java           |   41 +-
 .../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    |   32 +-
 .../persistence/collection/util/RepairUtil.java |  138 ++
 .../collection/EntityCollectionManagerIT.java   |  139 +-
 .../EntityCollectionManagerStressTest.java      |    4 +-
 .../EntityCollectionManagerSyncIT.java          |    6 +-
 .../collection/guice/TestCollectionModule.java  |    9 +-
 .../changelog/ChangeLogGeneratorImplTest.java   |   10 +-
 .../mvcc/stage/AbstractEntityStageTest.java     |    2 +
 .../mvcc/stage/TestEntityGenerator.java         |   16 +
 .../mvcc/stage/delete/MarkCommitTest.java       |   24 +-
 .../collection/mvcc/stage/load/LoadTest.java    |  246 ++-
 .../mvcc/stage/write/WriteStartTest.java        |   11 +-
 .../mvcc/stage/write/WriteUniqueVerifyIT.java   |   18 +-
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |    4 +-
 .../persistence/collection/rx/ParallelTest.java |    2 +-
 ...MvccEntitySerializationStrategyImplTest.java |    7 +-
 .../impl/SerializationComparison.java           |    4 +-
 stack/corepersistence/common/pom.xml            |    8 +-
 .../consistency/AmazonSimpleQueueMessage.java   |   58 -
 .../consistency/AmazonSimpleTimeoutQueue.java   |  192 --
 .../core/consistency/AsyncProcessor.java        |   89 -
 .../core/consistency/AsyncProcessorFactory.java |   37 -
 .../consistency/AsyncProcessorFactoryImpl.java  |   84 -
 .../core/consistency/AsyncProcessorImpl.java    |  191 --
 .../core/consistency/AsynchronousMessage.java   |   36 -
 .../core/consistency/CompleteListener.java      |   32 -
 .../core/consistency/ConsistencyFig.java        |   59 -
 .../core/consistency/DefaultTimeService.java    |   29 -
 .../core/consistency/ErrorListener.java         |   33 -
 .../core/consistency/LocalTimeoutQueue.java     |  120 --
 .../consistency/LocalTimeoutQueueFactory.java   |   42 -
 .../core/consistency/MessageListener.java       |   40 -
 .../consistency/SimpleAsynchronousMessage.java  |   60 -
 .../core/consistency/SubscriberFactory.java     |   33 +
 .../core/consistency/TimeoutQueue.java          |   62 -
 .../core/consistency/TimeoutQueueFactory.java   |   36 -
 .../core/consistency/TimeoutTask.java           |   80 -
 .../persistence/core/guice/CommonModule.java    |   25 +-
 .../core/hystrix/HystrixCassandra.java          |  132 ++
 .../core/hystrix/HystrixObservable.java         |   92 -
 .../persistence/core/rx/ObservableIterator.java |   15 +-
 .../persistence/core/util/ValidationUtils.java  |    5 +-
 .../AmazonSimpleTimeoutQueueTest.java           |  205 --
 .../AsyncProcessorFactoriesTest.java            |  140 --
 .../core/consistency/AsyncProcessorTest.java    |  353 ----
 .../core/consistency/LocalTimeoutQueueTest.java |  189 --
 .../core/consistency/QueueListenerHelper.java   |  150 --
 stack/corepersistence/graph/pom.xml             |   21 +-
 .../usergrid/persistence/graph/GraphFig.java    |   38 +-
 .../persistence/graph/SearchEdgeType.java       |    6 +
 .../graph/exception/GraphRuntimeException.java  |   52 +
 .../graph/guice/CommitLogEdgeSerialization.java |   34 -
 .../persistence/graph/guice/GraphModule.java    |  192 +-
 .../graph/impl/CollectionIndexObserver.java     |    4 +-
 .../persistence/graph/impl/EdgeDeleteEvent.java |   36 -
 .../graph/impl/EdgeDeleteListener.java          |   98 -
 .../persistence/graph/impl/EdgeEvent.java       |   61 -
 .../persistence/graph/impl/EdgeWriteEvent.java  |   36 -
 .../graph/impl/EdgeWriteListener.java           |   62 -
 .../graph/impl/GraphManagerImpl.java            |  345 ++--
 .../persistence/graph/impl/NodeDeleteEvent.java |   40 -
 .../graph/impl/NodeDeleteListener.java          |  344 ----
 .../graph/impl/SimpleSearchEdgeType.java        |   16 +-
 .../graph/impl/SimpleSearchIdType.java          |    4 +-
 .../graph/impl/stage/EdgeDeleteListener.java    |   46 +
 .../impl/stage/EdgeDeleteListenerImpl.java      |   90 +
 .../graph/impl/stage/EdgeDeleteRepairImpl.java  |   27 +-
 .../graph/impl/stage/EdgeMetaRepairImpl.java    |   57 +-
 .../graph/impl/stage/EdgeWriteCompact.java      |   48 -
 .../graph/impl/stage/EdgeWriteCompactImpl.java  |  140 --
 .../graph/impl/stage/NodeDeleteListener.java    |   46 +
 .../impl/stage/NodeDeleteListenerImpl.java      |  339 ++++
 .../impl/EdgeMetadataSerializationImpl.java     |  100 +-
 .../impl/EdgeSerializationImpl.java             |   34 +-
 .../serialization/impl/MergedEdgeReader.java    |   90 -
 .../impl/MergedEdgeReaderImpl.java              |  501 -----
 .../impl/NodeSerializationImpl.java             |    5 +-
 .../shard/EdgeShardCounterSerialization.java    |   63 -
 .../impl/shard/NodeShardAllocation.java         |    4 +-
 .../impl/shard/NodeShardApproximation.java      |    6 +
 .../impl/shard/NodeShardCache.java              |   10 -
 .../serialization/impl/shard/count/Counter.java |  125 ++
 .../shard/count/NodeShardApproximationImpl.java |  207 ++
 .../count/NodeShardCounterSerialization.java    |   48 +
 .../NodeShardCounterSerializationImpl.java      |  139 ++
 .../impl/shard/count/ShardKey.java              |  102 +
 .../impl/EdgeShardCounterSerializationImpl.java |  141 --
 .../shard/impl/NodeShardAllocationImpl.java     |  137 +-
 .../shard/impl/NodeShardApproximationImpl.java  |  158 --
 .../impl/shard/impl/NodeShardCacheImpl.java     |   32 +-
 .../shard/impl/SizebasedEdgeShardStrategy.java  |   16 +-
 .../shard/impl/TimebasedEdgeShardStrategy.java  |   96 -
 .../persistence/graph/GraphManagerIT.java       |  541 ++++--
 .../persistence/graph/GraphManagerLoadTest.java |    2 +-
 .../graph/GraphManagerShardingIT.java           |  189 ++
 .../graph/GraphManagerStressTest.java           |    4 +-
 .../usergrid/persistence/graph/SimpleTest.java  |   82 +
 .../graph/StorageGraphManagerIT.java            |  110 +-
 .../graph/guice/TestGraphModule.java            |    9 +-
 .../graph/impl/EdgeDeleteListenerTest.java      |  220 +--
 .../graph/impl/EdgeWriteListenerTest.java       |  470 -----
 .../graph/impl/NodeDeleteListenerTest.java      |   41 +-
 .../graph/impl/stage/EdgeDeleteRepairTest.java  |   33 +-
 .../graph/impl/stage/EdgeMetaRepairTest.java    |   66 +-
 .../CommitlogSerializationTest.java             |   47 -
 .../EdgeSerializationChopTest.java              |    4 +-
 .../graph/serialization/TestCount.java          |    2 +-
 .../MergedEdgeReaderImplComparatorTest.java     |  254 ---
 .../impl/MergedEdgeReaderTest.java              |  507 -----
 .../impl/shard/CountMinSketchTest.java          |  249 ---
 .../EdgeShardCounterSerializationTest.java      |  148 --
 .../impl/shard/NodeShardAllocationTest.java     |   59 +-
 .../impl/shard/NodeShardApproximationTest.java  |  142 --
 .../shard/count/NodeShardApproximationTest.java |  565 ++++++
 .../NodeShardCounterSerializationTest.java      |  126 ++
 .../graph/test/util/EdgeTestUtils.java          |    4 +-
 stack/corepersistence/model/pom.xml             |    4 -
 .../persistence/model/entity/Entity.java        |    6 +-
 .../persistence/model/field/AbstractField.java  |    3 +
 .../persistence/model/field/ByteArrayField.java |   46 +
 .../model/field/ByteBufferField.java            |   51 -
 .../usergrid/persistence/model/field/Field.java |    7 +
 .../model/field/value/EntityObject.java         |   16 +-
 .../main/groovy/perftest2/CreateEntity.groovy   |    4 +-
 .../persistence/CorePerformanceTest.java        |    2 +-
 stack/corepersistence/pom.xml                   |   28 +-
 stack/corepersistence/queryindex/pom.xml        |   23 +-
 .../index/impl/EntityIndexMapUtils.java         |   30 +-
 .../index/impl/EsEntityIndexImpl.java           |   27 +-
 .../persistence/index/impl/EsProvider.java      |  139 +-
 .../persistence/index/impl/EsQueryVistor.java   |   17 +-
 .../persistence/index/query/EntityRef.java      |   30 -
 .../persistence/index/query/EntityResults.java  |    2 +-
 .../persistence/index/query/Identifier.java     |    3 +-
 .../usergrid/persistence/index/query/Query.java |   23 +-
 .../persistence/index/query/Results.java        |   23 +-
 .../index/query/SimpleEntityRef.java            |  131 --
 .../index/query/tree/StringLiteral.java         |   21 +-
 .../persistence/index/utils/JsonUtils.java      |   24 +-
 .../index/guice/TestIndexModule.java            |    9 +-
 .../index/impl/CorePerformanceIT.java           |    2 +-
 .../index/impl/ElasticSearchTest.java           |   21 +-
 .../persistence/index/impl/EntityIndexTest.java |    4 +
 .../query/tree/StringLiteralTest.java           |   39 +-
 .../src/test/resources/log4j.properties         |    7 +-
 .../src/test/resources/project.properties       |    1 +
 stack/launcher/pom.xml                          |    6 +
 .../java/org/apache/usergrid/launcher/App.java  |   10 +-
 stack/pom.xml                                   |    5 +-
 stack/query-validator/pom.xml                   |    4 +-
 .../query/validator/ApiServerRunner.java        |   20 +-
 stack/rest/pom.xml                              | 1113 ++++++-----
 .../org/apache/usergrid/rest/ApiResponse.java   |   13 +-
 .../rest/JacksonCustomMapperProvider.java       |   21 +-
 .../org/apache/usergrid/rest/RootResource.java  |    4 +-
 .../usergrid/rest/TextToJsonSwapWriter.java     |   17 +-
 .../rest/applications/users/UserResource.java   |    4 +-
 .../usergrid/rest/test/PropertiesResource.java  |    8 +-
 .../usergrid/rest/test/ReindexResource.java     |   77 +
 .../apache/usergrid/rest/AbstractRestIT.java    |  155 +-
 .../java/org/apache/usergrid/rest/BasicIT.java  |   97 +-
 .../java/org/apache/usergrid/rest/ITSetup.java  |   28 +-
 .../apache/usergrid/rest/TestContextSetup.java  |    3 +-
 .../apache/usergrid/rest/TomcatResource.java    |  204 +-
 .../ApplicationRequestCounterIT.java            |   10 +-
 .../applications/ApplicationResourceIT.java     |  142 +-
 .../rest/applications/DevicesResourceIT.java    |   17 +-
 .../applications/assets/AssetResourceIT.java    |   96 +-
 .../collection/BadGrammarQueryTest.java         |    5 +-
 .../collection/BrowserCompatibilityTest.java    |    5 +-
 .../collection/PagingResourceIT.java            |   13 +-
 .../collection/activities/AndOrQueryTest.java   |   15 +-
 .../collection/activities/OrderByTest.java      |   11 +-
 .../activities/PagingEntitiesTest.java          |   15 +-
 .../collection/activities/PutTest.java          |    7 +-
 .../collection/groups/GeoPagingTest.java        |   11 +-
 .../collection/groups/UpdateGroupIT.java        |   16 +-
 .../applications/events/EventsResourceIT.java   |   30 +-
 .../queues/AbstractQueueResourceIT.java         |   14 +-
 .../queues/QueueResourceLong1IT.java            |    3 +-
 .../queues/QueueResourceLong2IT.java            |    3 +-
 .../queues/QueueResourceLong3IT.java            |    7 +-
 .../queues/QueueResourceShortIT.java            |   23 +-
 .../applications/users/ActivityResourceIT.java  |    8 +-
 .../users/CollectionsResourceIT.java            |   48 +-
 .../users/ConnectionResourceTest.java           |   28 +-
 .../applications/users/GroupResourceIT.java     |   64 +-
 .../applications/users/OwnershipResourceIT.java |   11 +-
 .../users/PermissionsResourceIT.java            |  190 +-
 .../applications/users/RetrieveUsersTest.java   |    7 +-
 .../rest/applications/users/UserResourceIT.java |  342 ++--
 .../rest/applications/utils/TestUtils.java      |    2 +-
 .../rest/applications/utils/UserRepo.java       |   27 +-
 .../rest/management/ExportResourceIT.java       |  124 +-
 .../rest/management/ManagementResourceIT.java   |  166 +-
 .../rest/management/RegistrationIT.java         |   35 +-
 .../organizations/AdminEmailEncodingIT.java     |    5 +-
 .../organizations/OrganizationResourceIT.java   |   15 +-
 .../organizations/OrganizationsResourceIT.java  |   71 +-
 .../applications/ApplicationsIT.java            |    5 +-
 .../rest/management/users/MUUserResourceIT.java |   87 +-
 .../UsersOrganizationsResourceIT.java           |   14 +-
 .../rest/test/resource/EntityResource.java      |   15 +-
 .../rest/test/resource/NamedResource.java       |    6 +-
 .../rest/test/resource/SetResource.java         |    5 +-
 .../rest/test/resource/TestContext.java         |    7 +-
 .../rest/test/resource/ValueResource.java       |   43 +-
 .../rest/test/resource/app/Application.java     |    9 +-
 .../rest/test/resource/app/UsersCollection.java |    5 +-
 .../rest/test/resource/app/queue/Queue.java     |   19 +-
 .../app/queue/SubscribersCollection.java        |   11 +-
 .../test/resource/app/queue/Transaction.java    |   13 +-
 .../resource/mgmt/ApplicationsCollection.java   |    5 +-
 .../rest/test/resource/mgmt/Management.java     |   18 +-
 .../resource/mgmt/OrganizationsCollection.java  |    5 +-
 .../rest/test/security/TestAdminUser.java       |   17 +-
 .../rest/test/security/TestAppUser.java         |   15 +-
 .../usergrid/rest/test/security/TestUser.java   |    2 +-
 stack/rest/src/test/resources/log4j.properties  |   41 +-
 .../usergrid/management/ManagementService.java  |    2 +-
 .../cassandra/ManagementServiceImpl.java        |  185 +-
 .../management/export/ExportServiceImpl.java    |   26 +-
 .../usergrid/security/oauth/AccessInfo.java     |   11 +-
 .../security/oauth/ClientCredentialsInfo.java   |    6 +-
 .../providers/PingIdentityProvider.java         |    7 +-
 .../security/shiro/utils/SubjectUtils.java      |    2 +-
 .../services/AbstractCollectionService.java     |    9 +-
 .../services/AbstractConnectionsService.java    |   15 +-
 .../usergrid/services/ServiceManager.java       |    2 +-
 .../users/activities/ActivitiesService.java     |    4 +-
 .../org/apache/usergrid/ServiceApplication.java |   37 +-
 .../org/apache/usergrid/ServiceITSuite.java     |    4 +-
 .../apache/usergrid/management/EmailFlowIT.java |    9 +-
 .../usergrid/management/OrganizationIT.java     |   12 +-
 .../org/apache/usergrid/management/RoleIT.java  |    8 +-
 .../management/cassandra/ExportServiceIT.java   |   35 +-
 .../cassandra/ManagementServiceIT.java          |   17 +
 .../usergrid/services/CollectionServiceIT.java  |   23 +-
 .../usergrid/services/ConnectionsServiceIT.java |   14 +-
 .../usergrid/services/GroupServiceIT.java       |    4 +
 .../usergrid/services/RolesServiceIT.java       |   18 +-
 .../usergrid/services/ServiceInvocationIT.java  |   15 +-
 .../usergrid/services/UsersServiceIT.java       |    2 +
 .../src/test/resources/log4j.properties         |   44 +-
 stack/test-utils/pom.xml                        |  492 +++--
 .../java/org/apache/usergrid/TomcatMain.java    |   55 +
 .../usergrid/cassandra/CassandraResource.java   |    7 +-
 .../apache/usergrid/cassandra/Concurrent.java   |    2 +-
 .../org/apache/usergrid/tools/DupOrgRepair.java |    9 +-
 409 files changed, 12688 insertions(+), 12852 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ef3be0d/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ef3be0d/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ef3be0d/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --cc stack/core/src/main/resources/usergrid-core-context.xml
index 2cb8a88,d8a2258..6ca7244
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@@ -163,19 -163,16 +163,15 @@@
      
      <bean id="mailUtils" class="org.apache.usergrid.utils.MailUtils" />
  
- <!--    
-     <bean id="entityManager" 
-         class="org.apache.usergrid.corepersistence.CpEntityManager" 
-         scope="prototype"/>
- -->
- 
 -    <bean id="entityManager" class="org.apache.usergrid.corepersistence.CpEntityManager"
scope="prototype"/>
 -
 -    <!--<bean id="entityManager"-->
 -        <!--class="org.apache.usergrid.persistence.cassandra.EntityManagerImpl"-->
 -        <!--scope="prototype"/>-->
 +    <bean id="entityManager" 
 +        class="org.apache.usergrid.persistence.cassandra.EntityManagerImpl" 
 +        scope="prototype"/>
 +    <bean id="relationManager" 
 +        class="org.apache.usergrid.persistence.cassandra.RelationManagerImpl" 
 +        scope="prototype"/>
  
 -    <!--<bean id="relationManager"-->
 -        <!--class="org.apache.usergrid.persistence.cassandra.RelationManagerImpl"-->
 -        <!--scope="prototype"/>-->
++<!--    <bean id="entityManager" class="org.apache.usergrid.corepersistence.CpEntityManager"
scope="prototype"/>-->
+ 
      <bean id="traceTagAspect" class="org.apache.usergrid.persistence.cassandra.util.TraceTagAspect"/>
  
      <aop:config>


Mime
View raw message