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/06/11 17:18:39 UTC
[1/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-739 ee0edaedc -> be5ec6711
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/82f7eac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/82f7eac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/82f7eac5
Branch: refs/heads/USERGRID-739
Commit: 82f7eac5d29908c167ce9be0297be19aa9a92c68
Parents: 0a4939b c93a0fc
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 17:34:08 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 17:34:08 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 28 ++++---------------
.../migration/AppInfoMigrationPlugin.java | 14 +++++-----
.../migration/AppInfoMigrationPluginTest.java | 29 +++++++++++++++++---
3 files changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-usergrid git commit: fix appdelete
Posted by sf...@apache.org.
fix appdelete
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/be5ec671
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/be5ec671
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/be5ec671
Branch: refs/heads/USERGRID-739
Commit: be5ec6711fce634b30f27a6cd11e3e54ebca93f0
Parents: 912db99
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 18:57:54 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 18:57:54 2015 -0600
----------------------------------------------------------------------
.../rest/applications/ApplicationDeleteIT.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/be5ec671/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
index 786ab7d..3a6d1c3 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
@@ -24,6 +24,7 @@ import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResponse;
import org.apache.usergrid.rest.test.resource2point0.model.*;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +40,11 @@ public class ApplicationDeleteIT extends AbstractRestIT {
public static final int INDEXING_WAIT = 3000;
+ UUID appid ;
+ @Before
+ public void setup(){
+ appid = UUID.randomUUID();
+ }
/**
* Test most common use cases.
@@ -56,7 +62,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// create app with a collection of "things"
String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + "_appToDelete";
+ String appToDeleteName = clientSetup.getAppName() + appid;
Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
List<Entity> entities = new ArrayList<>();
@@ -193,7 +199,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// create app with a collection of "things"
String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + "_appToDelete";
+ String appToDeleteName = clientSetup.getAppName() + appid;
Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
List<Entity> entities = new ArrayList<>();
@@ -273,7 +279,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// create app with a collection of "things"
String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + "_appToDelete";
+ String appToDeleteName = clientSetup.getAppName() + appid;
Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
List<Entity> entities = new ArrayList<>();
@@ -319,7 +325,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// create app with a collection of "things"
String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + "_appToDelete";
+ String appToDeleteName = clientSetup.getAppName() + appid;
Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
List<Entity> entities = new ArrayList<>();
[2/3] incubator-usergrid git commit: merge
Posted by sf...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/912db999
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/912db999
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/912db999
Branch: refs/heads/USERGRID-739
Commit: 912db99942aa94d696ed79acd10651be97396e23
Parents: 82f7eac ee0edae
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 17:34:33 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 17:34:33 2015 -0600
----------------------------------------------------------------------
.../corepersistence/ApplicationIdCacheImpl.java | 1 +
.../corepersistence/CpRelationManager.java | 23 ++++++++++----------
.../corepersistence/util/CpNamingUtils.java | 12 ++++++++++
.../rest/applications/ApplicationDeleteIT.java | 5 +++--
.../applications/assets/AssetResourceIT.java | 1 +
5 files changed, 29 insertions(+), 13 deletions(-)
----------------------------------------------------------------------