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/03/24 16:20:57 UTC
[10/18] git commit: Merge branch 'two-dot-o' of
github.com:usergrid/usergrid into two-dot-o
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/56a2e214
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/56a2e214
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/56a2e214
Branch: refs/heads/hystrix-integration
Commit: 56a2e214d4a529c5f7b908c52d1dc7f4e1c13e99
Parents: 1b5a581 9d6ed41
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Mar 21 15:54:20 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Mar 21 15:54:20 2014 -0700
----------------------------------------------------------------------
.gitignore | 6 +
stack/awscluster/README.md | 31 +-
stack/awscluster/cassandra-cf.json | 315 ---------
stack/awscluster/pom.xml | 6 +-
.../main/dist/init_instance/init_db_server.sh | 54 ++
.../main/dist/init_instance/init_instance.sh | 54 --
.../main/dist/init_instance/init_rest_server.sh | 41 ++
.../dist/init_instance/install_cassandra.sh | 63 +-
stack/awscluster/src/main/dist/update.sh | 16 +
.../src/main/groovy/configure_cassandra.groovy | 2 +-
.../src/main/groovy/configure_portal_new.groovy | 17 +
.../src/main/groovy/configure_usergrid.groovy | 126 ++++
stack/awscluster/ugcluster-cf.json | 647 +++++++++++++++++++
.../serialization/SerializationFig.java | 5 +
...MvccEntitySerializationStrategyImplTest.java | 57 +-
stack/corepersistence/perftest1/pom.xml | 76 +++
.../usergrid/persistence/UsergridBootstrap.java | 303 +++++++++
.../src/main/resources/log4j.properties | 44 ++
.../src/main/resources/project.properties | 1 +
.../main/resources/usergrid-test-context.xml | 39 ++
.../persistence/Usergrid1PerformanceTest.java | 302 +++++++++
.../persistence/UsergridBootstrapTest.java | 56 ++
stack/corepersistence/perftest2/pom.xml | 64 ++
.../main/groovy/perftest2/CreateEntity.groovy | 100 +++
.../persistence/CorePerformanceTest.java | 318 +++++++++
.../index/guice/TestIndexModule.java | 30 +
.../usergrid/persistence/index/IndexFig.java | 8 +-
.../index/impl/EsEntityCollectionIndex.java | 16 +-
.../persistence/index/impl/EsProvider.java | 53 +-
.../index/legacy/EntityManagerFacade.java | 200 ++++++
.../apache/usergrid/utils/EntityBuilder.java | 177 +++++
.../index/impl/CorePerformanceIT.java | 304 +++++++++
.../index/impl/EntityCollectionIndexTest.java | 2 +-
.../persistence/index/legacy/EntityBuilder.java | 177 -----
.../index/legacy/EntityManagerFacade.java | 200 ------
.../src/test/resources/dynamic-test.properties | 2 +-
.../src/test/resources/usergrid-CHOP.properties | 5 +-
.../src/test/resources/usergrid-UNIT.properties | 2 +-
stack/pom.xml | 4 +-
39 files changed, 3054 insertions(+), 869 deletions(-)
----------------------------------------------------------------------