Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into persistence
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1c2f93c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1c2f93c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1c2f93c3 Branch: refs/heads/master Commit: 1c2f93c391309ce3c45a575ab81c988aad7c9b3d Parents: ba14b09 522db60 Author: Isuru <[email protected]> Authored: Mon Dec 9 21:14:38 2013 +0530 Committer: Isuru <[email protected]> Committed: Mon Dec 9 21:14:38 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 63 ++- .../autoscaler/policy/PolicyManager.java | 10 +- .../autoscaler/registry/RegistryManager.java | 2 +- .../rule/AutoscalerRuleEvaluator.java | 36 +- .../messaging/domain/topology/Cloud.java | 84 ---- .../messaging/domain/topology/Cluster.java | 27 -- .../messaging/domain/topology/Region.java | 79 ---- .../stratos/messaging/domain/topology/Zone.java | 55 --- .../autoscaler/partition/PartitionGroup.java | 2 +- .../policy/deployment/DeploymentPolicy.java | 4 + .../bean/util/converter/PojoConverter.java | 149 +++++- .../rest/endpoint/services/ServiceUtils.java | 84 +++- .../rest/endpoint/services/StratosAdmin.java | 57 ++- .../ec2/load-balancer/start-load-balancer.sh | 70 +++ .../templates/loadbalancer.conf.template | 126 +++++ .../pom.xml | 2 +- .../src/main/resources/AutoScalerService.wsdl | 455 ++++++++++++++++++- 17 files changed, 974 insertions(+), 331 deletions(-) ----------------------------------------------------------------------
