You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/14 18:15:07 UTC
[01/16] stratos git commit: fix cartridge listing with latest changes
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 03bd88799 -> b32d45f57
fix cartridge listing with latest changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4aec6d37
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4aec6d37
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4aec6d37
Branch: refs/heads/4.1.0-test
Commit: 4aec6d370340c73e425fc650dc9fde20bfb7ed41
Parents: d9d9148
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:07:28 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:07:28 2014 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 19 +++++++------------
.../themes/theme0/partials/configure_form.hbs | 10 +++++-----
2 files changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4aec6d37/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 495b4af..431f284 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -87,21 +87,16 @@ switch (formtype) {
case "cartridges":
list_data = util.RESTCalls.getCartridges();
-
- if (list_data.cartridge && list_data.cartridge.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
- } else if (list_data.hasOwnProperty('cartridge')) {
- //remove LB from current object
- for (var i = 0; i < list_data.cartridge.length; i++) {
- if (list_data.cartridge[i].loadBalancer === true) {
- list_data.cartridge.splice(i, 1);
- i = i - 1;
+ } else{
+ formDataEdit = list_data;
+ for (specNumber in list_data) {
+ if (list_data[specNumber].type == elements.action) {
+ formDataEdit = list_data[specNumber];
}
+
}
- if(list_data.cartridge.length == 0 ){
- list_data = null;
- }
- //TODO need to add listing with corrected JSON
}
break;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4aec6d37/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index af25738..d60ba99 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -124,23 +124,23 @@
</div>
{{/each}}
- {{#each content_body.sections.cartridge}}
+ {{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
- <i class="fa icon-{{cartridgeType}} fa-inbox "></i>
+ <i class="fa icon-{{type}} fa-inbox "></i>
</div>
- <h2 class="truncate">{{cartridgeType}} </h2>
+ <h2 class="truncate">{{displayName}} </h2>
<div class="toggle-menu-description">{{description}}</div>
<div class="list-button" style="display: none;">
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/{{../formtype}}/{{cartridgeType}}/" > Details
+ data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-info btn-lg hover-details" type="button" id="details_"
- data-url="{{url ""}}/configure/{{../formtype}}/{{cartridgeType}}/" > Details
+ data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
</button>
[08/16] stratos git commit: remove deployment lisitng
Posted by im...@apache.org.
remove deployment lisitng
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe94ee09
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe94ee09
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe94ee09
Branch: refs/heads/4.1.0-test
Commit: fe94ee0938c2c89ccaeb1a1af6f61b902356d67c
Parents: 9761ffd
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:36:36 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:36:36 2014 +0530
----------------------------------------------------------------------
.../themes/theme0/partials/configure_form.hbs | 22 --------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe94ee09/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index 0d34084..e1d1866 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -148,28 +148,6 @@
</div>
</div>
{{/each}}
- {{#each content_body.sections.deploymentPolicy}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-road "></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
-
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/deployments/{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/deployments/{{id}}/" > Details
- </button>
- </div>
- </div>
- </div>
- {{/each}}
{{#each content_body.sections.autoscalePolicy}}
<div class="block col-md-4 col-xs-4 grid-group-item border-right">
<div class="toggle-menu-icon">
[06/16] stratos git commit: fix group listing data for edit
Posted by im...@apache.org.
fix group listing data for edit
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9aa11669
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9aa11669
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9aa11669
Branch: refs/heads/4.1.0-test
Commit: 9aa11669e292e140f1ccf5984aced59bae29ace9
Parents: d327b32
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:27:30 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:27:30 2014 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9aa11669/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index 91805ab..71efcfe 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -71,15 +71,14 @@ var formtype = elements.formtype;
switch (formtype) {
case "groups":
list_data = util.RESTCalls.getGroups();
- if (list_data.groups && list_data.groups.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}else{
- formDataEdit = list_data.groups;
- for (specNumber in list_data.groups) {
- if (list_data.groups[specNumber].name == elements.action) {
- formDataEdit = list_data.groups[specNumber];
+ formDataEdit = list_data;
+ for (specNumber in list_data) {
+ if (list_data[specNumber].name == elements.action) {
+ formDataEdit = list_data[specNumber];
}
-
}
}
break;
[05/16] stratos git commit: fix group listing issue after changes
Posted by im...@apache.org.
fix group listing issue after changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d327b32c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d327b32c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d327b32c
Branch: refs/heads/4.1.0-test
Commit: d327b32c6f68d5d70b30bdfc6ce7277981d41f41
Parents: 7cb141d
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:26:22 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:26:22 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/applications_form.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d327b32c/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 7354382..415f9d2 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -107,7 +107,7 @@
</div>
</div>
{{/each}}
- {{#each content_body.sections.groups}}
+ {{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
<i class="fa fa-th-large"></i>
[11/16] stratos git commit: fix user listing hbs issues after data
return changes
Posted by im...@apache.org.
fix user listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/36a26227
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/36a26227
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/36a26227
Branch: refs/heads/4.1.0-test
Commit: 36a26227d7b3c674ef5a7c2aea48a3a736ee8144
Parents: e854b69
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:49:00 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:49:00 2014 +0530
----------------------------------------------------------------------
.../themes/theme0/partials/users_form.hbs | 40 ++++++++++----------
.../themes/theme0/renderers/users_form.js | 1 +
.../console/users_form.jag | 3 +-
3 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/36a26227/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index 697a48a..3d6dea9 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -67,30 +67,32 @@
{{/if}}
<div class="row general-table row-overide">
- {{#each content_body.sections.userInfoBean}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-user"></i>
- </div>
- <h2>{{userName}} </h2>
+ {{#ifCond formtype "==" "users"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-user"></i>
+ </div>
+ <h2>{{userName}} </h2>
- <div class="toggle-menu-description">{{role}}</div>
- {{#ifCond userName "!=" "admin"}}
- <div class="list-button" style="display: none;">
- <button class="btn btn-danger btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-user="{{userName}}" > Delete
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-danger btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{role}}</div>
+ {{#ifCond userName "!=" "admin"}}
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-danger btn-lg hover-details" type="button" id="details_list_{{id}}"
data-user="{{userName}}" > Delete
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-danger btn-lg hover-details" type="button" id="details_{{id}}"
+ data-user="{{userName}}" > Delete
+ </button>
+ </div>
+ </div>
+ {{/ifCond}}
</div>
- {{/ifCond}}
- </div>
- {{/each}}
+ {{/each}}
+ {{/ifCond}}
{{#each content_body.sections.tenantInfoBean}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
http://git-wip-us.apache.org/repos/asf/stratos/blob/36a26227/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js
index f29e30a..434facd 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js
@@ -72,6 +72,7 @@ var render = function (theme, data, meta, require) {
formData: data.formData,
formDataRaw: data.formDataRaw,
formTitle: data.formTitle,
+ formtype:data.formtype,
isForm: data.isForm,
content_body: {sections:
data.list_data
http://git-wip-us.apache.org/repos/asf/stratos/blob/36a26227/components/org.apache.stratos.manager.console/console/users_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/users_form.jag b/components/org.apache.stratos.manager.console/console/users_form.jag
index 7700aa6..9dc45c3 100644
--- a/components/org.apache.stratos.manager.console/console/users_form.jag
+++ b/components/org.apache.stratos.manager.console/console/users_form.jag
@@ -49,7 +49,7 @@ var formData = require('controllers/forms/schema/users/' + elements.formtype + '
if (elements.formtype == 'users') {
list_data = util.RESTCalls.getUserList();
- if (list_data.userInfoBean && list_data.userInfoBean.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}
@@ -72,6 +72,7 @@ caramel.render({
formTitle: formTitle,
formDataRaw: JSON.stringify(formDataRaw),
formData: JSON.stringify(formData),
+ formtype:elements.formtype,
list_data: list_data,
left_menu: leftMenu,
error: error
[13/16] stratos git commit: fix application listing hbs issues after
data return changes
Posted by im...@apache.org.
fix application listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ddda83a9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ddda83a9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ddda83a9
Branch: refs/heads/4.1.0-test
Commit: ddda83a9ca709a0a409a4c69a6064b2e1cfb7a80
Parents: bcd112c
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 18:02:28 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 18:02:28 2014 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 3 +-
.../theme0/partials/applications_form.hbs | 36 +++++++++++---------
.../theme0/renderers/applications_form.js | 1 +
3 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddda83a9/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index 71efcfe..6c1326a 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -84,7 +84,7 @@ switch (formtype) {
break;
case "applications":
list_data = util.RESTCalls.getApplications();
- if (list_data.applications && list_data.applications.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}
break;
@@ -120,6 +120,7 @@ var caramelData = {
applicationEditor: applicationEditor,
formTitle: formTitle,
formDataRaw: JSON.stringify(formDataRaw),
+ formtype:elements.formtype,
//formDataRaw: JSON.stringify(partition_data.partition[0]),
formDataEdit: JSON.stringify(formDataEdit),
formData: JSON.stringify(formData),
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddda83a9/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 415f9d2..2640ed2 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -85,28 +85,30 @@
{{/if}}
<div class="row general-table row-overide">
- {{#each content_body.sections.applications}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-th-large"></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
+ {{#ifCond formtype "==" "applications"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-th-large"></i>
+ </div>
+ <h2 class="truncate">{{id}} </h2>
- <div class="toggle-menu-description">{{description}} </div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/applications/applications/{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{description}} </div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/applications/applications/{{id}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/applications/applications/{{id}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
+ {{/each}}
+ {{/ifCond}}
{{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddda83a9/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
index d5ec8be..d02a2e5 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
@@ -205,6 +205,7 @@ var render = function (theme, data, meta, require) {
formData: data.formData,
formDataRaw: data.formDataRaw,
formDataEdit: data.formDataEdit,
+ formtype:data.formtype,
isForm: data.isForm,
isEdit:data.isEdit,
formTitle: data.formTitle,
[10/16] stratos git commit: fix listing hbs issues after data return
changes
Posted by im...@apache.org.
fix listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e854b69b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e854b69b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e854b69b
Branch: refs/heads/4.1.0-test
Commit: e854b69bfc32927befc08251a75aa2bd3afc4878
Parents: 4c34527
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:44:24 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:44:24 2014 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 16 +--
.../themes/theme0/partials/configure_form.hbs | 108 ++++++++++---------
2 files changed, 65 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e854b69b/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 431f284..0b603a0 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -72,13 +72,13 @@ switch (formtype) {
case "autoscalingpolicies":
list_data = util.RESTCalls.getPolicyAutoScale();
- if (list_data.autoscalePolicy && list_data.autoscalePolicy.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}else{
- formDataEdit = list_data.autoscalePolicy;
- for (specNumber in list_data.autoscalePolicy) {
- if (list_data.autoscalePolicy[specNumber].id == elements.action) {
- formDataEdit = list_data.autoscalePolicy[specNumber];
+ formDataEdit = list_data;
+ for (specNumber in list_data) {
+ if (list_data[specNumber].id == elements.action) {
+ formDataEdit = list_data[specNumber];
}
}
@@ -106,9 +106,9 @@ switch (formtype) {
list_data = null; //TODO endpoint doesn't return correct info
}else{
formDataEdit = list_data.kubernetesGroup;
- for (specNumber in list_data.kubernetesGroup) {
- if (list_data.kubernetesGroup[specNumber].groupId == elements.action) {
- formDataEdit = list_data.kubernetesGroup[specNumber];
+ for (specNumber in list_data) {
+ if (list_data[specNumber].groupId == elements.action) {
+ formDataEdit = list_data[specNumber];
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e854b69b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index ec0eb00..52e6105 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -91,74 +91,80 @@
{{/if}}
<div class="row general-table row-overide">
- {{#each content_body.sections.kubernetesGroup}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-gears "></i>
- </div>
- <h2 class="truncate">{{groupId}} </h2>
+ {{#ifCond formtype "==" "docker"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-gears "></i>
+ </div>
+ <h2 class="truncate">{{groupId}} </h2>
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{description}}</div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
- {{#each content_body.sections}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa icon-{{type}} fa-inbox "></i>
- </div>
- <h2 class="truncate">{{displayName}} </h2>
+ {{/each}}
+ {{/ifCond}}
+ {{#ifCond formtype "==" "cartridges"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa icon-{{type}} fa-inbox "></i>
+ </div>
+ <h2 class="truncate">{{displayName}} </h2>
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_"
+ <div class="toggle-menu-description">{{description}}</div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
</button>
+ </div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_"
+ data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
+ </button>
+ </div>
</div>
</div>
- </div>
- {{/each}}
- {{#each content_body.sections.autoscalePolicy}}
- <div class="block col-md-4 col-xs-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-expand "></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
+ {{/each}}
+ {{/ifCond}}
+ {{#ifCond formtype "==" "autoscalingpolicies"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 col-xs-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-expand "></i>
+ </div>
+ <h2 class="truncate">{{id}} </h2>
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{description}}</div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
+ {{/each}}
+ {{/ifCond}}
</div>
</div>
</div>
[03/16] stratos git commit: fix group and cartridge object issues on
application editor
Posted by im...@apache.org.
fix group and cartridge object issues on application editor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f2bfd6e3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f2bfd6e3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f2bfd6e3
Branch: refs/heads/4.1.0-test
Commit: f2bfd6e3a3dd9e9d41066709ff99cb71e3d84816
Parents: 361f6d7
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:21:27 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:21:27 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/applications-editor.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f2bfd6e3/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
index 2da8c15..4756852 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
@@ -745,9 +745,9 @@ $(document).ready(function(){
});
//get create cartridge list
- generateCartridges(cartridgeList.cartridge);
+ generateCartridges(cartridgeList);
//get group JSON
- generateGroups(groupList.groups);
+ generateGroups(groupList);
//handle single click for cartridge
$('#cartridge-list').on('click', ".block-cartridge", function(){
[07/16] stratos git commit: remove partition lisitng
Posted by im...@apache.org.
remove partition lisitng
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9761ffd1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9761ffd1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9761ffd1
Branch: refs/heads/4.1.0-test
Commit: 9761ffd1270fa982f613c6f876fa33e14b810cad
Parents: 9aa1166
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:35:51 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:35:51 2014 +0530
----------------------------------------------------------------------
.../themes/theme0/partials/configure_form.hbs | 22 --------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9761ffd1/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index d60ba99..0d34084 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -192,28 +192,6 @@
</div>
</div>
{{/each}}
- {{#each content_body.sections.partition}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-th-large"></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
-
- <div class="toggle-menu-description">{{description}} </div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/partitions/{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/partitions/{{id}}/" > Details
- </button>
- </div>
- </div>
- </div>
- {{/each}}
</div>
</div>
</div>
[12/16] stratos git commit: fix tenant listing hbs issues after data
return changes
Posted by im...@apache.org.
fix tenant listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bcd112c3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bcd112c3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bcd112c3
Branch: refs/heads/4.1.0-test
Commit: bcd112c3747225e982a2aab79c0fadd998de49da
Parents: 36a2622
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:50:20 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:50:20 2014 +0530
----------------------------------------------------------------------
.../themes/theme0/partials/users_form.hbs | 20 +++++++++++---------
.../console/users_form.jag | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bcd112c3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index 3d6dea9..9325ec1 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -93,16 +93,18 @@
</div>
{{/each}}
{{/ifCond}}
- {{#each content_body.sections.tenantInfoBean}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-building"></i>
- </div>
- <h2>{{tenantDomain}} </h2>
+ {{#ifCond formtype "==" "tenants"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-building"></i>
+ </div>
+ <h2>{{tenantDomain}} </h2>
- <div class="toggle-menu-description">{{email}} - {{createdDate}} </div>
- </div>
- {{/each}}
+ <div class="toggle-menu-description">{{email}} - {{createdDate}} </div>
+ </div>
+ {{/each}}
+ {{/ifCond}}
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bcd112c3/components/org.apache.stratos.manager.console/console/users_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/users_form.jag b/components/org.apache.stratos.manager.console/console/users_form.jag
index 9dc45c3..4c2460d 100644
--- a/components/org.apache.stratos.manager.console/console/users_form.jag
+++ b/components/org.apache.stratos.manager.console/console/users_form.jag
@@ -55,7 +55,7 @@ if (elements.formtype == 'users') {
} else if (elements.formtype == 'tenants') {
list_data = util.RESTCalls.getTenants();
- if (list_data.tenantInfoBean && list_data.tenantInfoBean.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}
}
[15/16] stratos git commit: minor fixes for application deployment
Posted by im...@apache.org.
minor fixes for application deployment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/562d07de
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/562d07de
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/562d07de
Branch: refs/heads/4.1.0-test
Commit: 562d07de1dc3ef304f16cf10ce07e6a767bc8643
Parents: 6d6f707
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 18:36:42 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 18:36:42 2014 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 8 ++++----
.../controllers/forms/schema/applications/deployments.json | 2 +-
.../console/controllers/rest/rest_calls.jag | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/562d07de/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index 6c1326a..e34cc2d 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -93,10 +93,10 @@ switch (formtype) {
if(list_data == null) {
list_data = null;
}else{
- formDataEdit = list_data.deploymentPolicy;
- for (specNumber in list_data.deploymentPolicy) {
- if (list_data.deploymentPolicy[specNumber].id == elements.action) {
- formDataEdit = list_data.deploymentPolicy[specNumber];
+ formDataEdit = list_data;
+ for (specNumber in list_data) {
+ if (list_data[specNumber].id == elements.action) {
+ formDataEdit = list_data[specNumber];
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/562d07de/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json
index c73b81f..647d028 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json
@@ -8,7 +8,7 @@
"disable_properties": true,
"disable_collapse": true
},
- "required":["id","partitionGroup"],
+ "required":[],
"properties":{
"id": {
"type":"string",
http://git-wip-us.apache.org/repos/asf/stratos/blob/562d07de/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index dab4509..4e7eb6f 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -52,7 +52,7 @@ RESTCalls = new function(){
};
this.deployDeploymentPolicyDefinition = function(policyDefinition){
- return this.send("POST","/deploymentPolicies",policyDefinition);
+ return this.send("POST","/applicationDeployments",policyDefinition);
};
this.deployAutoscalePolicyDefinition = function(policyDefinition){
[04/16] stratos git commit: fix cartridge object id missing issues on
application editor
Posted by im...@apache.org.
fix cartridge object id missing issues on application editor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7cb141db
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7cb141db
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7cb141db
Branch: refs/heads/4.1.0-test
Commit: 7cb141db95b1d6c39ea3f26a9a28fc4b34a10e2e
Parents: f2bfd6e
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:25:09 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:25:09 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/applications-editor.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7cb141db/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
index 4756852..69d93fa 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
@@ -614,7 +614,7 @@ function generateCartridges(data){
cartridgeListHtml += '<div class="block-cartridge" ' +
'data-info="'+cartridgeData.description+ '"'+
'data-toggle="tooltip" data-placement="bottom" title="Single Click to view details. Double click to add"'+
- 'id="'+cartridgeData.cartridgeType+'">'
+ 'id="'+cartridgeData.type+'">'
+ cartridgeData.displayName+
'</div>'
}
[14/16] stratos git commit: fix groups listing hbs issues after data
return changes
Posted by im...@apache.org.
fix groups listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d6f7070
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d6f7070
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d6f7070
Branch: refs/heads/4.1.0-test
Commit: 6d6f707001f64f921510af5e55cc9127b020c1be
Parents: ddda83a
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 18:03:40 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 18:03:40 2014 +0530
----------------------------------------------------------------------
.../theme0/partials/applications_form.hbs | 36 +++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d6f7070/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 2640ed2..36e9ea5 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -109,28 +109,30 @@
</div>
{{/each}}
{{/ifCond}}
- {{#each content_body.sections}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-th-large"></i>
- </div>
- <h2 class="truncate">{{name}} </h2>
+ {{#ifCond formtype "==" "groups"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-th-large"></i>
+ </div>
+ <h2 class="truncate">{{name}} </h2>
- <div class="toggle-menu-description">{{description}} </div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}"
- data-url="{{url ""}}/applications/groups/{{name}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}"
+ <div class="toggle-menu-description">{{description}} </div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}"
data-url="{{url ""}}/applications/groups/{{name}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}"
+ data-url="{{url ""}}/applications/groups/{{name}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
+ {{/each}}
+ {{/ifCond}}
</div>
</div>
</div>
[02/16] stratos git commit: added category to JSON schema
Posted by im...@apache.org.
added category to JSON schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/361f6d76
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/361f6d76
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/361f6d76
Branch: refs/heads/4.1.0-test
Commit: 361f6d76ffd54bb5ee7745211cba86024a36425c
Parents: 4aec6d3
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:12:27 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:12:27 2014 +0530
----------------------------------------------------------------------
.../forms/default/configure/cartridges.json | 1 +
.../controllers/forms/schema/configure/cartridges.json | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/361f6d76/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
index fbe9df4..780264d 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
@@ -1,5 +1,6 @@
{
"type":"php",
+ "category":"framework",
"isPublic":false,
"provider":"apache",
"host":"stratos.org",
http://git-wip-us.apache.org/repos/asf/stratos/blob/361f6d76/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
index 772b336..33c916e 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
@@ -8,7 +8,7 @@
"disable_properties": true,
"disable_collapse": true
},
- "required": ["type", "provider", "host", "displayName", "description", "version", "multiTenant", "portMapping"],
+ "required": ["type","category", "provider", "host", "displayName", "description", "version", "multiTenant", "portMapping"],
"properties": {
"type": {
"type": "string",
@@ -20,6 +20,17 @@
"propertyOrder": 1,
"maxItems": 1
},
+ "category": {
+ "type": "string",
+ "id": "root/category",
+ "id": "root/category",
+ "title": "Category",
+ "name": "Category",
+ "default": "framework",
+ "propertyOrder": 1,
+ "maxItems": 1,
+ "enum": ["application","framework","data","lb"]
+ },
"isPublic": {
"type": "boolean",
"id": "root/isPublic",
[09/16] stratos git commit: remove service definition lisitng
Posted by im...@apache.org.
remove service definition lisitng
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4c34527d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4c34527d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4c34527d
Branch: refs/heads/4.1.0-test
Commit: 4c34527dad4cd6f5b624c1e912653216544ec02f
Parents: fe94ee0
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:37:22 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:37:22 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/configure_form.hbs | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4c34527d/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index e1d1866..ec0eb00 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -113,17 +113,6 @@
</div>
</div>
{{/each}}
- {{#each content_body.sections.serviceDefinitionBean}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-gears "></i>
- </div>
- <h2 class="truncate">{{autoscalingPolicyName}} </h2>
-
- <div class="toggle-menu-description">{{cartridgeType}}</div>
-
- </div>
- {{/each}}
{{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
[16/16] stratos git commit: Merge branch '4.1.0-test' of
https://git-wip-us.apache.org/repos/asf/stratos into 4.1.0-test
Posted by im...@apache.org.
Merge branch '4.1.0-test' of https://git-wip-us.apache.org/repos/asf/stratos into 4.1.0-test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b32d45f5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b32d45f5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b32d45f5
Branch: refs/heads/4.1.0-test
Commit: b32d45f57d745a261925dffdb160036568cda086
Parents: 562d07d 03bd887
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Dec 14 22:44:44 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Dec 14 22:44:44 2014 +0530
----------------------------------------------------------------------
.../applications/dependency/DependencyTree.java | 25 +-
.../context/cluster/ClusterContextFactory.java | 4 +-
.../context/cluster/ClusterInstanceContext.java | 2 +-
.../context/cluster/VMClusterContext.java | 12 +-
.../AutoscalerTopologyEventReceiver.java | 7 +-
.../stratos/autoscaler/monitor/Monitor.java | 21 --
.../autoscaler/monitor/MonitorFactory.java | 51 ++--
.../monitor/cluster/AbstractClusterMonitor.java | 9 +-
.../monitor/cluster/ClusterMonitorFactory.java | 15 +-
.../cluster/KubernetesClusterMonitor.java | 4 +-
.../KubernetesServiceClusterMonitor.java | 4 +-
.../monitor/cluster/VMClusterMonitor.java | 15 +-
.../monitor/component/ApplicationMonitor.java | 34 +++
.../monitor/component/GroupMonitor.java | 20 +-
.../component/ParentComponentMonitor.java | 257 +++++++++----------
.../processor/group/GroupStatusProcessor.java | 9 +
.../java/org/apache/stratos/cli/RestClient.java | 15 +-
.../stratos/cli/RestCommandLineService.java | 206 ++++++---------
.../cli/commands/DescribeCartridgeCommand.java | 2 +-
.../messaging/topology/TopologyBuilder.java | 5 +-
.../rest/endpoint/api/StratosApiV41.java | 17 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 4 +-
.../src/main/conf/drools/mincheck.drl | 12 +-
.../src/main/conf/drools/obsoletecheck.drl | 10 +-
.../src/main/conf/drools/scaling.drl | 4 +-
25 files changed, 366 insertions(+), 398 deletions(-)
----------------------------------------------------------------------