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/6338416d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6338416d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6338416d Branch: refs/heads/master Commit: 6338416d31d6e9ad31bb079883c264dc1ed30a15 Parents: 3b10b49 7f4b680 Author: Udara Liyanage <[email protected]> Authored: Mon Mar 10 09:56:45 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Mon Mar 10 09:56:45 2014 -0400 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 282 ++----------------- .../synchronizer/RepositoryInformation.java | 1 - .../config/CartridgeAgentConfiguration.java | 112 +++++++- .../publisher/CartridgeAgentEventPublisher.java | 1 - .../agent/executor/ExtensionExecutor.java | 86 ++++++ .../impl/KeepAgentLiveExtensionExecutor.java | 68 +++++ .../impl/LogPublisherExtensionExecutor.java | 102 +++++++ .../PersistenceVolumeExtensionExecutor.java | 76 +++++ .../executor/impl/ScriptExtensionExecutor.java | 74 +++++ .../impl/StartListenersExtensionExecutor.java | 228 +++++++++++++++ .../impl/WaitTillActivateExtensionExecutor.java | 121 ++++++++ .../stratos/cartridge/agent/phase/Phase.java | 109 +++++++ .../agent/phase/impl/CleanUpPhase.java | 62 ++++ .../agent/phase/impl/InitializingPhase.java | 60 ++++ .../agent/phase/impl/StartingPhase.java | 60 ++++ .../agent/phase/impl/WorkingPhase.java | 57 ++++ .../cartridge/agent/runtime/DataHolder.java | 55 ++++ .../agent/util/CartridgeAgentConstants.java | 8 +- .../cartridge/agent/util/ExtensionUtils.java | 2 +- .../agent/config/AgentFlowFileLoadTest.java | 64 +++++ .../src/test/resources/agent-flow.conf | 6 + .../distribution/src/main/assembly/bin.xml | 8 + .../distribution/src/main/bin/stratos.sh | 1 + .../distribution/src/main/conf/agent-flow.conf | 14 + 24 files changed, 1396 insertions(+), 261 deletions(-) ----------------------------------------------------------------------
