usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [22/27] incubator-usergrid git commit: merge two-o
Date Tue, 03 Mar 2015 00:22:10 GMT
merge two-o


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/41cd7c8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/41cd7c8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/41cd7c8e

Branch: refs/heads/USERGRID-280
Commit: 41cd7c8eb2664ba774f147f4c2fde90ad5d45016
Parents: 05f5251 567db37
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Thu Feb 26 16:23:43 2015 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Thu Feb 26 16:23:43 2015 -0700

----------------------------------------------------------------------
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   3 +-
 .../count/BatchCountParallelismTest.java        |   2 +
 .../apache/usergrid/utils/UUIDUtilsTest.java    |  76 +-
 .../src/test/resources/log4j.properties         |   2 +-
 .../common/src/test/resources/log4j.properties  |   6 +-
 .../graph/src/test/resources/log4j.properties   |   8 +-
 stack/corepersistence/pom.xml                   |   4 +-
 .../src/test/resources/log4j.properties         |   4 +-
 stack/pom.xml                                   |   3 +-
 stack/rest/pom.xml                              |  23 +-
 .../usergrid/rest/JobServiceBoostrap.java       |   5 +-
 .../apache/usergrid/rest/ShutdownListener.java  |   8 +-
 .../applications/ApplicationResourceIT.java     | 881 ++++++++++++-------
 .../collection/BrowserCompatibilityTest.java    |   3 +-
 .../collection/CollectionsResourceIT.java       |   4 +-
 .../collection/DuplicateNameIT.java             |  30 -
 .../collection/users/RetrieveUsersTest.java     |   8 +-
 .../rest/management/ImportResourceIT.java       |   3 +-
 .../organizations/AdminEmailEncodingIT.java     |   9 +-
 .../test/resource2point0/AbstractRestIT.java    |   1 -
 .../endpoints/ApplicationsResource.java         |   5 +
 .../endpoints/TokenResource.java                |  32 +-
 .../endpoints/mgmt/ApplicationResource.java     |   6 +-
 .../endpoints/mgmt/AuthorizeResource.java       |  59 ++
 .../endpoints/mgmt/CredentialsResource.java     |  55 ++
 .../endpoints/mgmt/ManagementResource.java      |   5 +-
 .../endpoints/mgmt/OrgResource.java             |   3 +
 .../endpoints/mgmt/OrganizationResource.java    |  44 +-
 .../endpoints/mgmt/TokenResource.java           |  48 +-
 .../test/resource2point0/model/Credentials.java |  47 +
 .../rest/test/resource2point0/model/Entity.java |   5 +
 .../rest/test/resource2point0/model/Token.java  |  37 +-
 .../management/export/ExportServiceIT.java      |   3 +-
 .../management/importer/ImportCollectionIT.java |   4 +-
 .../management/importer/ImportServiceIT.java    |   3 +-
 .../src/test/resources/log4j.properties         |   4 +-
 36 files changed, 961 insertions(+), 482 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/41cd7c8e/stack/corepersistence/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/41cd7c8e/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
index ed0489b,2c3d9d7..f83beae
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
@@@ -18,14 -18,11 +18,15 @@@ package org.apache.usergrid.rest.applic
  
  
  import java.io.IOException;
++<<<<<<< HEAD
 +
 +import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
  import org.apache.usergrid.rest.test.resource2point0.model.Entity;
  import org.junit.Test;
 -import org.apache.usergrid.rest.AbstractRestIT;
 +
  import org.apache.usergrid.rest.TestContextSetup;
  import org.apache.usergrid.rest.test.resource.CustomCollection;
 +
  import org.apache.usergrid.rest.test.resource2point0.model.Collection;
  import org.apache.usergrid.rest.test.resource2point0.model.Entity;
  import static junit.framework.Assert.assertNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/41cd7c8e/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index 51956df,6dbaf7f..f624b79
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@@ -188,7 -187,6 +187,10 @@@ public class CollectionsResourceIT exte
          Entity calendarlistOne = this.app().collection(collection).post(payload);
          assertEquals(calendarlistOne.get("summaryOverview"), summaryOverview);
          assertEquals(calendarlistOne.get("caltype"), calType);
++<<<<<<< HEAD
 +        String calendarlistOneUUID = calendarlistOne.getAsString("uuid");
++=======
++>>>>>>> 567db37ca03daa621dfde0c29f803b9384da5e7e
          this.refreshIndex();
  
          //post a second entity

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/41cd7c8e/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------


Mime
View raw message