Merge commit 'refs/pull/469/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/21ba17e4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/21ba17e4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/21ba17e4 Branch: refs/heads/master Commit: 21ba17e4564f927ebacd939c784508f42d06592f Parents: 9491052 445ff5e Author: Michael Russo <[email protected]> Authored: Mon Jan 25 16:04:39 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Mon Jan 25 16:04:39 2016 -0800 ---------------------------------------------------------------------- .../src/main/groovy/configure_usergrid.groovy | 16 +- .../main/resources/usergrid-default.properties | 21 +- .../src/test/resources/usergrid-test.properties | 15 +- .../usergrid/system/ServerEnvironmentProps.java | 27 ++ .../usergrid/persistence/RebuildIndexTest.java | 2 + .../resources/usergrid-standalone.properties | 8 +- .../usergrid/rest/AbstractContextResource.java | 2 +- .../org/apache/usergrid/rest/ApiResponse.java | 72 ++-- .../rest/ServerEnvironmentProperties.java | 22 +- .../apache/usergrid/rest/SwaggerServlet.java | 2 +- .../rest/applications/ServiceResource.java | 4 +- .../notifiers/NotifiersResource.java | 11 +- ...rganizationApplicationNotFoundException.java | 6 +- .../organizations/OrganizationResource.java | 28 +- .../organizations/OrganizationResource.java | 2 +- .../rest/management/RegistrationIT.java | 14 +- .../resources/usergrid-custom-test.properties | 2 +- .../management/AccountCreationProps.java | 131 ++++--- .../usergrid/management/ManagementService.java | 360 +++++++++---------- .../usergrid/management/OrganizationConfig.java | 99 ++--- .../management/OrganizationConfigProps.java | 40 ++- .../usergrid/management/OrganizationInfo.java | 27 +- .../cassandra/ManagementServiceImpl.java | 166 ++++----- .../cassandra/OrganizationConfigPropsImpl.java | 168 ++++++--- .../apache/usergrid/management/EmailFlowIT.java | 17 +- .../management/OrganizationConfigIT.java | 112 +++++- 26 files changed, 792 insertions(+), 582 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/21ba17e4/stack/rest/src/main/java/org/apache/usergrid/rest/ApiResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/21ba17e4/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java ----------------------------------------------------------------------
