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/6c131231 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6c131231 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6c131231 Branch: refs/heads/master Commit: 6c131231387a1f803b878305ab5fba4cebaceac8 Parents: 8e0b3ee a46827c Author: Udara Liyanage <[email protected]> Authored: Thu Feb 13 10:02:06 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Thu Feb 13 10:02:06 2014 -0500 ---------------------------------------------------------------------- .../apache/stratos/cli/GenericRestClient.java | 2 +- .../java/org/apache/stratos/cli/RestClient.java | 7 +- .../stratos/cli/RestCommandLineService.java | 211 +++++++++++-------- .../controllers/cartridgeDefintionSubmit.jag | 5 + .../console/controllers/wizardSubmit.jag | 9 +- .../console/themes/theme1/partials/header.hbs | 28 ++- .../theme1/renderers/configure_stratos.js | 27 ++- .../renderers/configure_stratos_wizard.js | 26 ++- .../console/themes/theme1/ui/css/main.css | 4 + .../console/util/utility.jag | 46 ++-- .../rest/endpoint/services/ServiceUtils.java | 65 ++++-- .../rest/endpoint/services/StratosAdmin.java | 103 ++++++--- 12 files changed, 361 insertions(+), 172 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c131231/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
