Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5bec5980 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5bec5980 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5bec5980 Branch: refs/heads/master Commit: 5bec59800d7075a2e411a07f7774b915c86d519f Parents: 70c20b3 514a112 Author: Dinithi <[email protected]> Authored: Fri Mar 6 17:47:40 2015 +0530 Committer: Dinithi <[email protected]> Committed: Fri Mar 6 17:47:40 2015 +0530 ---------------------------------------------------------------------- .../algorithms/NetworkPartitionAlgorithm.java | 33 +++ .../networkpartition/AllAtOnceAlgorithm.java | 49 ++++ .../NetworkPartitionAlgorithmContext.java | 51 ++++ .../OneAfterAnotherAlgorithm.java | 58 ++++ .../WeightedOneAfterAnotherAlgorithm.java | 31 +++ .../autoscaler/context/AutoscalerContext.java | 71 ++++- .../internal/AutoscalerServiceComponent.java | 9 + .../monitor/component/ApplicationMonitor.java | 265 +++++++++++++------ .../component/ParentComponentMonitor.java | 15 +- .../policy/deployment/ApplicationPolicy.java | 24 +- ...licationPolicyNetworkPartitionReference.java | 44 --- .../autoscaler/registry/RegistryManager.java | 53 ++++ .../autoscaler/rule/RuleTasksDelegator.java | 6 +- .../services/impl/AutoscalerServiceImpl.java | 9 + .../autoscaler/util/AutoscalerConstants.java | 1 + .../stratos/autoscaler/util/AutoscalerUtil.java | 36 ++- .../impl/CloudControllerServiceUtil.java | 4 +- .../deployment/ApplicationPolicyBean.java | 42 ++- .../common/constants/StratosConstants.java | 9 +- .../util/converter/ObjectConverter.java | 78 +++--- .../application-policy-1.json | 15 ++ .../application-policy-2.json | 21 +- .../application-policy.json | 9 - .../scripts/common/deploy.sh | 2 +- .../complex-app/scripts/common/deploy.sh | 2 +- .../sample-cartridges/scripts/common/deploy.sh | 8 +- .../sample-groups/scripts/common/deploy.sh | 2 +- .../scripts/common/deploy.sh | 2 +- .../group-cartridges/scripts/common/deploy.sh | 2 +- .../group-scaling-v1/scripts/common/deploy.sh | 2 +- .../group-scaling/scripts/common/deploy.sh | 2 +- .../more-complex-app/scripts/common/deploy.sh | 2 +- .../nested-group/scripts/common/deploy.sh | 2 +- .../single-cartridge/scripts/common/deploy.sh | 2 +- .../scripts/common/deploy.sh | 2 +- .../scripts/common/deploy.sh | 2 +- .../single-group-v1/scripts/common/deploy.sh | 2 +- .../single-group-v2/scripts/common/deploy.sh | 2 +- .../single-group-v3/scripts/common/deploy.sh | 2 +- .../tomcat/scripts/common/deploy.sh | 2 +- .../tomcat/scripts/common/undeploy.sh | 4 +- .../scripts/common/deploy.sh | 2 +- .../scripts/common/deploy.sh | 2 +- .../wordpress/scripts/common/deploy.sh | 2 +- .../src/main/resources/AutoscalerService.wsdl | 256 +++++++++--------- 45 files changed, 858 insertions(+), 381 deletions(-) ----------------------------------------------------------------------
