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/52d9282e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/52d9282e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/52d9282e Branch: refs/heads/master Commit: 52d9282eaba12ca0c709b9b6eacded0e56128fca Parents: 6aac43b e94dcfa Author: Udara Liyanage <[email protected]> Authored: Thu Dec 19 14:45:40 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 19 14:45:40 2013 -0500 ---------------------------------------------------------------------- .../adc/mgt/utils/PersistenceManager.java | 5 + .../java/org/apache/stratos/cli/RestClient.java | 16 +- .../stratos/cli/RestCommandLineService.java | 34 +-- .../impl/CloudControllerServiceImpl.java | 1 + components/org.apache.stratos.common/pom.xml | 22 +- .../publisher/StatisticsPublisher.java | 45 ++++ .../publisher/WSO2CEPStatisticsPublisher.java | 106 ++++++++++ .../pom.xml | 10 +- .../statistics/LoadBalancerStatsPublisher.java | 45 ---- .../WSO2CEPFaultyMemberPublisher.java | 74 ------- .../WSO2CEPInFlightRequestPublisher.java | 76 ------- .../statistics/WSO2CEPStatsPublisher.java | 106 ---------- .../publisher/WSO2CEPFaultyMemberPublisher.java | 75 +++++++ .../WSO2CEPInFlightRequestPublisher.java | 77 +++++++ ...oadBalancerInFlightRequestCountNotifier.java | 4 +- .../WSO2CEPInFlightRequestCountObserver.java | 2 +- .../messaging/message/filter/MessageFilter.java | 6 +- .../extension/FaultHandlingWindowProcessor.java | 2 +- .../cartridge-agent/ec2/php/cartridge-agent.sh | 12 +- .../subscriber/CartridgeAgentConstants.java | 5 + .../cartridge/agent/event/subscriber/Main.java | 209 ++++++++++++++----- .../src/main/bin/health-publisher.sh | 6 +- .../puppet/etc/puppet/files/cartridge-agent.sh | 12 +- 23 files changed, 551 insertions(+), 399 deletions(-) ----------------------------------------------------------------------
