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/8e58eccc Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8e58eccc Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8e58eccc Branch: refs/heads/master Commit: 8e58eccc07b740eb60d835465fb803fd95cad715 Parents: 9199018 d9ca9e3 Author: Udara Liyanage <[email protected]> Authored: Sat Nov 30 10:27:22 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Sat Nov 30 10:27:22 2013 -0500 ---------------------------------------------------------------------- .../load/balancer/LoadBalancerContext.java | 28 +- .../conf/LoadBalancerConfiguration.java | 1358 ++++-------------- .../load/balancer/conf/domain/Algorithm.java | 49 + .../load/balancer/conf/structure/Node.java | 15 +- .../balancer/conf/structure/NodeBuilder.java | 80 +- .../load/balancer/conf/util/Constants.java | 46 +- .../load/balancer/conf/util/HostContext.java | 161 --- .../conf/util/LoadBalancerConfigUtil.java | 305 ---- .../balancer/conf/util/TenantDomainContext.java | 80 -- .../InvalidConfigurationException.java | 33 + .../internal/LoadBalancerServiceComponent.java | 57 +- .../test/LoadBalancerConfigUtilTest.java | 48 - .../test/LoadBalancerConfigurationTest.java | 179 +-- .../load/balancer/test/NodeBuilderTest.java | 123 -- .../src/test/resources/loadbalancer.conf | 84 -- .../src/test/resources/loadbalancer1.conf | 60 - .../src/test/resources/loadbalancer2.conf | 50 - .../sample/configuration/loadbalancer1.conf | 66 + .../sample/configuration/loadbalancer2.conf | 118 ++ .../sample/configuration/loadbalancer3.conf | 66 + .../load-balancer/haproxy-extension/INSTALL.txt | 16 +- products/load-balancer/README.txt | 19 +- .../distribution/src/main/assembly/bin.xml | 1 + .../distribution/src/main/bin/stratos.bat | 2 +- .../distribution/src/main/bin/stratos.sh | 2 +- .../src/main/conf/loadbalancer.conf | 45 + 26 files changed, 801 insertions(+), 2290 deletions(-) ----------------------------------------------------------------------
