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/07/10 15:37:39 UTC
[33/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-670-two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-670-two-dot-o
# By Dave Johnson (10) and GERey (2)
# Via Dave Johnson (2) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
[USERGRID-613] juryrigged a way to test for lowercase and mixed case values.
POM should be set to 1.0.2 not 1.0.2-SNAPSHOT
Incrementing snapshot version to 1.0.3-SNAPSHOT.
Updating CHANGELOG for 1.0.2 release.
Set correct version for creating RC1.
Updating CHANGELOG and applying USERGRID-358 fixes to LICENSE and NOTICE.
Merge fix to assets test, fix to LocalFileBinaryStore and more sensible logging in REST tests.
Fix for StackOverflow introduced when org support as added to Admin User import/export.
Preparing for 1.0.2 RC 1.
Small fixes to ImportAdmins tool based on results of testing.
[USERGRID-613] Added fix mixed cases in two-dot-o.
Add organization export to ExportAdmins tool and organization import to ImportAdmins tool.
Conflicts:
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/807789aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/807789aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/807789aa
Branch: refs/heads/two-dot-o-import
Commit: 807789aaf667e5b440d00e0933084532bc6d3ec0
Parents: 5905b46 31c1f21
Author: GERey <gr...@apigee.com>
Authored: Wed Jun 10 15:25:44 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Jun 10 15:25:44 2015 -0700
----------------------------------------------------------------------
CHANGELOG | 28 +-
LICENSE | 55 ++-
NOTICE | 13 +-
stack/java-sdk-old/pom.xml | 2 +-
.../org/apache/usergrid/rest/IndexResource.java | 10 +-
.../apache/usergrid/rest/IndexResourceIT.java | 92 +++--
.../applications/assets/AssetResourceIT.java | 13 +-
.../rest/test/resource2point0/ClientSetup.java | 14 +-
.../endpoints/SystemResource.java | 21 +
.../endpoints/mgmt/ApplicationResource.java | 6 +-
stack/rest/src/test/resources/log4j.properties | 6 +
.../usergrid/management/ManagementService.java | 5 +-
.../cassandra/ManagementServiceImpl.java | 49 ++-
.../assets/data/LocalFileBinaryStore.java | 51 +++
stack/tools/pom.xml | 18 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 154 ++++---
.../org/apache/usergrid/tools/ImportAdmins.java | 412 +++++++++----------
.../org/apache/usergrid/tools/ToolBase.java | 10 +-
stack/tools/src/main/resources/log4j.properties | 19 +
.../usergrid/tools/ExportImportAdminsTest.java | 234 +++++++++++
...adata.usergrid-management.1433331614293.json | 85 ++++
...users.usergrid-management.1433331614293.json | 23 ++
22 files changed, 946 insertions(+), 374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/807789aa/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
index 7966d3b,82e7c70..7dc4eb5
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
@@@ -112,16 -116,12 +116,16 @@@ public class ClientSetup implements Tes
organization = restClient.management().orgs().post(new Organization( orgName,username,username+"@usergrid.com",username,username, null ));
+ refreshIndex();
+
restClient.management().token().post(new Token(username,username));
- refreshIndex();
-
- restClient.management().orgs().organization(organization.getName()).app().post(new Application(appName));
+ application = restClient.management().orgs().organization(organization.getName()).app().post(new Application(appName));
+ // application = restClient.management().orgs().organization(organization.getName()).app().get();
+ appUuid = (String)((LinkedHashMap)application.getDynamicProperties().get( "data" )).get( orgName+"/"+appName );
+ refreshIndex();
+
}
public String getUsername(){return username;}