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/03 20:59:23 UTC
[13/50] [abbrv] incubator-usergrid git commit: Anther merge fix.
Anther merge fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1884cce1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1884cce1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1884cce1
Branch: refs/heads/two-dot-o-events
Commit: 1884cce15e299f31c72caa1ae15cc07bf9545dc0
Parents: 2ee0eff
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Nov 24 10:42:55 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Nov 24 10:42:55 2014 -0500
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/GuiceModule.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1884cce1/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
index 98f473a..a57158f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
@@ -65,6 +65,13 @@ public class GuiceModule extends AbstractModule {
install(new MapModule());
install(new QueueModule());
+ bind(ManagerCache.class).to( CpManagerCache.class );
+
+ Multibinder<DataMigration> dataMigrationMultibinder = Multibinder.newSetBinder( binder(), DataMigration.class );
+ dataMigrationMultibinder.addBinding().to( EntityTypeMappingMigration.class );
+ dataMigrationMultibinder.addBinding().to( GraphShardVersionMigration.class );
+ //dataMigrationMultibinder.addBinding().to( EntityDataMigration.class );
+
Multibinder<EntityDeleted> entityBinder =
Multibinder.newSetBinder(binder(), EntityDeleted.class);
entityBinder.addBinding().to(EntityDeletedHandler.class);
@@ -77,10 +84,7 @@ public class GuiceModule extends AbstractModule {
Multibinder.newSetBinder( binder(), EntityVersionCreated.class );
versionCreatedMultibinder.addBinding().to(EntityVersionCreatedHandler.class);
- Multibinder<DataMigration> dataMigrationMultibinder =
- Multibinder.newSetBinder( binder(), DataMigration.class );
- dataMigrationMultibinder.addBinding().to( EntityTypeMappingMigration.class );
- dataMigrationMultibinder.addBinding().to( GraphShardVersionMigration.class );
+
}
}