You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/02/26 19:06:45 UTC
[3/8] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By grey (16) and others
# Via grey (8) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (24 commits)
added apache header to editor config
Ignore known failing test
Added fix for entity class and array list casting.
Simplified the setup of some of the tests
Cleanup the imports and add an actual loop in the connection loopback test.
Added todo for final commit for fix.
Revert "Made the styles path relative so they will no longer go to the root and get 401 errors."
Added in a bunch of comments to clarify what was going on in PermissionsResourceIT
Added missing comment to tests in OwnershipResourceIT Added revamped comments and cleaned the tests in ConnectionResourceTest
Finished adding comments for OwnershipResourceIT
Added a comment clearing what the token post method accomplishes. Adding clarifying comments to meVerify, contextualPathOwnership, and contextualConnectionOwnership test.
Fixes and comments while looking over the tests
Cleared up and added some comments to the tests in organizationIt Added comment to one of the methods in AbstractRestIt.
Added comments to configuration options. removed 'root' declaration
Adding editorconfig settings file to help with consistent formatting
Cleanup of imports and spaces. Fixed OrganizationsIT and added comments. Added users to the end of ManagementResource to emulate AdminUser calls. Added put to organizationResource so we can update organizations. Added Additional case to entities that puts any data from a entity into the entity itself. Added ability to get Organization properties without needing to go through dynamic properties. Removed cruft from ClientContext.
fixed null ref issues
finished test
fix resourse test
fixing ownershipResourceIT
...
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/21cdfe1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/21cdfe1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/21cdfe1a
Branch: refs/heads/USERGRID-280
Commit: 21cdfe1a96bad971eba9e8e102e23ef8c4f0d8a7
Parents: 17c439b bcabda2
Author: grey <gr...@apigee.com>
Authored: Mon Jan 12 12:22:58 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Jan 12 12:22:58 2015 -0800
----------------------------------------------------------------------
stack/.editorconfig | 16 +
.../collection/groups/GroupResourceIT.java | 6 +-
.../users/ConnectionResourceTest.java | 282 ++++----
.../collection/users/OwnershipResourceIT.java | 424 ++++++-----
.../collection/users/PermissionsResourceIT.java | 723 +++++++------------
.../rest/management/OrganizationsIT.java | 353 ++++-----
.../test/resource2point0/AbstractRestIT.java | 11 +-
.../rest/test/resource2point0/ClientSetup.java | 1 +
.../rest/test/resource2point0/RestClient.java | 1 -
.../endpoints/TokenResource.java | 2 +-
.../endpoints/mgmt/ManagementResource.java | 4 +
.../endpoints/mgmt/OrganizationResource.java | 13 +
.../endpoints/mgmt/UsersResource.java | 61 ++
.../rest/test/resource2point0/model/Entity.java | 33 +-
.../resource2point0/model/Organization.java | 3 +
.../resource2point0/state/ClientContext.java | 21 -
16 files changed, 954 insertions(+), 1000 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/21cdfe1a/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 1ec767f,f564eab..91dbb16
--- 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
@@@ -41,7 -41,8 +41,8 @@@ import javax.ws.rs.core.MediaType
public class ClientSetup implements TestRule {
RestClient restClient;
- //TODO: store the password as a string here as well
- protected String username, orgName, appName;
++
+ protected String username, password,orgName, appName;
protected Organization organization;
protected Application application;