Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into persistence
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2c0dc273 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2c0dc273 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2c0dc273 Branch: refs/heads/master Commit: 2c0dc2737bb4d977e6f39fc418b6c6b7c7d0bd6e Parents: fd6b573 68ab111 Author: Isuru <[email protected]> Authored: Fri Dec 27 00:36:40 2013 +0530 Committer: Isuru <[email protected]> Committed: Fri Dec 27 00:36:40 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 100 +++--- .../stratos/autoscaler/PartitionContext.java | 18 +- .../autoscaler/algorithm/OneAfterAnother.java | 149 ++++----- .../autoscaler/algorithm/RoundRobin.java | 30 +- .../topology/AutoscalerTopologyReceiver.java | 10 +- .../autoscaler/monitor/ClusterMonitor.java | 2 +- .../autoscaler/partition/PartitionManager.java | 4 +- .../rule/AutoscalerRuleEvaluator.java | 2 + .../apache/stratos/autoscaler/rule/RuleLog.java | 55 ++++ .../autoscaler/rule/RuleTasksDelegator.java | 9 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 12 +- .../resources/test-minimum-autoscaler-rule.drl | 2 +- .../git/impl/GitBasedArtifactRepository.java | 23 +- .../parser/CloudControllerConfigParser.java | 5 + .../impl/CloudControllerServiceImpl.java | 318 +++++++------------ .../internal/CloudControllerDSComponent.java | 55 ++-- .../TopologySynchronizerTaskScheduler.java | 102 ++++++ .../topic/TopologySynchronizerTask.java | 64 ---- .../InstanceStatusEventMessageDelegator.java | 68 ++++ .../InstanceStatusEventMessageListener.java | 48 +++ .../status/InstanceStatusEventMessageQueue.java | 44 +++ .../controller/topology/TopologyBuilder.java | 85 +++-- .../topology/TopologyEventMessageDelegator.java | 69 ---- .../topology/TopologyEventPublisher.java | 151 +++++++++ .../topology/TopologyEventSender.java | 154 --------- .../controller/topology/TopologyListener.java | 42 --- .../controller/topology/TopologyManager.java | 113 +++---- .../topology/TopologySynchronizerTask.java | 67 ++++ .../util/CloudControllerConstants.java | 5 +- components/org.apache.stratos.common/pom.xml | 1 + .../internal/CloudCommonServiceComponent.java | 10 +- .../pom.xml | 2 + .../WSO2CEPInFlightRequestPublisher.java | 4 +- .../org.apache.stratos.load.balancer/pom.xml | 3 +- .../balancer/LoadBalancerTopologyReceiver.java | 52 ++- .../ClusterCreatedMessageProcessor.java | 10 +- .../streamdefinitions/stream-manager-config.xml | 2 +- .../pom.xml | 1 + .../distribution/src/main/conf/mincheck.drl | 15 +- .../distribution/src/main/conf/scaling.drl | 37 ++- .../integration/tests/LoginLogoutTestCase.java | 50 +-- .../tests/SecurityVerificationTestCase.java | 8 +- .../tests/StratosManagerTestServerManager.java | 58 ++-- .../integration/tests/TenantMgtTestCase.java | 112 +++---- tools/puppet/manifests/classes/php_cartridge.pp | 5 +- .../rest-api-client/deploy-autoscale-policy.sh | 31 ++ tools/rest-api-client/deploy-cartridge.sh | 31 ++ .../rest-api-client/deploy-deployment-policy.sh | 31 ++ .../deploy-load-balancer-cartridge.sh | 31 ++ tools/rest-api-client/deploy-partition.sh | 31 ++ tools/rest-api-client/subscribe.sh | 31 ++ tools/templates/json/autoscale-policy.json | 28 ++ tools/templates/json/cartridge.json | 49 +++ tools/templates/json/deployment-policy.json | 16 + .../templates/json/load-balancer-cartridge.json | 67 ++++ tools/templates/json/partition.json | 14 + tools/templates/json/subscribe.json | 12 + 57 files changed, 1531 insertions(+), 1017 deletions(-) ----------------------------------------------------------------------
