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/b1999c5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b1999c5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b1999c5d Branch: refs/heads/master Commit: b1999c5de5278733ad974ea1144d5f8e7593b663 Parents: 6af5fef 7701b25 Author: Nirmal Fernando <[email protected]> Authored: Tue Dec 3 18:45:09 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Dec 3 18:45:09 2013 +0530 ---------------------------------------------------------------------- .../health/HealthEventMessageDelegator.java | 5 +- .../controller/topology/TopologyBuilder.java | 11 +- .../load/balancer/LoadBalancerContext.java | 12 +- .../balancer/LoadBalancerTopologyReceiver.java | 24 +-- .../conf/LoadBalancerConfiguration.java | 30 +++- .../test/LoadBalancerConfigurationTest.java | 150 ++++++++++++++++--- .../sample/configuration/loadbalancer1.conf | 8 +- .../sample/configuration/loadbalancer2.conf | 10 +- .../sample/configuration/loadbalancer3.conf | 8 +- .../messaging/domain/topology/Cluster.java | 19 ++- .../messaging/domain/topology/Topology.java | 3 + .../topology/ClusterCreatedEventProcessor.java | 2 +- .../FaultMessageEventFormatter.xml | 2 +- .../haproxy/extension/HAProxyConfigWriter.java | 29 ++-- .../git/impl/GitBasedArtifactRepository.java | 136 +++++++++-------- .../event/subscriber/ArtifactListener.java | 6 +- .../cartridge/agent/event/subscriber/Main.java | 13 +- .../subscriber/RepositoryFileListener.java | 38 +++++ .../src/main/conf/loadbalancer.conf | 43 ++++++ tools/stratos-installer/conf/setup.conf | 14 ++ .../config/cep/repository/conf/jndi.properties | 13 ++ tools/stratos-installer/setup.sh | 67 ++++++++- tools/stratos-installer/start-servers.sh | 15 +- 23 files changed, 504 insertions(+), 154 deletions(-) ----------------------------------------------------------------------
