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/99d22a05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/99d22a05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/99d22a05 Branch: refs/heads/master Commit: 99d22a053985c0a2594b1bdc6b5ebc7f08817f2d Parents: b8dc45a 64a5cc8 Author: Isuru <[email protected]> Authored: Fri Feb 14 15:01:27 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Feb 14 15:01:27 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/pojo/CartridgeInfo.java | 18 +- .../controller/util/CloudControllerUtil.java | 11 +- .../console/cartridges.jag | 4 +- .../console/configure_stratos_wizard.jag | 1 + .../controllers/cartridgeUnsubscribeSubmit.jag | 11 + .../themes/theme1/partials/cartridges.hbs | 10 +- .../partials/configure_stratos_wizard.hbs | 2 +- .../console/themes/theme1/partials/header.hbs | 24 +- .../theme1/renderers/configure_stratos.js | 56 +- .../console/themes/theme1/ui/css/main.css | 8 +- .../console/themes/theme1/ui/js/mycartridges.js | 12 + .../console/themes/theme1/ui/js/popup.js | 80 +++ .../console/util/utility.jag | 33 +- .../apache/stratos/manager/dto/Cartridge.java | 22 +- .../stratos/rest/endpoint/bean/Error.java | 25 + .../rest/endpoint/services/ServiceUtils.java | 9 +- .../rest/endpoint/services/StratosAdmin.java | 11 + .../main/resources/CloudControllerService.wsdl | 617 ++++++++++--------- 18 files changed, 597 insertions(+), 357 deletions(-) ----------------------------------------------------------------------
