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/d4a6119f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d4a6119f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d4a6119f Branch: refs/heads/master Commit: d4a6119f97223637d4552a22727fc94a71de670c Parents: 7299b9d a6f4549 Author: Nirmal Fernando <[email protected]> Authored: Mon Dec 2 22:32:11 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Mon Dec 2 22:32:11 2013 +0530 ---------------------------------------------------------------------- .../service/RepositoryInformationService.java | 71 ------- .../src/main/resources/META-INF/services.xml | 19 -- .../stratos/autoscaler/ClusterContext.java | 29 +++ .../algorithm/AutoscaleAlgorithm.java | 32 ++- .../autoscaler/algorithm/OneAfterAnother.java | 27 ++- .../PartitionGroupOneAfterAnother.java | 14 +- .../autoscaler/algorithm/RoundRobin.java | 28 +-- .../autoscaler/api/AutoScalerServiceImpl.java | 66 +++++++ .../cloud/controller/CloudControllerClient.java | 13 +- .../deployment/policy/DeploymentPolicy.java | 9 +- .../event/AverageRequestsInFlightEvent.java | 4 +- .../event/GradientOfRequestsInFlightEvent.java | 4 +- ...SecondDerivativeOfRequestsInFlightEvent.java | 6 +- .../interfaces/AutoScalerServiceInterface.java | 16 ++ .../internal/AutoscalerServerComponent.java | 3 - .../health/HealthEventMessageDelegator.java | 112 ++++++----- .../receiver/health/HealthEventQueue.java | 4 +- .../autoscaler/partition/PartitionManager.java | 9 +- .../autoscaler/rule/ExecutorTaskScheduler.java | 12 +- .../processors/AutoscalerTopologyReceiver.java | 45 ++++- .../topology/processors/TopologyReceiver.java | 1 - .../stratos/autoscaler/util/AutoscalerUtil.java | 4 +- .../stratos/autoscaler/util/ConfUtil.java | 11 +- .../src/main/resources/META-INF/services.xml | 31 +++ .../interfaces/CloudControllerService.java | 2 +- .../statistics/WSO2CEPStatsPublisher.java | 3 +- .../conf/LoadBalancerConfiguration.java | 93 +++++---- .../conf/configurator/CEPConfigurator.java | 35 ++++ .../conf/configurator/JndiConfigurator.java | 76 ++++++++ .../conf/configurator/SynapseConfigurator.java | 185 ++++++++++++++++++ .../TopologyFilterConfigurator.java | 34 ++++ .../load/balancer/conf/util/Constants.java | 2 + .../internal/LoadBalancerServiceComponent.java | 13 ++ .../balancer/test/RoundRobinAlgorithmTest.java | 70 +++++++ .../sample/configuration/loadbalancer1.conf | 18 +- .../sample/configuration/loadbalancer2.conf | 20 +- .../sample/configuration/loadbalancer3.conf | 18 +- .../event/topology/MemberStartedEvent.java | 15 ++ .../FaultMessageEventFormatter.xml | 2 +- .../executionplans/AverageHeathRequest.xml | 2 +- .../executionplans/GradientOfHealthRequest.xml | 2 +- .../src/main/bin/haproxy-extension.sh | 5 +- .../distribution/src/main/assembly/bin.xml | 8 + .../deployment-policies/economy-deployment.xml | 16 +- .../src/main/partitions/partitions.xml | 41 ++++ .../cartridge-agent/ec2/php/cartridge-agent.sh | 2 +- .../src/main/bin/event-subscriber.sh | 2 +- .../event/subscriber/ArtifactListener.java | 15 +- .../subscriber/CartridgeAgentConstants.java | 33 ++++ .../cartridge/agent/event/subscriber/Main.java | 7 +- .../src/main/bin/health-publisher.sh | 2 +- .../agent/health/publisher/HealthPublisher.java | 6 +- .../distribution/src/main/assembly/bin.xml | 11 +- .../distribution/src/main/bin/stratos.bat | 2 +- .../distribution/src/main/bin/stratos.sh | 5 - .../distribution/src/main/conf/jndi.properties | 4 - .../src/main/conf/loadbalancer.conf | 22 ++- .../synapse-configs/default/sequences/main.xml | 29 +-- .../conf/templates/jndi.properties.template | 26 +++ .../pom.xml | 119 ------------ .../resources/RepositoryInformationService.wsdl | 193 ------------------- service-stubs/pom.xml | 1 - tools/stratos-installer/conf/setup.conf | 7 +- tools/stratos-installer/setup.sh | 65 +++++-- tools/stratos-installer/start-servers.sh | 27 +-- 65 files changed, 1137 insertions(+), 671 deletions(-) ----------------------------------------------------------------------
