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/a25f5fe9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a25f5fe9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a25f5fe9 Branch: refs/heads/master Commit: a25f5fe9aa5931d76e63d662a035211b5dd988f5 Parents: d0f1a44 c4255c6 Author: Nirmal Fernando <[email protected]> Authored: Thu Feb 6 11:24:12 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Feb 6 11:24:12 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 160 +++++++------------ .../stratos/cli/beans/cartridge/Cartridge.java | 9 ++ .../apache/stratos/cli/utils/CliConstants.java | 6 +- .../controller/topology/TopologyBuilder.java | 2 +- .../topology/TopologyEventPublisher.java | 5 +- .../conf/LoadBalancerConfiguration.java | 32 +++- .../load/balancer/conf/domain/MemberIpType.java | 31 ++++ .../balancer/conf/domain/TenantIdentifier.java | 19 +++ .../load/balancer/conf/util/Constants.java | 1 + .../TenantAwareLoadBalanceEndpoint.java | 41 ++++- .../sample/configuration/loadbalancer1.conf | 6 + .../sample/configuration/loadbalancer2.conf | 6 + .../sample/configuration/loadbalancer3.conf | 6 + .../model/TopologyClusterInformationModel.java | 3 +- .../StratosManagerTopologyReceiver.java | 39 +++++ .../broker/connect/TopicConnector.java | 2 + .../event/topology/InstanceSpawnedEvent.java | 19 +++ .../InstanceSpawnedMessageProcessor.java | 2 + .../stratos/messaging/util/Constants.java | 2 + .../rest/endpoint/mock/StratosTestAdmin.java | 21 +++ .../rest/endpoint/services/StratosAdmin.java | 1 + .../distribution/src/main/conf/mincheck.drl | 2 +- .../src/main/conf/loadbalancer.conf | 8 +- tools/stratos-installer/start-servers.sh | 12 +- 24 files changed, 314 insertions(+), 121 deletions(-) ----------------------------------------------------------------------
