Updated Branches: refs/heads/master b2ba8234c -> c6df23163
adding volume option in the UI Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c6df2316 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c6df2316 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c6df2316 Branch: refs/heads/master Commit: c6df231630a4685fb56f733cf350d38c22605f2e Parents: b2ba823 Author: rekathiru <[email protected]> Authored: Fri Feb 14 16:00:09 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 14 16:00:09 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 | 3 ++ .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- 10 files changed, 102 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag index 45ee41d..0c9c2be 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag @@ -12,6 +12,11 @@ var repoPassword = request.getParameter('repoPassword'); var autoscalePolicy = request.getParameter('autoscalePolicy'); var deploymentPolicy = request.getParameter('deploymentPolicy'); + var device = request.getParameter('device'); + var size = request.getParameter('size'); + var removeontermination = request.getParameter('removeontermination'); + var persistencerequired = request.getParameter('persistencerequired'); + // constructing the json request jsonRequest.cartridgeInfoBean.cartridgeType = cartridgeType; @@ -25,6 +30,11 @@ } jsonRequest.cartridgeInfoBean.autoscalePolicy = autoscalePolicy; jsonRequest.cartridgeInfoBean.deploymentPolicy = deploymentPolicy; + jsonRequest.cartridgeInfoBean.size = size; + jsonRequest.cartridgeInfoBean.device = device; + jsonRequest.cartridgeInfoBean.persistanceRequired = persistencerequired; + jsonRequest.cartridgeInfoBean.removeOnTermination = removeontermination; + var result = utils.consoleAppUtil.subscribeToCartridge(jsonRequest); response.sendRedirect(request.getContextPath() + '/index.jag'); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs index 3d7a8b6..1be4f38 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs @@ -25,12 +25,37 @@ </div> </div> {{#ifCond cartridge.provider "==" "data"}} - <label class="required">Persistence Storage:</label> - <div class="checkbox"> - <label> - <input name="backed By Volume" type="checkbox" checked="checked" id="volume_check" /> Persistence storage for the cartridge instance - </label> - </div> + {{#if cartridge.persistance}} + <label class="required">Persistence Storage:</label> + <label> + <input name="persistencerequired" type="checkbox" id="volume_check"/> Require Persistence storage + </label> + <div id="persistence_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;"> + <h2>Persistence Mappings</h2> + {{#each cartridge.persistanceMappingBeans}} + <div class="form-group"> + <label class="required">device:</label> + <div class="form-inline"> + <input name="device" class="form-control input-xlarge" value={{device}}/> + </div> + </div> + <div class="form-group"> + <label class="required">Size:</label> + <div class="form-inline"> + <input name="size" class="form-control input-xlarge" value={{size}}/> + </div> + </div> + <div class="form-group"> + <label> + <input name="removeontermination" type="checkbox" {{#if removeOntermination}}checked="checked"{{/if}} id="volume_check" />Remove on termination + </label> + </div> + {{/each}} + </div> + + + {{/if}} + {{else}} @@ -139,6 +164,15 @@ $public_check.click(function(){ $('#credential_container').toggle($public_check.checked); }); + + var $volume_check = $('#volume_check'); + + if($volume_check.is(':checked')){ + $('#volume_check').prop("checked",false); + } + $volume_check.click(function(){ + $('#persistence_container').toggle($volume_check.checked); + }); }); $('#alias').keyup(function(){ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js index 3a96ca4..07f86bf 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js @@ -31,7 +31,6 @@ var render = function (theme, data, meta, require) { }else if( config_status.step == 6 ){ title = 'Multi-Tenant Service Deployment'; } - var log = new Log(); if(deploy_status == "succeeded") { isErrDeply = false; @@ -44,9 +43,6 @@ var render = function (theme, data, meta, require) { step_data = "[]"; } - log.info("****************************--------------" + err_message + isErrDeply); - - if(list_status == "succeeded") { isErrGet = false; } else if(list_status == null) { @@ -65,9 +61,6 @@ var render = function (theme, data, meta, require) { isErr = true; } - - log.info("****************************" + err_message); - log.info("------------------: " + isErr); session.remove("get-status"); session.remove("deploy-status"); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js index 230e2d7..69c89e0 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js @@ -2,9 +2,12 @@ var render = function (theme, data, meta, require) { session.put("configuring","false"); var deploy_status = session.get("deploy-status"); var list_status = session.get("get-status"); - var err_message = ""; var title; + var err_message; + var isErrDeply = false; + var isErrGet = false; var isErr = false; + var isSucceeded = false; var wizard_on_val = []; for(var i=0; i<6 ;i++){ if(i <= data.wizard.step-1){ @@ -13,19 +16,34 @@ var render = function (theme, data, meta, require) { wizard_on_val.push(false); } } - if((deploy_status != null && deploy_status == "succeeded") && (list_status != null && list_status == "succeeded")) { - isErr = false; - } else if((deploy_status != null && !(deploy_status == "succeeded")) && (list_status != null && !(list_status == "succeeded"))) { - isErr = true; - step_data = "[]"; - err_message = deploy_status + " ," + list_status; - } else if((deploy_status != null && deploy_status == "succeeded") && (list_status != null && !(list_status == "succeeded"))) { - isErr = true; - err_message = list_status; + + if(deploy_status == "succeeded") { + isErrDeply = false; + isSucceeded = true; + } else if(deploy_status == null) { + isErrDeply = false; + } else { + isErrDeply = true; + err_message = deploy_status; step_data = "[]"; - } else if((deploy_status != null && !(deploy_status == "succeeded")) && (list_status != null && list_status == "succeeded")) { - isErr = true; - err_message = deploy_status; + } + + if(list_status == "succeeded") { + isErrGet = false; + } else if(list_status == null) { + isErrGet = false; + } else { + isErrGet = true; + if(err_message == undefined) { + err_message = list_status; + } else { + err_message = err_message + ", " + list_status; + } + step_data = "[]"; + } + + if(isErrDeply || isErrGet) { + isErr = true; } session.remove("get-status"); @@ -90,7 +108,9 @@ var render = function (theme, data, meta, require) { step:step, configure_stratos:true, error:isErr, - error_msg:err_message + deploy_status:isSucceeded, + error_msg:err_message, + type:title } } ], http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js index 1914df3..28a0e67 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js @@ -2,6 +2,7 @@ var render = function (theme, data, meta, require) { // Re-create the data structure of the cartridges. var cartridges_old = data.mycartridges.cartridge; + var cartridges_new = [ { kind: "Framework", http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js index 9f886e9..8684412 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js @@ -38,7 +38,4 @@ var render = function (theme, data, meta, require) { } ] }); - - var log = new Log(); - log.info("jssssss...: " + stringify(data.cartridge.cartridge)); }; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index a00101d..fd63c8a 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -256,7 +256,7 @@ consoleAppUtil = new function(){ log.error("Error in the programme flow."); } log.info("-----------------------:" + stringify(response)); - //response = {"data" : {"Error" : {"errorCode" : " 400", "errorMessage" : " Error getting available partitions"}}, "xhr" : {}}; + response = {"data" : {"Error" : {"errorCode" : " 400", "errorMessage" : " Error getting available partitions"}}, "xhr" : {}}; if(response.data.Error) { session.put("get-status", response.data.Error.errorMessage); } else { @@ -298,8 +298,8 @@ consoleAppUtil = new function(){ } else { session.put("deploy-status", "Error occurred while deploying..."); } - log.info("sent is: " + stringify(response)); - log.info("--------------------: + " + urlPostFix + " "+ session.get("deploy-status")); + //log.info("sent is: " + stringify(response)); + //log.info("--------------------: + " + urlPostFix + " "+ session.get("deploy-status")); return response; }; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java index 71fec9c..e166a89 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java @@ -61,6 +61,8 @@ public class Cartridge implements Comparable<Cartridge> { private String defaultDeploymentPolicy; + private boolean isPersistance; + private List<PersistanceMapping> persistanceMappingBeans = new ArrayList<PersistanceMapping>(); public String getDisplayName() { @@ -282,4 +284,12 @@ public class Cartridge implements Comparable<Cartridge> { public void setPersistanceMappingBeans(List<PersistanceMapping> persistanceMappingBeans) { this.persistanceMappingBeans = persistanceMappingBeans; } + + public boolean isPersistance() { + return isPersistance; + } + + public void setPersistance(boolean persistance) { + isPersistance = persistance; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 3f6b7e1..0172dfb 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -507,7 +507,10 @@ public class ServiceUtils { if(cartridgeInfo.getPeristanceMappings() != null) { for(PersistanceMapping persistanceMapping : cartridgeInfo.getPeristanceMappings()) { cartridge.addPersistanceMapping(persistanceMapping); + cartridge.setPersistance(true); } + } else { + cartridge.setPersistance(false); } if(cartridgeInfo.getLbConfig() != null && cartridgeInfo.getProperties() != null) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c6df2316/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml index 1d682c3..2781eb7 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml @@ -66,7 +66,7 @@ <value>member</value> <value>hostNames</value> <value>portMappings</value> - <!--value>cartridge</value--> + <value>persistanceMappingBeans</value> </list> </property> </bean>
