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/66291df0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/66291df0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/66291df0 Branch: refs/heads/master Commit: 66291df02465e4744cbaf2684f159ca978f52387 Parents: 076c173 174ce31 Author: Isuru <[email protected]> Authored: Fri Jan 3 11:53:49 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Jan 3 11:53:49 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 162 ++++++++++++++++-- .../health/HealthEventMessageDelegator.java | 168 ++++++++++++++++++- .../autoscaler/monitor/ClusterMonitor.java | 18 +- .../stratos/cartridge/agent/CartridgeAgent.java | 12 ++ .../config/CartridgeAgentConfiguration.java | 18 -- .../publisher/CartridgeAgentEventPublisher.java | 5 + .../agent/util/CartridgeAgentConstants.java | 6 + .../agent/util/CartridgeAgentUtils.java | 19 +++ .../cartridge/agent/util/ExtensionUtils.java | 101 +++++++++++ .../stratos/common/util/CommandUtils.java | 66 ++++++++ .../org.apache.stratos.manager.console/app.js | 2 +- .../config/console.js | 8 + .../config/console.json | 22 +++ .../controllers/acs.jag | 86 ++++++++++ .../controllers/login.jag | 37 ++++ .../controllers/logout.jag | 41 +++++ .../data/mycartridges.json | 88 ++++------ .../util/utility.jag | 50 ++++++ .../messaging/domain/topology/MemberStatus.java | 2 +- .../instance/notifier/InstanceCleanupEvent.java | 35 ++++ .../instance/status/InstanceActivatedEvent.java | 2 +- .../status/InstanceReadyToShutdownEvent.java | 60 +++++++ .../instance/status/InstanceStartedEvent.java | 2 +- .../stat/HealthStatMessageProcessorChain.java | 55 +++--- .../load-balancer/haproxy-extension/pom.xml | 5 + .../stratos/haproxy/extension/CommandUtil.java | 66 -------- .../stratos/haproxy/extension/HAProxy.java | 7 +- .../extension/HAProxyStatisticsReader.java | 3 +- .../distribution/src/main/conf/scaling.drl | 40 ++++- .../distribution/src/main/assembly/bin.xml | 11 ++ .../src/main/bin/cartridge-agent.sh | 1 + .../src/main/extensions/artifacts-updated.sh | 28 ++++ .../src/main/extensions/instance-activated.sh | 28 ++++ .../src/main/extensions/instance-started.sh | 27 +++ .../src/main/extensions/start-servers.sh | 27 +++ 35 files changed, 1100 insertions(+), 208 deletions(-) ----------------------------------------------------------------------
