Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dda2bbe5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dda2bbe5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dda2bbe5 Branch: refs/heads/master Commit: dda2bbe5b476e88d9fd40c750f89ca3824990749 Parents: 6c85bb9 ae1b2f6 Author: Dakshika Jayathilaka <[email protected]> Authored: Wed Apr 22 09:09:33 2015 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Wed Apr 22 09:09:33 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.account.mgt/pom.xml | 15 +- .../org.apache.stratos.activation/pom.xml | 15 +- .../parser/DefaultApplicationParser.java | 3 +- .../autoscaler/registry/RegistryManager.java | 7 +- .../autoscaler/services/AutoscalerService.java | 2 +- .../services/impl/AutoscalerServiceImpl.java | 13 +- components/org.apache.stratos.cli/pom.xml | 501 ++++++++++--------- .../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 +- .../common/client/AutoscalerServiceClient.java | 4 +- .../org.apache.stratos.deployment/pom.xml | 13 +- .../org.apache.stratos.email.sender/pom.xml | 5 +- .../org.apache.stratos.keystore.mgt/pom.xml | 15 +- .../org.apache.stratos.manager.styles/pom.xml | 15 +- .../topology/locking/TopologyLockHierarchy.java | 8 +- .../topology/updater/TopologyUpdater.java | 8 +- .../receiver/topology/TopologyManager.java | 10 +- .../org.apache.stratos.metadata.client/pom.xml | 2 +- .../pom.xml | 11 +- .../rest/endpoint/api/StratosApiV40Utils.java | 2 +- .../rest/endpoint/api/StratosApiV41.java | 250 ++++++--- .../rest/endpoint/api/StratosApiV41Utils.java | 33 +- .../pom.xml | 30 +- .../org.apache.stratos.tenant.activity/pom.xml | 5 +- .../pom.xml | 17 +- .../org.apache.stratos.validate.domain/pom.xml | 9 +- .../src/main/resources/AutoscalerService.wsdl | 374 +++++++------- .../main/resources/CloudControllerService.wsdl | 368 +++++++------- 97 files changed, 1274 insertions(+), 1192 deletions(-) ----------------------------------------------------------------------
