You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/22 17:54:18 UTC
[12/50] incubator-usergrid git commit: fix setup
fix setup
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/01d491e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/01d491e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/01d491e9
Branch: refs/heads/two-dot-o
Commit: 01d491e9256fb34e118486577851ccb2170b228b
Parents: c3b5222
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 15 19:47:31 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 15 19:47:31 2014 -0700
----------------------------------------------------------------------
.../usergrid/rest/test/resource2point0/ClientSetup.java | 2 +-
.../resource2point0/endpoints/mgmt/ApplicationResource.java | 8 +++-----
.../usergrid/rest/test/resource2point0/model/Token.java | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/01d491e9/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
----------------------------------------------------------------------
diff --git 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
index b115ed8..ea02317 100644
--- 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
@@ -94,7 +94,7 @@ public class ClientSetup implements TestRule {
Token token = restClient.management().token().post(new Token(username,username));
- application = restClient.management().orgs().organization(organization.getName()).app().post(new Application(appName));
+ restClient.management().orgs().organization(organization.getName()).app().post(new Application(appName));
//ApiResponse response = restClient.management().orgs().post( mapOrganization(username,username,username+"@usergrid.com",username,username ) );
System.out.println();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/01d491e9/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
index 12df661..c5339da 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
@@ -39,11 +39,9 @@ public class ApplicationResource extends NamedResource {
super("applications", context, parent);
}
- public Application post(Application application) {
- ApiResponse response = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).post(ApiResponse.class,application);
- Application app = new Application(response);
- return app;
+ public void post(Application application) {
+ getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
+ .accept(MediaType.APPLICATION_JSON).post(application);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/01d491e9/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
index 14c3ea2..fdadc7c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
@@ -29,7 +29,7 @@ public class Token extends Entity{
}
public Token( String username, String password){
- this.put("grant_type","token");
+ this.put("grant_type","password");
this.put("username", username);
this.put("password", password);
}