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/04/07 22:22:00 UTC
[09/28] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into binary_serialization
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization
# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
Changes to get non-embedded ElasticSearch working.
Minor refactoring to allow legacy EntityManager to be used outside of tests.
Adding support for REST instance.
Adding support for REST instance.
Remove redundant copy of aws-cluster module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ccdf99a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ccdf99a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ccdf99a2
Branch: refs/heads/two-dot-o
Commit: ccdf99a259c33849c6f8739e806abf9071e14e62
Parents: 596147a 6979ae6
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 14:29:14 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 14:29:14 2014 -0700
----------------------------------------------------------------------
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 +
stack/corepersistence/priamcluster/README.md | 83 ---
stack/corepersistence/priamcluster/assembly.xml | 29 -
.../priamcluster/aws-sample.properties | 2 -
.../priamcluster/cassandra-cf.json | 315 ---------
stack/corepersistence/priamcluster/pom.xml | 139 ----
.../src/main/dist/conf/Priam.properties | 21 -
.../src/main/dist/init_instance/create_raid0.sh | 32 -
.../main/dist/init_instance/init_instance.sh | 54 --
.../dist/init_instance/install_cassandra.sh | 56 --
.../dist/init_instance/install_elasticsearch.sh | 24 -
.../dist/init_instance/install_oraclejdk.sh | 31 -
.../src/main/dist/lib/priam-agent-1.2.24.jar | Bin 33020 -> 0 bytes
.../dist/lib/priam-cass-extensions-1.2.24.jar | Bin 5478 -> 0 bytes
.../src/main/dist/webapps/priam-web-1.2.24.war | Bin 31272443 -> 0 bytes
.../src/main/groovy/configure_cassandra.groovy | 113 ----
.../main/groovy/configure_elasticsearch.groovy | 47 --
.../src/main/groovy/configure_priam.groovy | 41 --
.../src/main/groovy/registry_clear.groovy | 20 -
.../src/main/groovy/registry_list.groovy | 24 -
.../src/main/groovy/registry_register.groovy | 38 --
.../src/main/groovy/tag_instance.groovy | 28 -
.../src/main/groovy/wait_for_instances.groovy | 44 --
.../usergrid/persistence/index/IndexFig.java | 8 +-
.../index/impl/EsEntityCollectionIndex.java | 3 +-
.../persistence/index/impl/EsProvider.java | 53 +-
.../index/legacy/EntityManagerFacade.java | 200 ++++++
.../apache/usergrid/utils/EntityBuilder.java | 177 +++++
.../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 +-
45 files changed, 1360 insertions(+), 1956 deletions(-)
----------------------------------------------------------------------