Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e78b861a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e78b861a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e78b861a Branch: refs/heads/master Commit: e78b861a202036adcb95568ccff11a61d2fe6a65 Parents: 191c4c1 0f41d01 Author: Chamila de Alwis <[email protected]> Authored: Fri Oct 10 20:56:36 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Fri Oct 10 20:56:36 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/cli/GenericRestClient.java | 4 +- .../java/org/apache/stratos/cli/RestClient.java | 35 ++-- .../stratos/cli/RestCommandLineService.java | 190 ++++++++++++++++++- .../apache/stratos/cli/StratosApplication.java | 58 ++---- .../commands/DeployKubernetesGroupCommand.java | 108 +++++++++++ .../commands/DeployKubernetesHostCommand.java | 108 +++++++++++ .../UnDeployKubernetesGroupCommand.java | 78 ++++++++ .../commands/UndeployKubernetesHostCommand.java | 76 ++++++++ .../stratos/cli/utils/CommandLineUtils.java | 20 ++ .../internal/ADCManagementServerComponent.java | 4 +- .../manager/listener/TenantUserRoleCreator.java | 22 +-- .../manager/user/mgt/StratosUserManager.java | 139 +++++++------- .../mgt/exception/UserManagementException.java | 41 ---- .../mgt/exception/UserManagerException.java | 39 ++++ .../stratos/manager/utils/UserRoleCreator.java | 47 ++--- .../rest/endpoint/services/ServiceUtils.java | 84 -------- .../rest/endpoint/services/StratosAdmin.java | 82 ++++++-- 17 files changed, 825 insertions(+), 310 deletions(-) ----------------------------------------------------------------------
