Merge branch 'two-dot-o-dev' into USERGRID-501
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e5eb57fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e5eb57fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e5eb57fd Branch: refs/heads/USERGRID-501 Commit: e5eb57fd80525def86211e7a99cdc71be93a8e5a Parents: 90832ca 66fdc61 Author: Shawn Feldman <[email protected]> Authored: Tue Mar 24 16:37:55 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Mar 24 16:37:55 2015 -0600 ---------------------------------------------------------------------- .../organizations/OrganizationResource.java | 26 +- .../applications/ApplicationResource.java | 44 +- .../applications/imports/ImportsResource.java | 4 - .../java/org/apache/usergrid/rest/BasicIT.java | 302 +-------- .../apache/usergrid/rest/SystemResourceIT.java | 10 +- .../applications/ApplicationResourceIT.java | 2 +- .../collection/CollectionsResourceIT.java | 19 +- .../collection/users/OwnershipResourceIT.java | 4 +- .../collection/users/RetrieveUsersTest.java | 4 +- .../collection/users/UserResourceIT.java | 4 +- .../usergrid/rest/management/AccessTokenIT.java | 418 +++++------- .../usergrid/rest/management/AdminUsersIT.java | 60 +- .../rest/management/ExportResourceIT.java | 652 +++++++------------ .../rest/management/ImportResourceIT.java | 20 +- .../rest/management/OrganizationsIT.java | 16 +- .../organizations/AdminEmailEncodingIT.java | 3 +- .../test/resource2point0/AbstractRestIT.java | 4 +- .../rest/test/resource2point0/ClientSetup.java | 30 +- .../rest/test/resource2point0/RestClient.java | 1 + .../endpoints/NamedResource.java | 112 +++- .../endpoints/SetupResource.java | 6 + .../endpoints/mgmt/ApplicationResource.java | 18 +- .../endpoints/mgmt/ManagementResource.java | 4 + .../endpoints/mgmt/MeResource.java | 32 + .../endpoints/mgmt/PasswordResource.java | 16 - .../endpoints/mgmt/RevokeTokenResource.java | 32 + .../endpoints/mgmt/RevokeTokensResource.java | 33 + .../endpoints/mgmt/TokenResource.java | 25 +- .../endpoints/mgmt/UserResource.java | 8 + .../endpoints/mgmt/UsersResource.java | 15 - 30 files changed, 809 insertions(+), 1115 deletions(-) ----------------------------------------------------------------------
