usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [14/50] git commit: Merge branch 'es-client-changes' into key-row-sharding
Date Thu, 06 Nov 2014 00:15:00 GMT
Merge branch 'es-client-changes' 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/400189e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/400189e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/400189e8

Branch: refs/heads/two-dot-o
Commit: 400189e8d433f1183e86d218ae0e35760565336e
Parents: 4082891 9e4fe98
Author: Todd Nine <tnine@apigee.com>
Authored: Fri Oct 31 17:32:15 2014 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Fri Oct 31 17:32:15 2014 -0600

----------------------------------------------------------------------
 .../dist/init_instance/install_elasticsearch.sh |  10 ++
 .../main/groovy/configure_elasticsearch.groovy  |  44 ++++-
 .../src/main/groovy/configure_usergrid.groovy   |   7 +
 .../main/resources/usergrid-default.properties  |   3 +
 .../corepersistence/CpEntityManagerFactory.java |  20 +++
 .../HybridEntityManagerFactory.java             |  10 ++
 .../persistence/EntityManagerFactory.java       |   4 +
 .../cassandra/EntityManagerFactoryImpl.java     |  10 ++
 .../usergrid/ConcurrentCoreIteratorITSuite.java |   3 +-
 .../org/apache/usergrid/CoreITSetupImpl.java    |   4 +-
 .../java/org/apache/usergrid/CoreITSuite.java   |   5 +-
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   9 +-
 .../collection/EntityCollectionManager.java     |  10 +-
 .../impl/EntityCollectionManagerImpl.java       | 107 ++++++-----
 .../serialization/SerializationFig.java         |   4 -
 .../collection/EntityCollectionManagerIT.java   |  12 ++
 .../persistence/core/test/ITRunner.java         |   3 +
 .../usergrid/persistence/index/EntityIndex.java |  14 +-
 .../usergrid/persistence/index/IndexFig.java    |  12 ++
 .../index/impl/EsEntityIndexImpl.java           | 117 +++++++-----
 .../persistence/index/impl/EsProvider.java      | 127 ++++++-------
 .../index/impl/CorePerformanceIT.java           |   2 +-
 .../index/impl/ElasticSearchResource.java       | 171 ++++++++++++++++++
 .../index/impl/ElasticSearchRule.java           |  50 ------
 .../impl/EntityConnectionIndexImplTest.java     |  27 ++-
 .../persistence/index/impl/EntityIndexTest.java |   5 +-
 .../persistence/index/impl/EsRunner.java        |  51 ++++++
 .../src/test/resources/usergrid-UNIT.properties |   2 +-
 .../src/test/resources/logback-test.xml         |  17 +-
 stack/loadtests/src/test/resources/logback.xml  |   3 +-
 .../apache/usergrid/rest/SwaggerServlet.java    |   5 +-
 .../rest/filters/HealthCheckFilter.java         |  67 +++++++
 stack/rest/src/main/webapp/WEB-INF/web.xml      |  10 ++
 .../java/org/apache/usergrid/rest/ITSetup.java  |   8 +-
 .../org/apache/usergrid/rest/RestITSuite.java   |   4 +-
 .../org/apache/usergrid/ServiceITSetupImpl.java |   1 +
 .../org/apache/usergrid/ServiceITSuite.java     |   3 +-
 stack/test-utils/pom.xml                        |   7 +
 .../org/apache/usergrid/ElasticSearchMain.java  | 107 -----------
 .../apache/usergrid/ElasticSearchResource.java  | 178 -------------------
 40 files changed, 704 insertions(+), 549 deletions(-)
----------------------------------------------------------------------



Mime
View raw message