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/a6f45491 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a6f45491 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a6f45491 Branch: refs/heads/master Commit: a6f4549145de7771a37f2964f434eb87efad89d2 Parents: a754a64 7ce9569 Author: Udara Liyanage <[email protected]> Authored: Mon Dec 2 22:09:04 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Dec 2 22:09:04 2013 -0500 ---------------------------------------------------------------------- .../statistics/WSO2CEPStatsPublisher.java | 3 +- .../conf/LoadBalancerConfiguration.java | 93 ++++++---- .../load/balancer/conf/SynapseConfigurator.java | 184 ------------------ .../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 | 12 +- .../sample/configuration/loadbalancer1.conf | 16 +- .../sample/configuration/loadbalancer2.conf | 18 +- .../sample/configuration/loadbalancer3.conf | 16 +- .../FaultMessageEventFormatter.xml | 2 +- .../executionplans/AverageHeathRequest.xml | 2 +- .../executionplans/GradientOfHealthRequest.xml | 2 +- .../src/main/bin/haproxy-extension.sh | 5 +- .../cartridge-agent/ec2/php/cartridge-agent.sh | 2 +- .../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 ++- .../conf/templates/jndi.properties.template | 26 +++ tools/stratos-installer/conf/setup.conf | 7 +- tools/stratos-installer/setup.sh | 65 +++++-- tools/stratos-installer/start-servers.sh | 27 +-- 28 files changed, 576 insertions(+), 288 deletions(-) ----------------------------------------------------------------------
