You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/07/02 00:52:34 UTC
[5/8] incubator-usergrid git commit: change app info name
change app info name
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/10798954
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/10798954
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/10798954
Branch: refs/heads/two-dot-o-dev
Commit: 107989544c0041b1e7b9f578669fd0154f468887
Parents: 3afbc78
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jul 1 10:30:24 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jul 1 10:30:24 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManagerFactory.java | 1 +
.../apache/usergrid/corepersistence/util/CpNamingUtils.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10798954/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 025acbf..048c558 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -266,6 +266,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
Map<String, Object> appInfoMap = new HashMap<String, Object>() {{
put( PROPERTY_NAME, appName );
+ put( "org", organizationName );
}};
Entity appInfo;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/10798954/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
index e8867e1..d5b05a2 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
@@ -72,11 +72,11 @@ public class CpNamingUtils {
/**
* Information about applications is stored in the management app using these types
*/
- public static final String APPLICATION_INFO = "application_map";
- public static final String APPLICATION_INFOS = "application_maps";
+ public static final String APPLICATION_INFO = "org_application";
+ public static final String APPLICATION_INFOS = "org_applications";
- public static final String DELETED_APPLICATION_INFO = "deleted_application";
- public static final String DELETED_APPLICATION_INFOS = "deleted_applications";
+ public static final String DELETED_APPLICATION_INFO = "deleted_org_application";
+ public static final String DELETED_APPLICATION_INFOS = "deleted_org_applications";
/**
* The name of the map that holds our entity id->type mapping