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/ba213f57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba213f57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba213f57 Branch: refs/heads/master Commit: ba213f577d0e2f1ea9a63c14ff7c26de97c72925 Parents: ab00e0a 4506c59 Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 10 17:49:21 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 10 17:49:21 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 7 + .../apache/stratos/autoscaler/Constants.java | 6 + .../controller/InstanceNotificationClient.java | 71 ++++++ .../health/AutoscalerHealthStatReceiver.java | 245 +++++++++++++------ .../autoscaler/rule/RuleTasksDelegator.java | 10 + .../stratos/cartridge/agent/CartridgeAgent.java | 51 ++-- .../agent/util/CartridgeAgentConstants.java | 1 + .../cartridge/agent/util/ExtensionUtils.java | 13 + .../stratos/manager/deploy/service/Service.java | 56 ++++- .../service/ServiceDeploymentManager.java | 142 +++++++---- .../service/multitenant/MultiTenantService.java | 7 +- .../multitenant/lb/MultiTenantLBService.java | 49 ++++ .../ServiceAlreadyDeployedException.java | 49 ++++ .../listener/InstanceStatusListener.java | 7 + .../manager/CartridgeSubscriptionManager.java | 6 +- .../InstanceNotificationPublisher.java | 13 +- .../InstanceCleanupNotificationService.java | 9 +- .../health/stat/AverageLoadAverageEvent.java | 8 +- .../notifier/InstanceCleanupClusterEvent.java | 38 +++ .../instance/notifier/InstanceCleanupEvent.java | 47 ---- .../notifier/InstanceCleanupMemberEvent.java | 38 +++ .../InstanceCleanupClusterEventListener.java | 24 ++ .../notifier/InstanceCleanupEventListener.java | 25 -- .../InstanceCleanupMemberEventListener.java | 25 ++ ...InstanceCleanupNotifierMessageProcessor.java | 6 +- .../InstanceNotifierMessageProcessorChain.java | 4 +- .../rest/endpoint/services/ServiceUtils.java | 28 ++- .../rest/endpoint/services/StratosAdmin.java | 14 +- .../AverageInFlightRequestsEventFormatter.xml | 2 +- .../AverageLoadAverageEventFormatter.xml | 2 +- .../AverageMemoryConsumptionEventFormatter.xml | 2 +- .../FaultMessageEventFormatter.xml | 2 +- .../GradientInFlightRequestsEventFormatter.xml | 2 +- .../GradientLoadAverageEventFormatter.xml | 2 +- .../GradientMemoryConsumptionEventFormatter.xml | 2 +- .../MemberAverageLoadAverageEventFormatter.xml | 2 +- ...erAverageMemoryConsumptionEventFormatter.xml | 2 +- .../MemberGradientLoadAverageEventFormatter.xml | 2 +- ...rGradientMemoryConsumptionEventFormatter.xml | 2 +- ...econdDerivativeLoadAverageEventFormatter.xml | 2 +- ...erivativeMemoryConsumptionEventFormatter.xml | 2 +- ...DerivativeInFlightRequestsEventFormatter.xml | 2 +- ...econdDerivativeLoadAverageEventFormatter.xml | 2 +- ...erivativeMemoryConsumptionEventFormatter.xml | 2 +- .../pom.xml | 1 + .../distribution/src/main/conf/autoscaler.xml | 5 + .../distribution/src/main/conf/mincheck.drl | 2 +- .../distribution/src/main/conf/scaling.drl | 52 ++-- .../distribution/src/main/extensions/clean.sh | 27 ++ .../pom.xml | 141 +++++++++++ .../InstanceCleanupNotificationService.wsdl | 91 +++++++ service-stubs/pom.xml | 1 + tools/puppet/manifests/classes/lb_cartridge.pp | 133 ++++++++++ tools/puppet/manifests/classes/stratos.pp | 92 +++++++ tools/puppet/manifests/nodes.pp | 29 +++ tools/puppet/templates/load-balancer/.erb | 0 56 files changed, 1319 insertions(+), 286 deletions(-) ----------------------------------------------------------------------
