Updated Branches: refs/heads/master 6c1312313 -> 654db15d0
applying patch for STRATOS-447 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0f84a48a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0f84a48a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0f84a48a Branch: refs/heads/master Commit: 0f84a48a4425e2b72ed3634de964c238d8e8d30b Parents: 3e31a1a Author: rekathiru <[email protected]> Authored: Thu Feb 13 19:50:22 2014 +0530 Committer: rekathiru <[email protected]> Committed: Thu Feb 13 19:50:22 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/wizardSubmit.jag | 2 +- .../console/themes/theme1/pages/index.hbs | 19 ++++ .../themes/theme1/partials/cartridges.hbs | 3 +- .../partials/configure_stratos_wizard.hbs | 2 +- .../console/themes/theme1/partials/header.hbs | 100 +++++++++++-------- .../themes/theme1/partials/mycartridges.hbs | 7 +- .../theme1/partials/subscribe_cartridge.hbs | 14 +-- .../themes/theme1/renderers/cartridges.js | 11 +- .../console/themes/theme1/renderers/index.js | 17 ++-- .../console/themes/theme1/ui/css/main.css | 49 ++++++++- .../console/themes/theme1/ui/js/wizard.js | 4 +- .../console/util/utility.jag | 6 +- .../stratos/rest/endpoint/mock/MockContext.java | 25 +++++ .../rest/endpoint/mock/StratosTestAdmin.java | 10 ++ 14 files changed, 192 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag index 9274df0..19cb214 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag @@ -15,7 +15,7 @@ utils.consoleAppUtil.deployAutoscalePolicyDefinition(policy); } if(parseInt(thisStep) == 3 && policy != "" ){ - utils.consoleAppUtil.deployDeploymentPolicyDefinition(policy); + var foo = utils.consoleAppUtil.deployDeploymentPolicyDefinition(policy); } if(parseInt(thisStep) == 4 && policy != "" ){ utils.consoleAppUtil.deployLbDefinition(policy); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs index a0dade2..1f261a9 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs @@ -74,5 +74,24 @@ <p></p> </div> + + +<!-- Modal --> +<div class="modal fade" id="messageModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> +<div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="myModalLabel">Modal title</h4> + </div> + <div class="modal-body"> + ... + </div> + <div class="modal-footer"> + </div> + </div> +</div> +</div> + </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs index fe07cac..bda72a5 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs @@ -19,12 +19,11 @@ <div class="row"> <div class="col-lg-3"> <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div> - <div class="big-pro-icons-title">{{version}}</div> </div> <div class="col-lg-9"> <a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> <div class="cartridge-description">{{description}}</div> - + <div class="cartridge-description">{{#if multiTenant}}<i class="fa fa-users"></i> Multi Tenant Enabled{{else}}<i class="fa fa-user"></i> Single Tenant{{/if}}</div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs index 05f6e9f..b741471 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs @@ -110,7 +110,7 @@ <button data-step="{{step}}" type="button" class="btn btn-primary" id="wizardNext">Deploy</button> {{else}} <button data-step="{{step}}" type="button" class="btn btn-default" {{#unless wizard_on_2}} disabled="disabled" {{/unless}} id="wizardBack"><< Back</button> - <button data-step="{{step}}" type="button" class="btn {{#unless wizard_on_6}}{{#unless wizard_on_4}}btn-primary{{else}}btn-default{{/unless}}{{else}}btn-default{{/unless}}" id="wizardNext" {{#if wizard_on_6}} disabled="disabled" {{/if}}>Next >></button> + <button data-step="{{step}}" type="button" class="btn {{#ifCond step "==" 1 }}btn-primary{{/ifCond}}{{#ifCond step "==" 2 }}btn-primary{{/ifCond}}{{#ifCond step "==" 3 }}btn-primary{{/ifCond}}{{#ifCond step "==" 4 }}btn-default{{/ifCond}}{{#ifCond step "==" 5 }}btn-primary{{/ifCond}}{{#ifCond step "==" 6 }}btn-default{{/ifCond}}" id="wizardNext" {{#if wizard_on_6}} disabled="disabled" {{/if}}>Next >></button> {{#ifCond step "==" 4}}<button data-step="{{step}}" type="button" class="btn btn-primary" id="wizardSkip">Skip >></button>{{/ifCond}} <button data-step="{{step}}" type="button" class="btn {{#if wizard_on_6}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish" {{#unless wizard_on_6}} disabled="disabled" {{/unless}}>Finish</button> {{/if}} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs index ffcd201..09debed 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs @@ -77,62 +77,74 @@ {{#if config_on}} <div class="col-lg-12"> + {{#if config_status.first_use}} + <ul class="sub-menu-inactive"> + <li>Partitions</li> + <li>Auto scale Policies</li> + <li>Deployments Policies</li> + <li>LBs</li> + <li>Cartridges</li> + <li>Multi-Tenant Services</li> + </ul> + {{else}} + <ul class="sub-menu-wizard non-wizard"> + <li {{#ifCond step "==" 1 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=1" }}"> + <div class="wizard-number">1</div> + <div>Partitions</div> + </a> + </li> - <ul class="sub-menu-wizard non-wizard"> - <li {{#ifCond step "==" 1 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=1" }}"> - <div class="wizard-number">1</div> - <div>Partitions</div> - </a> - </li> - - <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=2" }}"> - <div class="wizard-number">2</div> - <div>Auto scale Policies</div> - </a> - </li> + <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=2" }}"> + <div class="wizard-number">2</div> + <div>Auto scale Policies</div> + </a> + </li> - <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=3" }}"> - <div class="wizard-number">3</div> - <div>Deployments Policies</div> - </a> - </li> + <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=3" }}"> + <div class="wizard-number">3</div> + <div>Deployments Policies</div> + </a> + </li> - <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=4" }}"> - <div class="wizard-number">4</div> - <div>LBs</div> - </a> - </li> + <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=4" }}"> + <div class="wizard-number">4</div> + <div>LBs</div> + </a> + </li> - <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=5" }}"> - <div class="wizard-number">5</div> - <div>Cartridges</div> - </a> - </li> + <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=5" }}"> + <div class="wizard-number">5</div> + <div>Cartridges</div> + </a> + </li> - <li {{#ifCond step "==" 6 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=6" }}"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> - </a> - </li> + <li {{#ifCond step "==" 6 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=6" }}"> + <div class="wizard-number">6</div> + <div>Multi-Tenant Services</div> + </a> + </li> - </ul> + </ul> + {{/if}} {{#unless wizard_on}} - <div class="pull-right"> - <a href="{{url "/configure_stratos_wizard.jag" }}" class="btn btn-important"> - <div>Configuration Wizard</div> - </a> - </div> + {{#unless config_status.first_use}} + <div class="pull-right"> + <a href="{{url "/configure_stratos_wizard.jag" }}" class="btn btn-important"> + <div>Configuration Wizard</div> + </a> + </div> + {{/unless}} {{/unless}} </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs index 563394a..9adbd06 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs @@ -21,10 +21,10 @@ <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div> </div> <div class="col-lg-9"> + <div class="un-subscribe-container"><a class="un-subscribe" id="unsubscribeBtn" data-alias="{{cartridgeAlias}}">Un-subscribe <i class="fa fa-times-circle-o"></i></a></div> <a href="{{url "/cartridge_info.jag?alias="}}{{cartridgeAlias}}"><h3>{{cartridgeAlias}}-<span>({{displayName}} - {{version}})</span></h3></a> <div class="cartridge-description">{{description}}</div> <div class="cartridge-description">{{repoURL}}</div> - </div> </div> </div> @@ -33,3 +33,8 @@ </div> </div> {{/each}} +<form method="post" id="cForm" action="{{url "/controllers/cartridgeUnsubscribeSubmit.jag"}}"> + <input type="hidden" name="alias" id="alias" /> +</form> +<script src="{{url "/themes/theme1/ui/js/popup.js"}}"></script> +<script src="{{url "/themes/theme1/ui/js/mycartridges.js"}}"></script> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/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 ac4b5ed..3d7a8b6 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 @@ -18,8 +18,8 @@ type="text" class="form-control input-xlarge js-help" data-help="Specify a unique alias which can be used to generate the hostname as alias.hostname from cartridge" - data-help-x-offset="200" - data-help-y-offset="-10" + data-help-x-offset="50" + data-help-y-offset="10" placeholder="myphp" /> <label>.{{cartridge.hostName}}</label> </div> @@ -45,8 +45,8 @@ type="text" class="form-control input-xlarge js-help" data-help="Specify a repository URL of the artifacts." - data-help-x-offset="200" - data-help-y-offset="-10" + data-help-x-offset="50" + data-help-y-offset="10" placeholder="myphp" /> </div> <div class="checkbox"> @@ -82,7 +82,8 @@ class="form-control input-xlarge js-help" data-help="Please choose a applicable autoscaling policy for the subscription." data-help-x-offset="50" - data-help-y-offset="-10" > + data-help-y-offset="10" + > {{#each autoScalePolicies}} <option>{{id}}</option> {{/each}} @@ -97,7 +98,8 @@ class="form-control input-xlarge js-help" data-help="Please choose a applicable deployment policy for the subscription.." data-help-x-offset="50" - data-help-y-offset="-10" > + data-help-y-offset="10" + > {{#each deploymentPolicies}} <option>{{id}}</option> {{/each}} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js index 36357a6..4e8e156 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js @@ -4,15 +4,15 @@ var render = function (theme, data, meta, require) { var cartridges_old = data.cartridges.cartridge; var cartridges_new = [ { - kind: "Cartridges", + kind: "Framework", cartridges: []} ]; var cartridgesToPush; for (var i = 0; i < cartridges_old.length; i++) { - if (cartridges_old[i].category == undefined) { + if (cartridges_old[i].provider == undefined || (cartridges_old[i].provider.toLowerCase() != "application" && cartridges_old[i].provider.toLowerCase() != "data" )) { cartridgesToPush = null; for (var j = 0; j < cartridges_new.length; j++) { - if (cartridges_new[j].kind == "Cartridges") { + if (cartridges_new[j].kind == "Framework") { cartridgesToPush = cartridges_new[j].cartridges; } } @@ -20,12 +20,13 @@ var render = function (theme, data, meta, require) { } else { cartridgesToPush = null; for (var j = 0; j < cartridges_new.length; j++) { - if (cartridges_new[j].kind == cartridges_old[i].category) { + if (cartridges_new[j].kind == cartridges_old[i].provider) { cartridgesToPush = cartridges_new[j].cartridges; } } if (cartridgesToPush == null) { - cartridges_new.push({kind: cartridges_old[i].category, cartridges: [cartridges_old[i]]}) + var kind = cartridges_old[i].provider; + cartridges_new.push({kind: cartridges_old[i].provider, cartridges: [cartridges_old[i]]}) } else { cartridgesToPush.push(cartridges_old[i]); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/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 51d0c7a..1914df3 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 @@ -4,39 +4,34 @@ var render = function (theme, data, meta, require) { var cartridges_old = data.mycartridges.cartridge; var cartridges_new = [ { - kind: "Cartridges", + kind: "Framework", cartridges: []} ]; var cartridgesToPush; for (var i = 0; i < cartridges_old.length; i++) { - if (cartridges_old[i].category == undefined) { + if (cartridges_old[i].provider == undefined || (cartridges_old[i].provider.toLowerCase() != "application" && cartridges_old[i].provider.toLowerCase() != "data" )) { cartridgesToPush = null; for (var j = 0; j < cartridges_new.length; j++) { - if (cartridges_new[j].kind == "Cartridges") { + if (cartridges_new[j].kind == "Framework") { cartridgesToPush = cartridges_new[j].cartridges; } } cartridgesToPush.push(cartridges_old[i]); - var log = new Log("index.js"); - log.info("cartridges old : "+ stringify(cartridges_old) ); - log.info("cartridges new : "+ stringify(cartridges_new) ); - log.info("cartridges to push : "+ stringify(cartridgesToPush)); } else { cartridgesToPush = null; for (var j = 0; j < cartridges_new.length; j++) { - if (cartridges_new[j].kind == cartridges_old[i].category) { + if (cartridges_new[j].kind == cartridges_old[i].provider) { cartridgesToPush = cartridges_new[j].cartridges; } } if (cartridgesToPush == null) { - cartridges_new.push({kind: cartridges_old[i].category, cartridges: [cartridges_old[i]]}) + var kind = cartridges_old[i].provider; + cartridges_new.push({kind: cartridges_old[i].provider, cartridges: [cartridges_old[i]]}) } else { cartridgesToPush.push(cartridges_old[i]); } } } - var log = new Log(); - log.info("permission object : "+meta.request.permissions); theme('index', { body: [ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css index c090a10..898cb7b 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css @@ -279,7 +279,7 @@ h4{ padding-top: 10px; } .cartridge-description{ - padding-top:20px; + padding-top:10px; font-size: 12px; } .required{ @@ -304,7 +304,7 @@ h4{ width: 0; z-index: 1; left: -15px; - top: 25px; + top: 5px; } #credential_container h2{ background: transparent; @@ -408,6 +408,39 @@ div.in-active-wizard-item{ ul.sub-menu-wizard li.active-no-background{ background: #dcdcdc; } +/* inactive menu */ +.sub-menu-inactive{ + padding:0; + margin:-7px 0 0; + border-right:solid 4px #444; +} + +.sub-menu-inactive li{ + list-style: none; + float:left; + display:block; + padding:15px 10px; + border-left: solid 1px #f2f5f5; + border-right: solid 1px #d1d3d3; + height: 55px; + color:#888; + background: #ddd; +} +#messageModal i{ + font-size:75px; +} +#messageModal i.error{ + color:red; +} +#messageModal i.warning{ + color: #ffba41; +} +#messageModal i.info{ + color: #4b7eff; +} +#messageModal td.imageCell{ + padding-right:20px; +} /* syntax highlight styles */ pre {border:none;background: transparent } .string { color: green; } @@ -508,4 +541,16 @@ label.error{ } .noDomain{ color:red; +} +.un-subscribe-container{ + position: absolute; + width:100%; + text-align: right; + padding-right:30px; +} +.un-subscribe-container a.un-subscribe{ + color:red; +} +.un-subscribe-container i{ + font-size:20px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js index 242f45f..a53202a 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js @@ -17,9 +17,9 @@ $(function () { $('#wizardFinish').click(function () { var newStep = parseInt($(this).attr('data-step')) + 1; $('#nextStep').val(newStep); - if(isValidForm()){ + //if(isValidForm()){ $('#jsonForm').submit(); - } + //} }); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/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 2bc578c..ad1c6fe 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -169,7 +169,9 @@ consoleAppUtil = new function(){ this.getPolicyDeployment = function(){ return this.sendReceive("GET","/policy/deployment",{}).data; }; - + this.unsubscribeCartridge = function(alias){ + return this.send("POST","/cartridge/unsubscribe",alias).data; + }; this.getCartridges = function(){ return this.sendReceive("GET","/cartridge/list",{}).data; }; @@ -188,7 +190,7 @@ consoleAppUtil = new function(){ if(this.sendReceive("GET","/partition",{}).data.partition.length == 0){ configStatus.first_use = true; }else{ - if(this.sendReceive("GET","/service",{}).data.serviceDefinitionBean.length == 0){ + if(this.sendReceive("GET","/cartridge/list",{}).data.cartridge.length == 0){ configStatus.first_use = false; configStatus.not_complete = true; }else{ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index 4df6142..3f9fbc2 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -80,6 +80,31 @@ public class MockContext { return availableSingleTenantCartridges.values().toArray(new Cartridge[0]); } + + public Cartridge[] getAvailableLbCartridges(){ + Map<Cartridge,String> availableLbCartridges = new HashMap<Cartridge, String>(); + Iterator it = availableSingleTenantCartridges.entrySet().iterator(); + while(it.hasNext()){ + Map.Entry pairs = (Map.Entry)it.next(); + Cartridge cartridge = (Cartridge)pairs.getValue(); + if(cartridge.getCartridgeType().equals("lb")){ + availableLbCartridges.put(cartridge,cartridge.getCartridgeType()); + } + it.remove(); + } + + it = availableMultiTenantCartridges.entrySet().iterator(); + while(it.hasNext()){ + Map.Entry pairs = (Map.Entry)it.next(); + Cartridge cartridge = (Cartridge)pairs.getValue(); + if(cartridge.getCartridgeType().equals("lb")){ + availableLbCartridges.put(cartridge,cartridge.getCartridgeType()); + } + it.remove(); + } + return availableLbCartridges.values().toArray(new Cartridge[0]); + } + public Cartridge[] getSubscribedCartridges(){ return subscribedCartridges.values().toArray(new Cartridge[0]); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0f84a48a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java index 25cfafd..1d9d50e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java @@ -252,6 +252,16 @@ public class StratosTestAdmin { return MockContext.getInstance().getAvailableSingleTenantCartridgeInfo(cartridgeType); } + @GET + @Path("/cartridge/lb") + @Produces("application/json") + @Consumes("application/json") + @AuthorizationAction("/permission/protected/manage/monitor/tenants") + public Cartridge[] getAvailableLbCartridges() throws ADCException { + return MockContext.getInstance().getAvailableLbCartridges(); + } + + @POST @Path("/policy/deployment/partition")
