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/2e6084c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2e6084c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2e6084c2 Branch: refs/heads/master Commit: 2e6084c20d6da67f4314c976af6a61dbcda77950 Parents: 9c043d5 5bc7f7e Author: Pradeep Fernando <[email protected]> Authored: Tue Jan 14 10:18:45 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Tue Jan 14 10:18:45 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/algorithm/OneAfterAnother.java | 23 +- .../autoscaler/algorithm/RoundRobin.java | 16 +- .../health/AutoscalerHealthStatReceiver.java | 498 ++------------- .../autoscaler/rule/RuleTasksDelegator.java | 3 - .../stratos/cartridge/agent/CartridgeAgent.java | 4 +- .../deployment/partition/Partition.java | 13 +- .../impl/CloudControllerServiceImpl.java | 37 ++ .../cloud/controller/pojo/Cartridge.java | 16 + .../cloud/controller/pojo/CartridgeConfig.java | 20 +- .../controller/pojo/PersistanceMapping.java | 93 +++ .../controller/util/CloudControllerUtil.java | 9 +- .../messaging/domain/topology/Cluster.java | 6 + ...eCleanupClusterNotifierMessageProcessor.java | 55 ++ ...ceCleanupMemberNotifierMessageProcessor.java | 55 ++ ...InstanceCleanupNotifierMessageProcessor.java | 55 -- .../InstanceNotifierMessageProcessorChain.java | 14 +- .../definition/CartridgeDefinitionBean.java | 16 +- .../definition/PersistanceMappingBean.java | 38 ++ .../bean/util/converter/PojoConverter.java | 31 +- .../distribution/src/main/conf/scaling.drl | 7 +- .../distribution/src/main/resources/stratos.sh | 122 ++-- .../distribution/src/main/assembly/bin.xml | 1 + .../distribution/src/main/resources/stratos.sh | 123 ++-- .../distribution/src/main/bin/stratos.sh | 151 ++--- .../modules/distribution/src/bin/stratos.sh | 41 +- .../main/resources/CloudControllerService.wsdl | 601 ++++++++++--------- .../pom.xml | 5 +- tools/puppet/manifests/classes/lb_cartridge.pp | 14 +- tools/puppet/manifests/classes/stratos.pp | 3 +- .../stratos-installer/config/cc/bin/stratos.sh | 121 ++-- 30 files changed, 1081 insertions(+), 1110 deletions(-) ----------------------------------------------------------------------
