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/32796ae0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/32796ae0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/32796ae0 Branch: refs/heads/master Commit: 32796ae0e9afd292978afb1c5d0a80577f73903f Parents: 702508c c7f24b5 Author: Udara Liyanage <[email protected]> Authored: Tue Jan 28 09:13:34 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Jan 28 09:13:34 2014 -0500 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 104 ++++++++-- .../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/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 | 31 +++ .../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 ++++ .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 15 ++ 22 files changed, 1104 insertions(+), 539 deletions(-) ----------------------------------------------------------------------
