You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/11/11 09:38:40 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/435a87cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/435a87cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/435a87cb
Branch: refs/heads/master
Commit: 435a87cb45f5bb242901341e5988802b34c61f9d
Parents: 94b6a16 8072e14
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Nov 11 14:08:31 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Nov 11 14:08:31 2013 +0530
----------------------------------------------------------------------
.../controller/axiom/AxiomXpathParser.java | 59 +-
.../impl/CloudControllerServiceImpl.java | 2 +-
.../controller/topology/TopologyBuilder.java | 3 +
.../util/CloudControllerConstants.java | 6 +-
.../extension/api/LoadBalancerExtension.java | 7 +-
.../conf/LoadBalancerConfiguration.java | 1202 ++++++++++++++++++
.../load/balancer/conf/structure/Node.java | 356 ++++++
.../balancer/conf/structure/NodeBuilder.java | 140 ++
.../load/balancer/conf/util/Constants.java | 50 +
.../load/balancer/conf/util/HostContext.java | 161 +++
.../conf/util/LoadBalancerConfigUtil.java | 305 +++++
.../balancer/conf/util/TenantDomainContext.java | 80 ++
.../test/LoadBalancerConfigUtilTest.java | 48 +
.../test/LoadBalancerConfigurationTest.java | 169 +++
.../load/balancer/test/NodeBuilderTest.java | 123 ++
.../src/test/resources/loadbalancer.conf | 84 ++
.../src/test/resources/loadbalancer1.conf | 60 +
.../src/test/resources/loadbalancer2.conf | 50 +
.../src/test/resources/testng.xml | 29 +
.../messaging/domain/topology/Partition.java | 6 +-
.../messaging/domain/topology/Scope.java | 26 +
.../messaging/domain/topology/Topology.java | 4 +
.../event/topology/PartitionCreatedEvent.java | 10 +-
.../event/topology/PartitionUpdatedEvent.java | 10 +-
.../event/topology/ServiceCreatedEvent.java | 2 +
.../CompleteTopologyEventIgnoreProcessor.java | 58 +
.../topology/TopologyEventProcessorChain.java | 2 +
.../load-balancer/haproxy-extension/pom.xml | 108 ++
.../haproxy-extension/src/main/assembly/bin.xml | 70 +
.../src/main/bin/haproxy-extension.sh | 28 +
.../src/main/conf/jndi.properties | 22 +
.../stratos/haproxy/extension/HAProxy.java | 184 +++
.../haproxy/extension/HAProxyConfigWriter.java | 115 ++
.../apache/stratos/haproxy/extension/Main.java | 69 +
.../src/main/resources/log4j.properties | 37 +
.../src/main/resources/velocity.properties | 27 +
.../src/main/templates/haproxy.cfg.template | 11 +
extensions/load-balancer/pom.xml | 42 +
extensions/pom.xml | 42 +
pom.xml | 25 +
40 files changed, 3793 insertions(+), 39 deletions(-)
----------------------------------------------------------------------