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/b2f56c86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b2f56c86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b2f56c86 Branch: refs/heads/master Commit: b2f56c86fb2f0f6e8a2efd2c6f0e50069dc7a4ab Parents: 01f1ef0 762394b Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 3 16:27:01 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 3 16:27:01 2013 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/Constants.java | 2 + .../health/HealthEventMessageDelegator.java | 34 +---- .../processors/AutoscalerTopologyReceiver.java | 22 +-- .../src/test/resources/autoscaler-old.drl | 97 ++++++++---- .../src/test/resources/autoscaler.drl | 97 ++++-------- .../controller/topology/TopologyBuilder.java | 14 +- .../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 + .../event/topology/MemberActivatedEvent.java | 10 ++ .../topology/ClusterCreatedEventProcessor.java | 2 +- .../topology/InstanceSpawnedEventProcessor.java | 1 + .../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 +++++ 24 files changed, 482 insertions(+), 285 deletions(-) ----------------------------------------------------------------------
