GitHub user GERey opened a pull request:
https://github.com/apache/incubator-usergrid/pull/169
Usergrid 280
https://issues.apache.org/jira/browse/USERGRID-280
Also removed tomcat instance lying around in rest tier that is no longer
user.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-usergrid USERGRID-280
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/169.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 #169
----
commit 0f893ffcbf7e6afaab87654cd794a9ba59893227
Author: grey <[email protected]>
Date: 2015-01-08T23:46:41Z
Commented out failures to do tests one at a time.
commit 17c439b21bec1efc77ef0635a7ac135dad78990d
Author: grey <[email protected]>
Date: 2015-01-09T21:35:47Z
Adding some test outlines for admin users tests. Also added in a password
and a non working call in the before that shows we can't get the super user.
commit 21cdfe1a96bad971eba9e8e102e23ef8c4f0d8a7
Author: grey <[email protected]>
Date: 2015-01-12T20:22:58Z
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
commit cbbb8bf8f824b1ab86bdf76eb5c164e9545aa109
Author: grey <[email protected]>
Date: 2015-01-13T00:58:35Z
Added admin user tests and also added in User and Password Resources to
extend the rest test framework.
Added additional string to keep track of the superuserToken.
Added httpBasicAuthFilter so we can login and setup superadmin user.
Added superuser properties to the rest test properties.
commit 0e17c53d7d8e7a8ee30b953a6b183d0f71c03de9
Author: grey <[email protected]>
Date: 2015-01-13T18:01:55Z
did some cleanup on commented out code. Commented back in a couple more of
the tests that need updating.
commit 760a09c7235e529387e3fed96ff5b43cadd25b55
Author: grey <[email protected]>
Date: 2015-02-03T22:33:00Z
Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By Shawn Feldman (13) and others
# Via Rod Simpson (4) and others
* 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (29 commits)
Use example URL instead
fix authentication workflow
fixed double slash bug in data explorer in admin portal
remove lexer
Revert "remove lexer"
remove lexer
compile issue...
add valid notification types
add illegal argument type
add default case to factory
remove sln file
moving files to own dir
push sample
roles/role fix
Working windows phone toasts
added apache lic header
Beginnings of a REST test.
Addition of emf.deleteApplicaton() method and a test for it in
EntityManagerFacotryImplIT.
Addition of deleteIndex() method, improvements to logging and minor
formatting changes.
add initial windows adapter
...
commit ff7b1a4a4e244310152ba698334a6e568b351e9d
Author: grey <[email protected]>
Date: 2015-02-03T23:56:08Z
Fixed another test that uses the superuser token, and added a different
endpoint to facilitate using the superuser token or the default endpoint.
commit 0b5f598fb8f934735aba7a9d52372a47e714911a
Author: grey <[email protected]>
Date: 2015-02-05T15:55:40Z
Added test for user feeds and started testCaseSensitivity test.
commit 06d1560843a7992643a83d114ec7328425227c7c
Author: grey <[email protected]>
Date: 2015-02-26T18:18:24Z
[USERGRID-280] Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By Todd Nine (75) and others
# Via Dave Johnson (31) and others
* 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (283 commits)
Ignoring intermittently failing test
Adding some feedback so you can tell that test is running and not just
hanging.
Tone down the DEBUG and TRACE level logging that we do during tests.
Added fix for full use of virtual keyspaces and for token generation
using the getKeyspace method.
updated collection IT
fix compile issue
Changes to allow us to fix the old tests that are broken because tests
now share the same C* keyspace, and some fixes to the old ApplicationResourceIT.
Removes wait from progress observer, since this is no longer used.
Removed all instances of virtual keyspaces
Revert "Removed extraneous CF. Made the remaining code compile."
Simple REST tests now working again with Tomcat embedded.
Add jackson-xc back in.
Add jackson-xc back in.
Fixes startup order bug.
Removed extraneous CF. Made the remaining code compile.
Moving back to embedded Tomcat instead of Arquillian.
Back off of Arquillian for now.
Effort to use arquillian-suite-extension
Adding some JVM options to help with the OOM PermGen problems, and
removing all tests from except for one (for now)
changes to get REST tests working with Arquillian: - Add setenv.sh to set
memory and debug options for Tomcat - Make Arqillian profile active by default
- Add shutdown hook to stop job service when Usergrid is underplayed
...
Conflicts:
stack/rest/src/test/resources/usergrid-custom-test.properties
commit 635b183618899efcb246093afc4ac1698739e264
Author: grey <[email protected]>
Date: 2015-02-26T22:19:45Z
Added testProperties RTF files.
commit 454cf6195e00763f132e91bff2bf0b76df1e3d01
Author: grey <[email protected]>
Date: 2015-02-27T01:24:21Z
Added additional admin confirmation tests and fixes for the token resource.
commit 88fe906353655252f7788d79ce1d72315626b4c6
Author: grey <[email protected]>
Date: 2015-02-27T19:43:22Z
Added fix for unconfirmedAdminUsersTest
commit 5bdbc297a0bcc9f7c0bb247dc41b99f240a8ced5
Author: grey <[email protected]>
Date: 2015-02-27T19:56:09Z
Added testSystemAdmin needs no confirmation test
commit a43954d11f180ca8d2790c91595593957b63e771
Author: grey <[email protected]>
Date: 2015-02-27T20:26:31Z
[USERGRID-280] Added testTestUserNeedsNoConfirmation, this test currently
does not pass but due to test account issues
commit e5bd3433e368c29b8894a586e27319f81509721f
Author: grey <[email protected]>
Date: 2015-02-27T22:29:59Z
[USERGRID-280]Added a management user put endpoint to the rest test
framework.
Created new ticket and added a test for that ticket .
commit 8585558f313d040c011d0e79ffb860f0254144ef
Author: grey <[email protected]>
Date: 2015-02-28T01:05:23Z
Added reactivate endpoint to users in rest test framework.
Added test to prove that reactivate endpoint still works.
commit f39bc0718f25477a45568832676633a55a517ca6
Author: grey <[email protected]>
Date: 2015-03-02T20:26:04Z
Removed unused catalina rest tomcat.
commit 984b6a6f82e6f23049032792fc8128452117fdd0
Author: grey <[email protected]>
Date: 2015-03-02T20:59:40Z
Added two tests, one ignored due to issue detailed above the test, and
another for checking the passwords.
Added a resetpw resource for rest test framework.
commit 61dcb345f7dbd05c2a3f7d3a81a5a3d10d23f5ba
Author: grey <[email protected]>
Date: 2015-03-03T00:12:53Z
Added some more methods for users and organizations.
Added comments on resetpw viewables not working in test environment.
Cleanup of imports.
Added fixes to remaining tests
commit ec1c94dcecbc75431635a35ab6b9f5a1f487baf3
Author: grey <[email protected]>
Date: 2015-03-03T00:17:50Z
Added comments to tests that didn't have any.
commit 749905fe7a6c353e2ab38723f3089e3af73f65bc
Author: grey <[email protected]>
Date: 2015-03-03T00:21:32Z
Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By Shawn Feldman (15) and Dave Johnson (2)
# Via Shawn Feldman (9) and Dave Johnson (1)
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Removing unnecessary test class and commented out dependencies.
Exclude Codehaus Jackson JAX-RS dependency, plus some better logging &
test improvements.
compilation
fix compilation
indexbuffer: update method names
index message comments
undo change
change config
add batching
Add futures to batch and refresh
Add batch of batches
add batches of batches
removing future, moving around some initialization code
add comments
add blocking queue
Adding metrics to cp
adding index buffer
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
