You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/03/30 21:58:06 UTC
[02/50] incubator-usergrid git commit: Merge branch
'USERGRID-361-appdeletetest' into USERGRID-448-appinfofix
Merge branch 'USERGRID-361-appdeletetest' into USERGRID-448-appinfofix
Conflicts:
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationsResource.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/4d8678cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4d8678cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4d8678cf
Branch: refs/heads/two-dot-o-dev
Commit: 4d8678cfdcb95f811bf7fe3b551a28be37ee76d9
Parents: 6791df6 3b91da0
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 4 09:07:56 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 4 09:07:56 2015 -0500
----------------------------------------------------------------------
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 -
.../rest/applications/ApplicationResource.java | 5 +
.../usergrid/rest/test/PropertiesResource.java | 2 +-
.../apache/usergrid/rest/IndexResourceIT.java | 1 +
.../applications/ApplicationDeleteTest.java | 190 +-
.../collection/users/UserResourceIT.java | 2 +-
.../rest/applications/queries/OrderByTest.java | 2 +-
.../usergrid/rest/management/AdminUsersIT.java | 967 ++--
.../rest/test/resource2point0/ClientSetup.java | 14 +-
.../rest/test/resource2point0/RestClient.java | 4 +-
.../resource2point0/TestPropertiesResource.java | 47 +
.../endpoints/ApplicationsResource.java | 34 +-
.../endpoints/mgmt/ApplicationsResource.java | 4 +-
.../endpoints/mgmt/ConfirmResource.java | 46 +
.../endpoints/mgmt/ManagementResponse.java | 63 +
.../endpoints/mgmt/OrgResource.java | 12 +-
.../endpoints/mgmt/OrganizationResource.java | 5 +-
.../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 -
64 files changed, 930 insertions(+), 7094 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d8678cf/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
index 3133f33,269d0eb..4f8002b
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
@@@ -539,11 -544,16 +539,16 @@@ public class ApplicationResource extend
emf.deleteApplication( applicationId );
+ LOG.debug( "ApplicationResource.delete() deleted appId = {} appName = {}",
+ applicationId, app.getName() );
+
ApiResponse response = createApiResponse();
response.setAction( "delete" );
- response.setApplication( services.getApplication() );
- response.setParams( ui.getQueryParameters() );
+ response.setApplication(services.getApplication());
+ response.setParams(ui.getQueryParameters());
+ LOG.debug( "ApplicationResource.delete() sending response ");
+
return new JSONWithPadding( response, callback );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d8678cf/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d8678cf/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationsResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationsResource.java
index f634c06,01f78f2..d06322c
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationsResource.java
@@@ -53,6 -53,7 +53,6 @@@ public class ApplicationsResource exten
logger.info("Response: " + responseString);
return mapper.readValue(
- new StringReader(responseString), OrganizationApplicationResponse.class);
+ new StringReader(responseString), ManagementResponse.class);
}
}
-