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/f6238122 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f6238122 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f6238122 Branch: refs/heads/master Commit: f623812224a66dd6a9e255c3cdef8915e6d8bb35 Parents: 33e8c13 53561c3 Author: Udara Liyanage <[email protected]> Authored: Fri Feb 14 08:11:50 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Fri Feb 14 08:11:50 2014 -0500 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 17 + .../topology/AutoscalerTopologyReceiver.java | 20 +- .../stratos/cli/RestCommandLineService.java | 132 +++- .../cloud/controller/pojo/CartridgeInfo.java | 18 +- .../controller/util/CloudControllerUtil.java | 11 +- .../console/cartridges.jag | 4 +- .../console/configure_stratos_wizard.jag | 1 + .../controllers/cartridgeSubscribeSubmit.jag | 10 + .../controllers/cartridgeUnsubscribeSubmit.jag | 11 + .../console/controllers/wizardSubmit.jag | 19 +- .../themes/theme1/partials/cartridges.hbs | 10 +- .../partials/configure_stratos_wizard.hbs | 2 +- .../console/themes/theme1/partials/header.hbs | 24 +- .../theme1/partials/subscribe_cartridge.hbs | 46 +- .../theme1/renderers/configure_stratos.js | 49 +- .../renderers/configure_stratos_wizard.js | 50 +- .../console/themes/theme1/renderers/index.js | 1 + .../theme1/renderers/subscribe_cartridge.js | 3 - .../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 | 31 +- .../apache/stratos/manager/dto/Cartridge.java | 32 +- .../stratos/rest/endpoint/bean/Error.java | 25 + .../rest/endpoint/services/ServiceUtils.java | 125 ++-- .../rest/endpoint/services/StratosAdmin.java | 176 ++++-- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 617 ++++++++++--------- 28 files changed, 1037 insertions(+), 499 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f6238122/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
