You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/05/15 03:23:33 UTC
[4/9] incubator-usergrid git commit: fix app info name,
issue with doc id parsing by _
fix app info name, issue with doc id parsing by _
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f5cb7880
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f5cb7880
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f5cb7880
Branch: refs/heads/USERGRID-643
Commit: f5cb7880c672cd01bba95ed97e3c8f7cf7d403eb
Parents: 0d2864a
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue May 12 17:27:12 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue May 12 17:27:12 2015 -0700
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/util/CpNamingUtils.java | 8 ++++----
.../usergrid/persistence/index/impl/IndexingUtils.java | 2 +-
.../usergrid/management/cassandra/ManagementServiceImpl.java | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5cb7880/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 e15efe1..b8d410d 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
@@ -60,11 +60,11 @@ public class CpNamingUtils {
/**
* Information about applications is stored in the management app using these types
*/
- public static final String APPLICATION_INFO = "application-info";
- public static final String APPLICATION_INFOS = "application-infos";
+ public static final String APPLICATION_INFO = "application_info";
+ public static final String APPLICATION_INFOS = "application_infos";
- public static final String DELETED_APPLICATION_INFO = "deleted-application-info";
- public static final String DELETED_APPLICATION_INFOS = "deleted-application-infos";
+ public static final String DELETED_APPLICATION_INFO = "deleted_application_info";
+ public static final String DELETED_APPLICATION_INFOS = "deleted_application_infos";
/**
* The name of the map that holds our entity id->type mapping
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5cb7880/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java
index 800d73b..8b248aa 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java
@@ -35,7 +35,7 @@ public class IndexingUtils {
// These are not allowed in document type names: _ . , | #
public static final String FIELD_SEPERATOR = "__";
- public static final String ID_SEPERATOR = "_";
+ public static final String ID_SEPERATOR = "::";
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5cb7880/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index adb8365..ebc1008 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -540,6 +540,7 @@ public class ManagementServiceImpl implements ManagementService {
organizationEntity = em.create( organizationEntity );
em.addToCollection( organizationEntity, "users", new SimpleEntityRef( User.ENTITY_TYPE, user.getUuid() ) );
+ // em.addToCollection( new SimpleEntityRef( User.ENTITY_TYPE, user.getUuid() ), Schema.COLLECTION_GROUPS, organizationEntity );
writeUserToken( smf.getManagementAppId(), organizationEntity, encryptionService