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/621e7b8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/621e7b8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/621e7b8c Branch: refs/heads/master Commit: 621e7b8c3951d4f51070c8d1a3e21ee1fe090c5a Parents: 44223db 029cca0 Author: Nirmal Fernando <[email protected]> Authored: Fri Feb 14 16:43:19 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Fri Feb 14 16:43:19 2014 +0530 ---------------------------------------------------------------------- .../controllers/cartridgeSubscribeSubmit.jag | 10 ++++ .../theme1/partials/subscribe_cartridge.hbs | 46 ++++++++++++++++--- .../theme1/renderers/configure_stratos.js | 7 --- .../renderers/configure_stratos_wizard.js | 48 ++++++++++++++------ .../console/themes/theme1/renderers/index.js | 1 + .../theme1/renderers/subscribe_cartridge.js | 3 -- .../console/util/utility.jag | 6 +-- .../apache/stratos/manager/dto/Cartridge.java | 10 ++++ .../rest/endpoint/services/ServiceUtils.java | 22 ++++----- .../rest/endpoint/services/StratosAdmin.java | 23 +++++----- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- 11 files changed, 121 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
