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/c537b5a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c537b5a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c537b5a7 Branch: refs/heads/master Commit: c537b5a757a78302aa49d5559c0205122de3f318 Parents: e96fcec e103ab6 Author: Isuru <[email protected]> Authored: Wed Feb 5 11:45:20 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Feb 5 11:45:20 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 274 ++++++++++++++++--- .../apache/stratos/cli/StratosApplication.java | 3 + .../stratos/cli/beans/cartridge/Cartridge.java | 21 +- .../cli/beans/cartridge/PortMapping.java | 68 +++++ .../stratos/cli/beans/topology/Member.java | 10 + .../cli/commands/ListCartridgeInfoCommand.java | 127 +++++++++ .../stratos/cli/commands/ListCommand.java | 2 +- .../apache/stratos/cli/utils/CliConstants.java | 5 + .../impl/CloudControllerServiceImpl.java | 4 +- .../controller/topology/TopologyBuilder.java | 3 +- .../apache/stratos/manager/dto/Cartridge.java | 18 +- .../messaging/domain/topology/Member.java | 12 +- .../rest/endpoint/bean/topology/Member.java | 1 + .../bean/util/converter/PojoConverter.java | 5 + .../rest/endpoint/services/ServiceUtils.java | 47 +++- .../rest/endpoint/services/StratosAdmin.java | 33 ++- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 + 17 files changed, 590 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
