Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7d0cd3be Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7d0cd3be Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7d0cd3be Branch: refs/heads/two-dot-o Commit: 7d0cd3beb69f6f5027c2c62481ad8c33ac941805 Parents: 1b408c1 795874e Author: Shawn Feldman <[email protected]> Authored: Thu Nov 6 08:13:25 2014 -0700 Committer: Shawn Feldman <[email protected]> Committed: Thu Nov 6 08:13:25 2014 -0700 ---------------------------------------------------------------------- .../dist/init_instance/init_graphite_server.sh | 2 + .../main/dist/init_instance/init_rest_server.sh | 2 +- .../main/groovy/configure_elasticsearch.groovy | 2 + .../src/main/groovy/configure_usergrid.groovy | 8 +- stack/awscluster/ugcluster-cf.json | 3 + .../corepersistence/CpEntityManager.java | 12 +- .../corepersistence/CpEntityManagerFactory.java | 30 ++-- .../HybridEntityManagerFactory.java | 10 +- .../usergrid/persistence/EntityManager.java | 6 + .../persistence/EntityManagerFactory.java | 25 ++-- .../cassandra/EntityManagerFactoryImpl.java | 10 +- .../cassandra/EntityManagerImpl.java | 6 + .../collection/EntityCollectionManager.java | 6 +- .../impl/EntityCollectionManagerImpl.java | 7 +- .../collection/EntityCollectionManagerIT.java | 3 +- .../usergrid/persistence/core/util/Health.java | 23 ++++ .../usergrid/persistence/index/EntityIndex.java | 13 +- .../index/impl/EsEntityIndexImpl.java | 58 +++++--- .../index/impl/ElasticSearchResource.java | 2 +- .../impl/EntityConnectionIndexImplTest.java | 14 -- .../persistence/index/impl/EntityIndexTest.java | 34 ++++- .../rest/JacksonCustomMapperProvider.java | 7 +- .../org/apache/usergrid/rest/RootResource.java | 42 +++++- .../rest/filters/HealthCheckFilter.java | 67 --------- .../applications/ApplicationResource.java | 136 +++++++++++++------ stack/rest/src/main/webapp/WEB-INF/web.xml | 10 -- 26 files changed, 308 insertions(+), 230 deletions(-) ----------------------------------------------------------------------
