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/03/03 22:03:48 UTC
[20/21] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-422
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-422
# By grey (12) and Rod Simpson (1)
# Via grey (3) and Rod Simpson (1)
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Revert "Merge remote-tracking branch 'gerey/USERGRID-280' into apache_usergrid/two-dot-o"
Removed test properties change, and some formatting. Added test for properties and additionally added to management feed test.
Added comments to tests that didn't have any.
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
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.
Removed unused catalina rest tomcat.
Added reactivate endpoint to users in rest test framework. Added test to prove that reactivate endpoint still works.
[USERGRID-280]Added a management user put endpoint to the rest test framework. Created new ticket and added a test for that ticket .
[USERGRID-280] Added testTestUserNeedsNoConfirmation, this test currently does not pass but due to test account issues
Added testSystemAdmin needs no confirmation test
Added fix for unconfirmedAdminUsersTest
Added additional admin confirmation tests and fixes for the token resource.
Added testProperties RTF files.
Conflicts:
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.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/3004a452
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3004a452
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3004a452
Branch: refs/heads/USERGRID-422
Commit: 3004a452079c2d174a136edb15dacfa926e8043b
Parents: 19e73d6 ebf6e13
Author: grey <gr...@apigee.com>
Authored: Tue Mar 3 12:40:27 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 3 12:40:27 2015 -0800
----------------------------------------------------------------------
stack/rest/catalina_base/bin/setenv.sh | 8 -
stack/rest/catalina_base/conf/server.xml | 144 -
stack/rest/catalina_base/conf/tomcat-users.xml | 36 -
stack/rest/catalina_base/conf/web.xml | 4614 ------------------
.../lib/usergrid-deployment.properties | 113 -
.../webapps/host-manager/META-INF/context.xml | 27 -
.../webapps/host-manager/WEB-INF/jsp/401.jsp | 70 -
.../webapps/host-manager/WEB-INF/jsp/403.jsp | 84 -
.../webapps/host-manager/WEB-INF/jsp/404.jsp | 61 -
.../webapps/host-manager/WEB-INF/web.xml | 144 -
.../webapps/host-manager/images/add.gif | Bin 1037 -> 0 bytes
.../webapps/host-manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
.../webapps/host-manager/images/code.gif | Bin 394 -> 0 bytes
.../webapps/host-manager/images/design.gif | Bin 608 -> 0 bytes
.../webapps/host-manager/images/docs.gif | Bin 261 -> 0 bytes
.../webapps/host-manager/images/fix.gif | Bin 345 -> 0 bytes
.../webapps/host-manager/images/tomcat.gif | Bin 1934 -> 0 bytes
.../webapps/host-manager/images/update.gif | Bin 627 -> 0 bytes
.../webapps/host-manager/images/void.gif | Bin 43 -> 0 bytes
.../webapps/host-manager/index.jsp | 18 -
.../webapps/host-manager/manager.xml | 26 -
.../webapps/manager/META-INF/context.xml | 27 -
.../webapps/manager/WEB-INF/jsp/401.jsp | 79 -
.../webapps/manager/WEB-INF/jsp/403.jsp | 94 -
.../webapps/manager/WEB-INF/jsp/404.jsp | 62 -
.../manager/WEB-INF/jsp/sessionDetail.jsp | 197 -
.../manager/WEB-INF/jsp/sessionsList.jsp | 172 -
.../webapps/manager/WEB-INF/web.xml | 209 -
.../webapps/manager/images/add.gif | Bin 1037 -> 0 bytes
.../webapps/manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
.../webapps/manager/images/code.gif | Bin 394 -> 0 bytes
.../webapps/manager/images/design.gif | Bin 608 -> 0 bytes
.../webapps/manager/images/docs.gif | Bin 261 -> 0 bytes
.../webapps/manager/images/fix.gif | Bin 345 -> 0 bytes
.../webapps/manager/images/tomcat.gif | Bin 2066 -> 0 bytes
.../webapps/manager/images/update.gif | Bin 627 -> 0 bytes
.../webapps/manager/images/void.gif | Bin 43 -> 0 bytes
.../catalina_base/webapps/manager/index.jsp | 18 -
.../catalina_base/webapps/manager/status.xsd | 84 -
.../catalina_base/webapps/manager/xform.xsl | 125 -
stack/rest/catalina_base/webapps/portal | 1 -
.../manager/org/apache/jsp/index_jsp.java | 83 -
.../usergrid/rest/test/PropertiesResource.java | 2 +-
.../usergrid/rest/management/AdminUsersIT.java | 967 ++--
.../rest/test/resource2point0/ClientSetup.java | 14 +-
.../rest/test/resource2point0/RestClient.java | 3 +
.../resource2point0/TestPropertiesResource.java | 47 +
.../endpoints/mgmt/ConfirmResource.java | 46 +
.../endpoints/mgmt/OrgResource.java | 12 +-
.../endpoints/mgmt/ReactivateResource.java | 46 +
.../endpoints/mgmt/ResetResource.java | 42 +
.../endpoints/mgmt/TokenResource.java | 4 +-
.../endpoints/mgmt/UserResource.java | 25 +
.../endpoints/mgmt/UsersResource.java | 7 +
.../resources/usergrid-custom-test.properties | 6 -
55 files changed, 655 insertions(+), 7062 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3004a452/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
index 5394252,f697509..ed7057f
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
@@@ -75,10 -74,9 +75,13 @@@ public class RestClient implements UrlR
return context;
}
+ public SystemResource system() {
+ return new SystemResource(context, this);
+ }
+
+ public TestPropertiesResource testPropertiesResource() {
+ return new TestPropertiesResource( context, this );
+ }
/**
* Get the management resource
*/