You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/07/11 15:35:35 UTC
[25/50] [abbrv] usergrid git commit: Merge branch 'akka-common' into
usergrid-1268-akka-211
Merge branch 'akka-common' into usergrid-1268-akka-211
Conflicts:
stack/corepersistence/collection/src/test/resources/usergrid.properties
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4fb807f8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4fb807f8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4fb807f8
Branch: refs/heads/release-2.1.1
Commit: 4fb807f8149f264d34b51e83e19d7fda64868c14
Parents: 6455120 96ae317
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jun 22 11:26:09 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jun 22 11:26:09 2016 -0400
----------------------------------------------------------------------
.../main/resources/usergrid-default.properties | 7 +-
stack/core/pom.xml | 821 ++++++++++---------
.../corepersistence/CpEntityManager.java | 8 +-
.../corepersistence/CpEntityManagerFactory.java | 25 +-
.../service/ApplicationServiceImpl.java | 8 +-
stack/corepersistence/actorsystem/pom.xml | 99 +++
.../persistence/actorsystem/ActorSystemFig.java | 93 +++
.../actorsystem/ActorSystemManager.java | 39 +
.../actorsystem/ActorSystemManagerImpl.java | 393 +++++++++
.../actorsystem/ActorSystemModule.java | 34 +
.../persistence/actorsystem/ClientActor.java | 205 +++++
.../actorsystem/GuiceActorProducer.java | 46 ++
.../persistence/actorsystem/RouterProducer.java | 49 ++
.../src/main/resources/application.conf | 45 +
.../src/main/resources/cluster-singleton.conf | 25 +
.../actorsystem/ActorServiceServiceTest.java | 57 ++
stack/corepersistence/collection/pom.xml | 22 +
.../collection/EntityCollectionManager.java | 6 -
.../collection/guice/CollectionModule.java | 5 +-
.../EntityCollectionManagerFactoryImpl.java | 5 +
.../impl/EntityCollectionManagerImpl.java | 23 +-
.../mvcc/stage/write/WriteCommit.java | 12 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 12 +-
.../collection/uniquevalues/AkkaFig.java | 116 ---
.../uniquevalues/ClusterSingletonRouter.java | 70 --
.../uniquevalues/GuiceActorProducer.java | 46 --
.../collection/uniquevalues/RequestActor.java | 186 -----
.../uniquevalues/ReservationCache.java | 3 +-
.../uniquevalues/UniqueValueActor.java | 2 +-
.../uniquevalues/UniqueValuesFig.java | 67 ++
.../uniquevalues/UniqueValuesRouter.java | 70 ++
.../uniquevalues/UniqueValuesService.java | 20 +-
.../uniquevalues/UniqueValuesServiceImpl.java | 475 ++---------
.../uniquevalues/UniqueValuesTableImpl.java | 9 +-
.../src/main/resources/application.conf | 28 -
.../src/main/resources/cluster-singleton.conf | 25 -
.../collection/AbstractUniqueValueTest.java | 50 ++
.../collection/EntityCollectionManagerIT.java | 19 +-
.../mvcc/stage/write/WriteUniqueVerifyIT.java | 21 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 48 +-
.../uniquevalues/UniqueValuesServiceTest.java | 38 +-
.../src/test/resources/usergrid.properties | 2 +-
stack/corepersistence/common/pom.xml | 17 +-
.../core/guice/SettingsValidationCluster.java | 18 +
.../core/guice/MigrationManagerRule.java | 18 +
.../guice/SettingsValidationClusterTest.java | 19 +
.../src/test/resources/usergrid-UNIT.properties | 19 +
.../src/test/resources/usergrid.properties | 19 +
stack/corepersistence/model/pom.xml | 16 +
.../persistence/model/entity/EntityMap.java | 18 +
.../persistence/model/util/EntityUtils.java | 18 +
.../persistence/model/util/UUIDGenerator.java | 18 +
.../persistence/model/field/EntityTest.java | 18 +
.../model/util/UUIDGeneratorTest.java | 18 +
stack/corepersistence/pom.xml | 72 ++
stack/corepersistence/queryindex/pom.xml | 18 +-
.../resources/corepersistence-UNIT.properties | 2 +
.../resources/usergrid-custom-test.properties | 7 +-
.../resources/usergrid-rest-deploy-context.xml | 34 +-
59 files changed, 2281 insertions(+), 1402 deletions(-)
----------------------------------------------------------------------