Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b299559d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b299559d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b299559d Branch: refs/heads/master Commit: b299559d1c09cac05d38a826ef7e515fa5ad03f3 Parents: e9f2087 a6f4efe Author: R-Rajkumar <[email protected]> Authored: Sun Oct 12 00:34:07 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Sun Oct 12 00:34:07 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/cli/RestClient.java | 26 +- .../stratos/cli/RestCommandLineService.java | 1346 +++++------------- .../apache/stratos/cli/StratosApplication.java | 4 +- .../cli/commands/ActivateTenantCommand.java | 2 +- .../DescribeCartridgeSubscriptionCommand.java | 95 ++ .../DescribeDeploymentPolicyCommand.java | 2 +- .../commands/ListAutoscalePolicyCommand.java | 3 +- .../ListCartridgeSubscriptionsCommand.java | 84 +- .../cli/commands/ListCartridgesCommand.java | 3 +- .../cli/commands/ListDeployServiceCommand.java | 2 +- .../commands/ListDeploymentPolicyCommand.java | 1 - .../ListSubscribedCartridgesCommand.java | 120 -- .../cli/commands/SubscribeCartridgeCommand.java | 42 +- .../stratos/cli/commands/SyncCommand.java | 6 +- .../stratos/cli/exception/ErrorWrapper.java | 4 +- .../rest/endpoint/services/ServiceUtils.java | 7 +- .../cartridge-agent/agent.conf | 2 + .../cartridge-agent/agent.py | 7 +- .../config/cartridgeagentconfiguration.py | 17 +- .../modules/datapublisher/logpublisher.py | 15 +- .../modules/event/topology/events.py | 25 +- .../extensions/abstractextensionhandler.py | 3 + .../extensions/defaultextensionhandler.py | 85 +- .../modules/healthstatspublisher/healthstats.py | 12 +- .../publisher/cartridgeagentpublisher.py | 2 +- .../modules/topology/topologycontext.py | 2 + .../modules/util/cartridgeagentutils.py | 4 +- .../modules/util/extensionutils.py | 2 +- 28 files changed, 720 insertions(+), 1203 deletions(-) ----------------------------------------------------------------------
