usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [38/38] incubator-usergrid git commit: Merge branch 'two-dot-o' into USERGRID-432
Date Wed, 04 Mar 2015 22:39:33 GMT
Merge branch 'two-dot-o' into USERGRID-432


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1c0f4f14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1c0f4f14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1c0f4f14

Branch: refs/heads/USERGRID-432
Commit: 1c0f4f14a5b8e5833ec96c6eadced75b70cf684b
Parents: 0c15e9b c1f5b78
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Mar 4 10:53:39 2015 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Mar 4 10:53:39 2015 -0700

----------------------------------------------------------------------
 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 +-
 .../apache/usergrid/rest/SystemResourceIT.java  |   60 +
 .../usergrid/rest/management/AdminUsersIT.java  |  981 ++--
 .../rest/test/resource2point0/ClientSetup.java  |   31 +-
 .../rest/test/resource2point0/RestClient.java   |   18 +
 .../resource2point0/TestPropertiesResource.java |   47 +
 .../endpoints/DatabaseResource.java             |   39 +
 .../endpoints/SetupResource.java                |   46 +
 .../endpoints/SystemResource.java               |   36 +
 .../endpoints/mgmt/ConfirmResource.java         |   46 +
 .../endpoints/mgmt/FeedResource.java            |   48 +
 .../endpoints/mgmt/OrgResource.java             |   12 +-
 .../endpoints/mgmt/PasswordResource.java        |   61 +
 .../endpoints/mgmt/ReactivateResource.java      |   46 +
 .../endpoints/mgmt/ResetResource.java           |   42 +
 .../endpoints/mgmt/TokenResource.java           |    4 +-
 .../endpoints/mgmt/UserResource.java            |   80 +
 .../endpoints/mgmt/UsersResource.java           |   13 +-
 .../test/resource2point0/model/Credentials.java |    4 +-
 .../resources/usergrid-custom-test.properties   |    6 +
 .../cassandra/ManagementServiceImpl.java        |    7 +-
 63 files changed, 1076 insertions(+), 7049 deletions(-)
----------------------------------------------------------------------



Mime
View raw message