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 2015/03/30 21:58:17 UTC
[13/50] incubator-usergrid git commit: Merge branch 'USERGRID-405'
into USERGRID-448-appinfofix
Merge branch 'USERGRID-405' into USERGRID-448-appinfofix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07f1f62a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07f1f62a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07f1f62a
Branch: refs/heads/two-dot-o-dev
Commit: 07f1f62afe1b4869395710c29328d73cdbd4bc3c
Parents: a4bdc1f 1eca271
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Mar 10 09:40:50 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Mar 10 09:40:50 2015 -0400
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 34 +-------
.../persistence/EntityManagerFactory.java | 20 -----
.../cassandra/EntityManagerFactoryImpl.java | 23 -----
.../data/DataMigrationManagerImplTest.java | 34 ++++++--
.../apache/usergrid/rest/MigrateResource.java | 90 ++++++++++++++------
5 files changed, 95 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07f1f62a/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 4e22b12,c58cd5e..78f2095
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -115,14 -131,8 +115,13 @@@ public class CpEntityManagerFactory imp
this.counterUtils = counterUtils;
this.injector = injector;
this.managerCache = injector.getInstance( ManagerCache.class );
- this.dataMigrationManager = injector.getInstance( DataMigrationManager.class );
this.metricsFactory = injector.getInstance( MetricsFactory.class );
+ // can be removed after everybody moves to Usergrid 2.0, default is true
+ Properties configProps = cassandraService.getProperties();
+ if ( configProps.getProperty("usergrid.twodoto.appinfo.migration", "true").equals("true")) {
+ migrateOldAppInfos();
+ }
this.orgApplicationCache = new OrgApplicationCacheImpl( this );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07f1f62a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07f1f62a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------