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/d57ee15f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d57ee15f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d57ee15f Branch: refs/heads/master Commit: d57ee15fb8d99f6b6dbeb853a3d26d899ae251de Parents: 088236a 94d8f91 Author: Udara Liyanage <[email protected]> Authored: Sun Nov 17 11:12:56 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Sun Nov 17 11:12:56 2013 -0500 ---------------------------------------------------------------------- .../common/topology/TopologyReceiver.java | 44 +++++---- .../extension/api/LoadBalancerExtension.java | 32 +++++-- .../api/LoadBalancerStatsNotifier.java | 10 +- .../broker/heartbeat/TopicHealthChecker.java | 8 +- .../broker/subscribe/TopicSubscriber.java | 26 +++-- .../topology/TopologyEventMessageDelegator.java | 12 ++- .../load-balancer/haproxy-extension/INSTALL.txt | 23 +++++ .../load-balancer/haproxy-extension/README.txt | 26 +++++ .../haproxy-extension/src/main/assembly/bin.xml | 13 ++- .../src/main/bin/haproxy-extension.sh | 24 +++-- .../src/main/conf/log4j.properties | 39 ++++++++ .../stratos/haproxy/extension/CommandUtil.java | 66 +++++++++++++ .../stratos/haproxy/extension/HAProxy.java | 64 ++++--------- .../haproxy/extension/HAProxyConfigWriter.java | 55 +++++------ .../haproxy/extension/HAProxyContext.java | 99 ++++++++++++++++++++ .../haproxy/extension/HAProxyStatsReader.java | 63 +++++++++++++ .../apache/stratos/haproxy/extension/Main.java | 42 +++------ .../src/main/resources/log4j.properties | 37 -------- .../src/main/resources/velocity.properties | 1 - .../src/main/scripts/get-weight.sh | 23 +++++ .../src/main/templates/haproxy.cfg.template | 2 +- .../distribution/src/main/conf/log4j.properties | 3 + .../distribution/src/main/bin/stratos.sh | 4 +- .../distribution/src/main/conf/log4j.properties | 2 + 24 files changed, 528 insertions(+), 190 deletions(-) ----------------------------------------------------------------------
