Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/11cf2c45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/11cf2c45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/11cf2c45 Branch: refs/heads/master Commit: 11cf2c4516ec6d5c7af84ceeba636f1f2bbc1497 Parents: 9f59b32 e76a759 Author: Melan Nimesh <[email protected]> Authored: Wed Jan 29 15:06:52 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Wed Jan 29 15:06:52 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 1 + .../autoscaler/commands/ASPolicyCommands.java | 54 +++ .../commands/DeploymentPolicyCommands.java | 53 +++ .../autoscaler/commands/PartitionsCommands.java | 53 +++ .../autoscaler/internal/ASBundleActivater.java | 50 +++ .../policy/model/AutoscalePolicy.java | 8 +- .../stratos/cli/RestCommandLineService.java | 351 ++++++++++++++++++- .../apache/stratos/cli/StratosApplication.java | 45 ++- .../stratos/cli/beans/AutoscalePolicy.java | 52 --- .../org/apache/stratos/cli/beans/Cartridge.java | 201 ----------- .../stratos/cli/beans/CartridgeInfoBean.java | 124 ------- .../stratos/cli/beans/DeploymentPolicy.java | 31 -- .../org/apache/stratos/cli/beans/Partition.java | 76 ---- .../apache/stratos/cli/beans/PropertyBean.java | 42 --- .../beans/autoscaler/partition/Partition.java | 76 ++++ .../autoscaler/partition/PartitionGroup.java | 54 +++ .../autoscaler/partition/PropertyBean.java | 42 +++ .../policy/autoscale/AutoscalePolicy.java | 63 ++++ .../policy/autoscale/LoadAverage.java | 32 ++ .../policy/autoscale/LoadThresholds.java | 28 ++ .../policy/autoscale/MemoryConsumption.java | 33 ++ .../policy/autoscale/RequestsInFlight.java | 33 ++ .../policy/deployment/DeploymentPolicy.java | 58 +++ .../stratos/cli/beans/cartridge/Cartridge.java | 201 +++++++++++ .../cli/beans/cartridge/CartridgeInfoBean.java | 124 +++++++ .../stratos/cli/beans/topology/Cluster.java | 170 +++++++++ .../stratos/cli/beans/topology/Member.java | 117 +++++++ .../cli/beans/topology/MemberStatus.java | 5 + .../apache/stratos/cli/beans/topology/Port.java | 43 +++ .../DescribeAutoScalingPolicyCommand.java | 70 ++++ .../cli/commands/DescribeCartridgeCommand.java | 70 ++++ .../DescribeDeploymentPolicyCommand.java | 70 ++++ .../cli/commands/DescribePartitionCommand.java | 70 ++++ .../stratos/cli/commands/ListMemberCommand.java | 136 +++++++ .../apache/stratos/cli/utils/CliConstants.java | 33 ++ .../autoscaler/partition/PartitionGroup.java | 2 +- .../bean/util/converter/PojoConverter.java | 6 +- .../stratos/rest/endpoint/mock/MockContext.java | 2 +- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 15 + .../main/resources/conf/cloud-controller.xml | 2 - 40 files changed, 2128 insertions(+), 568 deletions(-) ----------------------------------------------------------------------
