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:27 UTC
[23/50] incubator-usergrid git commit: Ensure that old System App is
still included here, so that it's entities get migrated too.
Ensure that old System App is still included here, so that it's entities get migrated too.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fd43a1d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fd43a1d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fd43a1d1
Branch: refs/heads/two-dot-o-dev
Commit: fd43a1d1d51b075cfa551b9e00a10180232381cc
Parents: f4f17d6
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Mar 13 10:33:05 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Mar 13 10:33:05 2015 -0400
----------------------------------------------------------------------
.../corepersistence/rx/impl/AllApplicationsObservableImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fd43a1d1/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java
index f48b930..7f2b27d 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java
@@ -74,7 +74,9 @@ public class AllApplicationsObservableImpl implements AllApplicationsObservable
//emit our hard coded applications that are used the manage the system first.
//this way consumers can perform whatever work they need to on the root system first
final Observable<ApplicationScope> systemIds = Observable.from(
- Arrays.asList( getApplicationScope( CpNamingUtils.MANAGEMENT_APPLICATION_ID )));
+ Arrays.asList(
+ getApplicationScope( CpNamingUtils.MANAGEMENT_APPLICATION_ID ),
+ getApplicationScope( CpNamingUtils.SYSTEM_APP_ID ))); // still need deprecated system app here
final ApplicationScope appScope = getApplicationScope( CpNamingUtils.MANAGEMENT_APPLICATION_ID );
@@ -87,7 +89,6 @@ public class AllApplicationsObservableImpl implements AllApplicationsObservable
final GraphManager gm = graphManagerFactory.createEdgeManager(appScope);
-
String edgeType = CpNamingUtils.getEdgeTypeFromCollectionName( CpNamingUtils.APPLICATION_INFOS );
Id rootAppId = appScope.getApplication();