usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [48/50] git commit: Merge remote-tracking branch 'origin/two-dot-o' into key-row-sharding
Date Thu, 06 Nov 2014 00:15:34 GMT
Merge remote-tracking branch 'origin/two-dot-o' into key-row-sharding

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
	stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
	stack/rest/src/main/java/org/apache/usergrid/rest/filters/HealthCheckFilter.java
	stack/rest/src/main/webapp/WEB-INF/web.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/30dad61a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/30dad61a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/30dad61a

Branch: refs/heads/two-dot-o
Commit: 30dad61a33b3beb7b0ebd1e283d4c0590539778d
Parents: c3f01dc 5285f3d
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Nov 5 09:29:09 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Nov 5 09:29:09 2014 -0700

----------------------------------------------------------------------
 .../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           |  57 +++++---
 .../impl/EntityConnectionIndexImplTest.java     |  14 --
 .../persistence/index/impl/EntityIndexTest.java |  32 ++++-
 .../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 --
 20 files changed, 291 insertions(+), 225 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 609a987,515eb09..d968bc0
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -53,9 -53,9 +53,10 @@@ import org.apache.usergrid.persistence.
  import org.apache.usergrid.persistence.collection.EntityCollectionManager;
  import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
  import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
 +import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
  import org.apache.usergrid.persistence.core.scope.ApplicationScope;
  import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
+ import org.apache.usergrid.persistence.core.util.Health;
  import org.apache.usergrid.persistence.entities.Application;
  import org.apache.usergrid.persistence.exceptions.ApplicationAlreadyExistsException;
  import org.apache.usergrid.persistence.graph.Edge;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30dad61a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
index 465c518,43364e8..3f1d329
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
@@@ -58,6 -59,7 +58,7 @@@ import com.fasterxml.jackson.core.type.
  import com.fasterxml.jackson.databind.ObjectMapper;
  import com.google.common.collect.Maps;
  import com.google.inject.Inject;
 -import org.apache.usergrid.persistence.core.util.Health;
++import java.util.ArrayList;
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;


Mime
View raw message