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/12/16 15:59:45 UTC
[15/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into
two-dot-o-events
Merge branch 'two-dot-o' into two-dot-o-events
Conflicts:
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5c4c24d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5c4c24d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5c4c24d1
Branch: refs/heads/no-source-in-es
Commit: 5c4c24d1a9c558ec59b7171e23e6f4c8ac01a6a5
Parents: a3cfd56 5285f3d
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Nov 4 10:19:03 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Nov 4 10:19:03 2014 -0500
----------------------------------------------------------------------
.../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 | 5 +-
.../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 | 55 ++++++--
.../persistence/index/impl/EsProvider.java | 14 +-
.../impl/EntityConnectionIndexImplTest.java | 14 --
.../persistence/index/impl/EntityIndexTest.java | 36 +++--
.../rest/JacksonCustomMapperProvider.java | 7 +-
.../org/apache/usergrid/rest/RootResource.java | 42 +++++-
.../rest/filters/HealthCheckFilter.java | 68 ----------
.../applications/ApplicationResource.java | 136 +++++++++++++------
stack/rest/src/main/webapp/WEB-INF/web.xml | 10 --
21 files changed, 309 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c4c24d1/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c4c24d1/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c4c24d1/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
index 0205824,534d7a6..266b0f9
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java
@@@ -20,7 -20,7 +20,8 @@@ package org.apache.usergrid.persistence
import java.util.Collection;
+ import org.apache.usergrid.persistence.core.util.Health;
+import org.apache.usergrid.persistence.collection.event.EntityDeleted;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c4c24d1/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 26ab6aa,bb75cc9..ea6c06f
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@@ -60,9 -62,8 +60,10 @@@ import com.netflix.astyanax.connectionp
import com.netflix.astyanax.model.ColumnFamily;
import com.netflix.astyanax.model.CqlResult;
import com.netflix.astyanax.serializers.StringSerializer;
+import org.apache.usergrid.persistence.collection.guice.CollectionTaskExecutor;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
+ import org.apache.usergrid.persistence.core.util.Health;
+import org.apache.usergrid.persistence.core.task.TaskExecutor;
import rx.Observable;
import rx.Subscriber;