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/ce67fc1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ce67fc1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ce67fc1f Branch: refs/heads/master Commit: ce67fc1f9b1d553da51a3a6c33bad2832c7c2771 Parents: 3bb2e47 9e5d981 Author: Udara Liyanage <[email protected]> Authored: Fri Dec 20 19:26:05 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Fri Dec 20 19:30:00 2013 -0500 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 1 - .../topology/AutoscalerTopologyReceiver.java | 8 +- .../apache/stratos/cartridge/agent/Main.java | 3 + .../publisher/CartridgeAgentEventPublisher.java | 78 ++++--- .../publisher/HealthStatisticsNotifier.java | 10 +- .../publisher/HealthStatisticsPublisher.java | 11 +- .../java/org/apache/stratos/cli/RestClient.java | 52 +---- .../stratos/cli/RestCommandLineService.java | 60 ++--- .../publisher/WSO2CEPStatisticsPublisher.java | 10 +- .../conf/configurator/CEPConfigurator.java | 2 +- .../health/stat/AverageLoadAverageEvent.java | 29 +-- .../stat/AverageMemoryConsumptionEvent.java | 29 +-- .../stat/AverageRequestsInFlightEvent.java | 28 +-- .../health/stat/GradientOfLoadAverageEvent.java | 28 +-- .../stat/GradientOfMemoryConsumptionEvent.java | 28 +-- .../stat/GradientOfRequestsInFlightEvent.java | 28 +-- .../event/health/stat/HealthStatEvent.java | 32 +++ .../stat/MemberAverageLoadAverageEvent.java | 21 +- .../MemberAverageMemoryConsumptionEvent.java | 20 +- .../event/health/stat/MemberFaultEvent.java | 35 +-- .../stat/MemberGradientOfLoadAverageEvent.java | 21 +- .../MemberGradientOfMemoryConsumptionEvent.java | 21 +- ...emberSecondDerivativeOfLoadAverageEvent.java | 21 +- ...econdDerivativeOfMemoryConsumptionEvent.java | 21 +- .../SecondDerivativeOfLoadAverageEvent.java | 29 +-- ...econdDerivativeOfMemoryConsumptionEvent.java | 21 +- ...SecondDerivativeOfRequestsInFlightEvent.java | 28 +-- .../stat/AverageLoadAverageEventListener.java | 28 +++ .../AverageMemoryConsumptionEventListener.java | 28 +++ .../AverageRequestsInFlightEventListener.java | 28 +++ .../GradientOfLoadAverageEventListener.java | 28 +++ ...radientOfMemoryConsumptionEventListener.java | 28 +++ ...GradientOfRequestsInFlightEventListener.java | 28 +++ .../MemberAverageLoadAverageEventListener.java | 29 +++ ...erAverageMemoryConsumptionEventListener.java | 28 +++ .../health/stat/MemberFaultEventListener.java | 28 +++ ...emberGradientOfLoadAverageEventListener.java | 48 ++++ ...radientOfMemoryConsumptionEventListener.java | 28 +++ ...ondDerivativeOfLoadAverageEventListener.java | 28 +++ ...ivativeOfMemoryConsumptionEventListener.java | 28 +++ ...ondDerivativeOfLoadAverageEventListener.java | 28 +++ ...ivativeOfMemoryConsumptionEventListener.java | 28 +++ ...rivativeOfRequestsInFlightEventListener.java | 28 +++ .../tenant/TenantRemovedEventListener.java | 7 +- .../topology/ClusterCreatedEventListener.java | 6 +- .../topology/ClusterRemovedEventListener.java | 6 +- .../topology/CompleteTopologyEventListener.java | 6 +- .../topology/InstanceSpawnedEventListener.java | 6 +- .../topology/MemberActivatedEventListener.java | 6 +- .../topology/MemberStartedEventListener.java | 6 +- .../topology/MemberSuspendedEventListener.java | 7 +- .../topology/MemberTerminatedEventListener.java | 6 +- .../topology/ServiceCreatedEventListener.java | 6 +- .../topology/ServiceRemovedEventListener.java | 6 +- .../AverageLoadAverageMessageProcessor.java | 66 ++++++ ...verageMemoryConsumptionMessageProcessor.java | 66 ++++++ ...AverageRequestsInFlightMessageProcessor.java | 66 ++++++ .../GradientOfLoadAverageMessageProcessor.java | 66 ++++++ ...ientOfMemoryConsumptionMessageProcessor.java | 65 ++++++ ...dientOfRequestsInFlightMessageProcessor.java | 66 ++++++ ...emberAverageLoadAverageMessageProcessor.java | 66 ++++++ ...verageMemoryConsumptionMessageProcessor.java | 66 ++++++ .../stat/MemberFaultMessageProcessor.java | 66 ++++++ ...erGradientOfLoadAverageMessageProcessor.java | 66 ++++++ ...ientOfMemoryConsumptionMessageProcessor.java | 67 ++++++ ...DerivativeOfLoadAverageMessageProcessor.java | 66 ++++++ ...tiveOfMemoryConsumptionMessageProcessor.java | 66 ++++++ ...DerivativeOfLoadAverageMessageProcessor.java | 66 ++++++ ...tiveOfMemoryConsumptionMessageProcessor.java | 66 ++++++ ...ativeOfRequestsInFlightMessageProcessor.java | 66 ++++++ .../src/main/bin/haproxy-extension.sh | 2 +- .../src/main/bin/cartridge-agent.sh | 11 +- .../modules/scripts/ec2/cartridge-agent.sh | 100 ++++++++ .../modules/scripts/ec2/clean.sh | 20 ++ .../modules/scripts/ec2/get-launch-params.rb | 54 +++++ .../ec2/load-balancer/cartridge-agent.sh | 51 ++--- .../scripts/ec2/mysql/cartridge-agent.sh | 142 ------------ .../modules/scripts/ec2/mysql/clean.sh | 33 --- .../scripts/ec2/mysql/get-launch-params.rb | 54 ----- .../modules/scripts/ec2/mysql/healthcheck.sh | 33 --- .../modules/scripts/ec2/php/cartridge-agent.sh | 86 ------- .../modules/scripts/ec2/php/clean.sh | 39 ---- .../scripts/ec2/php/get-launch-params.rb | 54 ----- .../modules/scripts/ec2/php/healthcheck.sh | 33 --- .../scripts/ec2/tomcat/cartridge-agent.sh | 227 ------------------- .../modules/scripts/ec2/tomcat/clean.sh | 39 ---- .../scripts/ec2/tomcat/get-launch-params.rb | 54 ----- .../modules/scripts/ec2/tomcat/healthcheck.sh | 33 --- 88 files changed, 2040 insertions(+), 1293 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ce67fc1f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ----------------------------------------------------------------------
