Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
merging Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6ee528ef Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6ee528ef Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6ee528ef Branch: refs/heads/master Commit: 6ee528efeb695c2501538d0efe0ff374f3589ea6 Parents: 1bf3acf 5eca1c7 Author: Isuru Haththotuwa <[email protected]> Authored: Tue Apr 21 13:06:15 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Apr 21 13:06:15 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 3 +- .../autoscaler/registry/RegistryManager.java | 7 +- .../stratos/cli/CommandLineApplication.java | 33 +- .../apache/stratos/cli/CommandLineService.java | 22 +- .../java/org/apache/stratos/cli/RestClient.java | 18 +- .../stratos/cli/RestCommandLineService.java | 21 +- .../apache/stratos/cli/StratosApplication.java | 3 - .../cli/commands/ActivateTenantCommand.java | 3 + .../commands/AddApplicationPolicyCommand.java | 9 +- .../commands/AddApplicationSignupCommand.java | 2 +- .../commands/AddAutoscalingPolicyCommand.java | 7 +- .../cli/commands/AddCartridgeCommand.java | 7 +- .../commands/AddDeploymentPolicyCommand.java | 7 +- .../commands/AddKubernetesClusterCommand.java | 4 +- .../cli/commands/AddKubernetesHostCommand.java | 4 +- .../commands/AddNetworkPartitionCommand.java | 7 +- .../stratos/cli/commands/AddTenantCommand.java | 7 +- .../stratos/cli/commands/AddUserCommand.java | 18 +- .../cli/commands/CreateApplicationCommand.java | 7 +- .../cli/commands/DeactivateTenantCommand.java | 3 + .../cli/commands/DeleteApplicationCommand.java | 3 + .../DeleteApplicationSignupCommand.java | 3 + .../DeleteAutoScalingPolicyCommand.java | 5 +- .../cli/commands/DeleteTenantCommand.java | 71 ---- .../stratos/cli/commands/DeleteUserCommand.java | 11 +- .../cli/commands/DeployApplicationCommand.java | 10 +- .../commands/DescribeApplicationCommand.java | 3 + .../DescribeApplicationPolicyCommand.java | 5 +- .../DescribeApplicationRuntimeCommand.java | 3 + .../DescribeApplicationSignupCommand.java | 3 + .../DescribeAutoScalingPolicyCommand.java | 5 +- .../cli/commands/DescribeCartridgeCommand.java | 11 +- .../commands/DescribeCartridgeGroupCommand.java | 5 +- .../DescribeDeploymentPolicyCommand.java | 5 +- .../DescribeKubernetesClusterCommand.java | 11 +- .../DescribeKubernetesMasterCommand.java | 6 +- .../DescribeNetworkPartitionCommand.java | 11 +- .../cli/commands/DescribeTenantCommand.java | 16 +- .../stratos/cli/commands/ExitCommand.java | 9 +- .../stratos/cli/commands/HelpCommand.java | 11 +- .../stratos/cli/commands/InfoCommand.java | 11 +- .../ListApplicationPoliciesCommand.java | 6 +- .../cli/commands/ListApplicationsCommand.java | 9 +- .../commands/ListAutoscalePolicyCommand.java | 6 +- .../commands/ListCartridgeGroupsCommand.java | 9 +- .../commands/ListCartridgesByFilterCommand.java | 118 ------ .../cli/commands/ListCartridgesCommand.java | 3 + .../commands/ListDeploymentPoliciesCommand.java | 3 + .../cli/commands/ListDomainMappingsCommand.java | 3 + .../commands/ListKubernetesClustersCommand.java | 5 +- .../commands/ListKubernetesHostsCommand.java | 11 +- .../commands/ListNetworkPartitionCommand.java | 3 + .../ListPartialSearchTenantsCommand.java | 7 +- .../stratos/cli/commands/ListTenants.java | 3 + .../apache/stratos/cli/commands/ListUsers.java | 3 + .../RemoveApplicationPolicyCommand.java | 6 +- .../cli/commands/RemoveCartridgeCommand.java | 3 + .../commands/RemoveCartridgeGroupCommand.java | 2 +- .../commands/RemoveDeploymentPolicyCommand.java | 5 +- .../commands/RemoveKubernetesHostCommand.java | 4 +- .../commands/RemoveNetworkPartitionCommand.java | 5 +- .../commands/SynchronizeArtifactsCommand.java | 13 +- .../commands/UndeployApplicationCommand.java | 2 +- .../UpdateApplicationPolicyCommand.java | 9 +- .../UpdateAutoscalingPolicyCommand.java | 11 +- .../cli/commands/UpdateCartridgeCommand.java | 7 +- .../commands/UpdateDeploymentPolicyCommand.java | 4 +- .../commands/UpdateKubernetesHostCommand.java | 4 +- .../commands/UpdateKubernetesMasterCommand.java | 4 +- .../commands/UpdateNetworkPartitionCommand.java | 7 +- .../cli/commands/UpdateTenantCommand.java | 25 +- .../stratos/cli/commands/UpdateUserCommand.java | 25 +- .../context/CloudControllerContext.java | 6 +- .../main/resources/CloudControllerService.wsdl | 368 +++++++++---------- 74 files changed, 513 insertions(+), 596 deletions(-) ----------------------------------------------------------------------
