Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f7deea30 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f7deea30 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f7deea30 Branch: refs/heads/stratos-4.1.x Commit: f7deea30ee0e4521f05df90f07ff692907489d6c Parents: 1101002 8ff6a2a Author: Dinithi <[email protected]> Authored: Wed Sep 16 16:59:51 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Sep 16 16:59:51 2015 +0530 ---------------------------------------------------------------------- .../topic/ApplicationsEventPublisher.java | 20 ++ .../stratos/autoscaler/monitor/Monitor.java | 3 +- .../monitor/component/ApplicationMonitor.java | 45 ++--- .../monitor/component/GroupMonitor.java | 69 +++---- .../component/ParentComponentMonitor.java | 4 + .../services/impl/AutoscalerServiceImpl.java | 186 +++++++++++-------- .../stratos/autoscaler/util/AutoscalerUtil.java | 38 ++++ .../application/ApplicationUpdatedEvent.java | 43 +++++ .../ApplicationUpdatedEventListener.java | 27 +++ .../ApplicationUpdatedMessageProcessor.java | 152 +++++++++++++++ .../ApplicationsMessageProcessorChain.java | 6 + .../integration/common/ThriftTestServer.java | 38 ++-- .../tests/ADCMTAppTenantUserTestCase.java | 4 +- .../integration/tests/ADCMTAppTestCase.java | 4 +- .../agent/integration/tests/ADCTestCase.java | 4 +- .../integration/tests/AgentStartupTestCase.java | 35 +++- .../tests/PythonAgentIntegrationTest.java | 2 +- .../src/test/resources/test-suite-smoke.xml | 2 +- .../application/ApplicationUpdateTest.java | 32 +++- 19 files changed, 550 insertions(+), 164 deletions(-) ----------------------------------------------------------------------
