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/545fef96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/545fef96 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/545fef96 Branch: refs/heads/master Commit: 545fef96f83ddb23129a5a2b5c8d3d5261ede958 Parents: 6c2a857 8944070 Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 23 13:35:58 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 23 13:35:58 2013 +0530 ---------------------------------------------------------------------- .../cli/commands/AutoscalePolicyCommand.java | 18 ++ .../cli/commands/DeploymentPolicyCommand.java | 18 ++ .../balancer/LoadBalancerTenantReceiver.java | 8 +- .../stat/AverageLoadAverageEventListener.java | 7 +- .../AverageMemoryConsumptionEventListener.java | 7 +- .../AverageRequestsInFlightEventListener.java | 7 +- .../GradientOfLoadAverageEventListener.java | 7 +- ...radientOfMemoryConsumptionEventListener.java | 7 +- ...GradientOfRequestsInFlightEventListener.java | 7 +- .../MemberAverageLoadAverageEventListener.java | 7 +- ...erAverageMemoryConsumptionEventListener.java | 7 +- .../health/stat/MemberFaultEventListener.java | 7 +- ...emberGradientOfLoadAverageEventListener.java | 22 +- ...radientOfMemoryConsumptionEventListener.java | 7 +- ...ondDerivativeOfLoadAverageEventListener.java | 7 +- ...ivativeOfMemoryConsumptionEventListener.java | 7 +- ...ondDerivativeOfLoadAverageEventListener.java | 7 +- ...ivativeOfMemoryConsumptionEventListener.java | 7 +- ...rivativeOfRequestsInFlightEventListener.java | 7 +- .../processor/MessageProcessorChain.java | 8 +- .../stat/HealthStatMessageProcessorChain.java | 106 ++++++++++ .../stat/HealthStatEventMessageDelegator.java | 95 +++++++++ .../stat/HealthStatEventMessageListener.java | 55 +++++ .../stat/HealthStatEventMessageQueue.java | 26 +++ products/autoscaler/modules/integration/pom.xml | 212 +++++++++++++++++++ .../autoscaler/integration/TopicPublisher.java | 101 +++++++++ .../tests/AutoscalerTestServerManager.java | 100 +++++++++ .../integration/tests/LoginLogoutTestCase.java | 49 +++++ .../tests/SecurityVerificationTestCase.java | 27 +++ .../tests/TopologyEventsPublisherTestCase.java | 122 +++++++++++ .../src/test/resources/automation.properties | 116 ++++++++++ .../src/test/resources/jndi.properties | 5 + .../src/test/resources/keys/wso2carbon.jks | Bin 0 -> 33260 bytes .../integration/src/test/resources/testng.xml | 33 +++ .../src/main/bin/cartridge-agent.sh | 4 +- .../modules/scripts/ec2/cartridge-agent.sh | 4 + .../dbscripts/stratos_mysql.sql | 21 +- .../puppet/etc/puppet/files/cartridge-agent.sh | 72 +++---- tools/puppet/manifests/classes/php_cartridge.pp | 30 +-- tools/puppet/manifests/nodes.pp | 19 +- .../resources/stratos_foundation.sql | 18 ++ 41 files changed, 1293 insertions(+), 101 deletions(-) ----------------------------------------------------------------------
