You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@usergrid.apache.org by rodsimpson <gi...@git.apache.org> on 2014/12/20 22:07:18 UTC
[GitHub] incubator-usergrid pull request: Usergrid 302 (NOT READY TO MERGE)
GitHub user rodsimpson opened a pull request:
https://github.com/apache/incubator-usergrid/pull/127
Usergrid 302 (NOT READY TO MERGE)
Updated the new groups tests
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/rodsimpson/incubator-usergrid USERGRID-302
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/127.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #127
----
commit 6a2b28462dddc62ab15074c99a5cb43410e1d63b
Author: grey <gr...@apigee.com>
Date: 2014-12-05T01:19:19Z
Added new basis of rest test framework using cleaner api's to manage the Resources. Currently Added is the bare minimum need for modeling rest tests, but missing is the Jersey integration so that we can send the calls out. Next step is to comment and get the JerseyTest framework working within this testing framework. This is a clean commit before any integration so here is where you would start to build in a different framework. Added license header to all new files.
commit 21b77a753d3d4429dff41aa1cd645348184316c8
Author: grey <gr...@apigee.com>
Date: 2014-12-05T01:19:55Z
Added new basis of rest test framework using cleaner api's to manage the Resources. Currently Added is the bare minimum need for modeling rest tests, but missing is the Jersey integration so that we can send the calls out. Next step is to comment and get the JerseyTest framework working within this testing framework. This is a clean commit before any integration so here is where you would start to build in a different framework. Added license header to all new files.
commit 7f532d29854b898e7c232ff8718ef6950bdff2f4
Author: grey <gr...@apigee.com>
Date: 2014-12-05T19:46:15Z
Added new jersey2 to framework, still not integrated yet.
Added top level comments to what the classes are generally for. Needs to be cleaned up and clarified as time goes on.
commit 35a26da01ef16464d8cd16d0f69a03787307c928
Author: grey <gr...@apigee.com>
Date: 2014-12-05T23:29:45Z
Added the jersey 2 framework to the rest pom for use.
Changed the name of the Client to the RESTClient in order to avoid conflicts with the Client in jersey2
Moved the ManagementResource to its own folder.
Added the WebTarget and Client to the RestClient to start building out jersey2 compatibility.
commit 37e805b37162d349d2e097177b2f98757478438a
Author: grey <gr...@apigee.com>
Date: 2014-12-08T21:44:11Z
Added AbstractRestIT for class compatibility but should probably be merged into the rest client.
Made the DumbClient a test class to check that path building with the new jersey stuff works. ( it does! )
Tore out a lot of old things that were in the AbstractRestIT class.
commit fa4b4ccb2e71aee3e13aff37395104c8df9358ad
Author: grey <gr...@apigee.com>
Date: 2014-12-09T00:03:06Z
Removed all instances of jersey 2 package and code.
commit c19936524c6fdc8a44ebe28017fec4773d6741df
Author: grey <gr...@apigee.com>
Date: 2014-12-09T20:16:55Z
Got paths working for the resource just like they used to work with Jersey 2.
commit 9af4135ae7799f5da11e74314804bacb29637a15
Author: grey <gr...@apigee.com>
Date: 2014-12-10T00:43:54Z
Cleaned up some of the old jersey 2 code. Revamped the separation of concerns for files and added in a WebResource so that the appropriate calls can be made.
commit 7dd658bf4073839ba4e6315dc50444626d218c73
Author: grey <gr...@apigee.com>
Date: 2014-12-10T16:59:37Z
Added ability to create new Organizations.
Added getResource to RootResource as stub.
Added example of path in UrlResource
Reworked to have separate org endpoint and made the Organization Resource be a separate part. that only works on the orange endpoint.
Moved TokenResource to highlight that it is a management endpoint.
commit 7a0c378163488dd310e5c7141b1fb701dec9c6b5
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-10T17:13:18Z
Merge branch 'two-dot-o' into UG-rest-test-framework-overhaul
commit dbc9ea973ef6a8040cfb75c501ddeba9be645305
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-10T19:25:33Z
rat check: add headers
commit fcef6d71f3fdc26b29ef64748ff5e75efaa89521
Author: grey <gr...@apigee.com>
Date: 2014-12-11T18:16:21Z
Organization Changes
added in testContext and AbstractRestIT to handle client setup.
Added in post in to setup owner and organization.
commit 8437af50a449d54caf39a4c05d0f6684af5d6d7e
Author: grey <gr...@apigee.com>
Date: 2014-12-11T18:16:37Z
Merge branch 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into UG-rest-test-framework-overhaul
# By Shawn Feldman (19) and others
# Via Todd Nine (5) and Shawn Feldman (3)
* 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (34 commits)
rat check: add headers
Removed subscribeOnCalls
move method back to entityindex
add caching to indexes
add caching to indexes
add caching to indexes
add observable to refresh
fixed abstract class name
Fix in original value test logic.
fix gcm
fix apns
remove queue manager
add comment
if there is no alias then use the index
fix tests
Ignore two migration tests awaiting fix for USERGRID-268
get indexes for alias
Add enum to prevent mistakes in naming
fix deletes so we remove from all
Ignored awaiting fix for USERGRID-267
...
commit ce26189f317616048949dce9c13d6efd7c1427f8
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-11T20:52:36Z
Merge branch 'two-dot-o' into UG-rest-test-framework-overhaul
commit 2573255a8a3b1d852cb278ce21cc6958354031b2
Author: grey <gr...@apigee.com>
Date: 2014-12-12T16:42:30Z
Used jackson to deserialize organization and response into the dynamic entity properties.
Made collection abstract class for other collections that will use it ( User collections, Roles collections)
commit b030d89c8280607a18e895fdf70d24dd981e9d05
Author: grey <gr...@apigee.com>
Date: 2014-12-12T16:42:41Z
Merge branch 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into UG-rest-test-framework-overhaul
# By Todd Nine
# Via Shawn Feldman (1) and Todd Nine (1)
* 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Fixes TokenServiceIT and bug in ManagementService counter test
Fixes FB test
Fixes OrganizationIT. Suffers from same org->admin bug
Fixes EmailFlowIT and creates utilities for testing.
Fixes Creator test to use unique strings
Fixes ManagementServiceIT
Finished rule for use in tests and completed ExportServiceIT migration to the rule
Updated maven config
Finished first pass in core
commit 39199e75a05018037da72c8530b56c21705fd5e5
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-12T16:47:05Z
apache headers
commit 8bf8dcccc07e39eca6e42d1062ebfa68fbcdffeb
Author: grey <gr...@apigee.com>
Date: 2014-12-12T19:35:06Z
Removed variables and put everything into the dynamic properties.
Made it so that dynamic properties can be queried out to give the organization values.
Added way to get organization specific values out so that we don't get the entire response back.
commit 64d9b8159e65b2b01ac8747fbe87f8552c9e3465
Author: grey <gr...@apigee.com>
Date: 2014-12-12T19:35:13Z
Merge branch 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into UG-rest-test-framework-overhaul
# By Shawn Feldman
# Via Shawn Feldman
* 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
apache headers
commit 4efb625f4f7a832bd6b6f478c7523f34df2919a7
Author: grey <gr...@apigee.com>
Date: 2014-12-13T00:18:15Z
Commented almost all of OrganizationIT to start trying to address one test at a time.
Added field for properties in our Organization model but currently not differentiated from regular properties and organization properties.
Removed some of the cruft from the dumbClientTest class.
Had the organization that gets sent in via post, create another organization object and a user object.
Created User object that is based off of the Entity class so that we can query User specific things that get returned from the ApiResponse.
commit ccc2713d012a24e372c89b84e3bd2a9902d4e718
Author: grey <gr...@apigee.com>
Date: 2014-12-15T15:15:53Z
Created OrgOwner state class to hold the org and owner that get created out of a Organization Resource.
Refactored existing classes to use it.
commit daad5661353ca6c386a6e0edf16f6b19870083cd
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T15:16:01Z
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into UG-rest-test-framework-overhaul
commit dfef0f9b3adde472fc8f1a918e641e44b5e8ba01
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T15:17:09Z
Merge branch 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into UG-rest-test-framework-overhaul
commit 2582aa3344f384f759826b0f36a333ac22adcab0
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T16:31:06Z
add app resource
commit 2983fe5e4665dc91ad3573af394567a22fb853a0
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T18:35:37Z
change org owner to Organization
commit 5bd92165085f171fbd5e1fc30165d8f02e309356
Author: grey <gr...@apigee.com>
Date: 2014-12-15T20:52:13Z
Removed orgOwner and mentions of it.
Added post to token resource.
commit d3b6fcc2225c89a44846a3d9610f89bff9e06677
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T21:40:04Z
added org test; first test passing
commit c7ca54e7af86c22bfbf5da2c64a3555551beb42f
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T21:43:09Z
add token
commit 90b516792060c1ca3a6d600b739a7c3ae05d680c
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T21:51:33Z
add overload for token
commit a4be08576a1a0ad3a2a146a2cdd1e841845ce9d4
Author: Shawn Feldman <sf...@apache.org>
Date: 2014-12-15T23:24:07Z
adding collections resource
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-usergrid pull request: Usergrid 302
Posted by GERey <gi...@git.apache.org>.
Github user GERey commented on the pull request:
https://github.com/apache/incubator-usergrid/pull/127#issuecomment-68013160
Looks good , merged.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-usergrid pull request: Usergrid 302
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-usergrid/pull/127
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---