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/c481e02a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c481e02a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c481e02a Branch: refs/heads/master Commit: c481e02ac44288420c24bf8765987bcbe44c2ae2 Parents: 9df597b 2156741 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 18 15:35:37 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 18 15:35:37 2013 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 9 +- .../service/ApplicationManagementService.java | 35 +--- .../utils/CartridgeSubscriptionUtils.java | 34 ++++ .../org/apache/stratos/cli/AutoscalePolicy.java | 52 ----- .../java/org/apache/stratos/cli/Cartridge.java | 201 ------------------- .../apache/stratos/cli/CartridgeInfoBean.java | 124 ------------ .../apache/stratos/cli/DeploymentPolicy.java | 31 --- .../java/org/apache/stratos/cli/Partition.java | 76 ------- .../org/apache/stratos/cli/PropertyBean.java | 42 ---- .../stratos/cli/RestCommandLineService.java | 1 + .../apache/stratos/cli/StratosApplication.java | 7 +- .../apache/stratos/cli/SubscriptionInfo.java | 44 ---- .../org/apache/stratos/cli/TenantInfoBean.java | 85 -------- .../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 ++++ .../stratos/cli/beans/SubscriptionInfo.java | 44 ++++ .../stratos/cli/beans/TenantInfoBean.java | 85 ++++++++ .../balancer/LoadBalancerTenantReceiver.java | 37 +++- .../conf/configurator/SynapseConfigurator.java | 6 +- .../TopologyFilterConfigurator.java | 27 ++- .../internal/LoadBalancerServiceComponent.java | 15 ++ .../src/main/conf/cartridge-config.properties | 5 +- 26 files changed, 780 insertions(+), 706 deletions(-) ----------------------------------------------------------------------
