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 2015/01/19 14:36:31 UTC
[1/5] stratos git commit: add redirect logic on application adding
success
Repository: stratos
Updated Branches:
refs/heads/master b042d78ad -> 5f42ffdc7
add redirect logic on application adding success
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5f42ffdc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5f42ffdc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5f42ffdc
Branch: refs/heads/master
Commit: 5f42ffdc7730c42f253720d30eb714e6671e3c3a
Parents: 51d22b3
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Jan 19 18:25:16 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 19:06:20 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/applications-editor.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f42ffdc/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 6718317..2a5eae5 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
@@ -683,6 +683,9 @@ $(document).ready(function(){
var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
} else {
var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
+ window.setTimeout(function(){
+ window.location.href = '../';
+ }, 1500);
}
}
})
[5/5] stratos git commit: add autoscaling policies to application
editor dropdown
Posted by im...@apache.org.
add autoscaling policies to application editor dropdown
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/958eee30
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/958eee30
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/958eee30
Branch: refs/heads/master
Commit: 958eee30804d1ce17dfbfbbf2e2ae247ec8f1396
Parents: b72dcd9
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Jan 19 16:29:26 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 19:06:20 2015 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 4 +++-
.../themes/theme0/js/custom/applications-editor.js | 12 +++++++++++-
.../themes/theme0/partials/applications_editor.hbs | 1 +
.../themes/theme0/renderers/applications_form.js | 1 +
4 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/958eee30/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 15b91a0..49fa9b5 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -32,7 +32,7 @@ var log = new Log("apachestratos.applications_form"),
uriMatcher = new URIMatcher(request.getRequestURI()),
elements = uriMatcher.match('/{context}/applications/{formtype}/'),
breadcrumbPathLevelOne = 'applications',
- formDataEdit = topologyData = editorGroups = editorCartridges = applicationHbs ='',
+ formDataEdit = topologyData = editorGroups = editorCartridges = editorAutoscalePolicies = applicationHbs ='',
isEdit = isForm = false,
userPermissions = session.get('PERMISSIONS');
@@ -65,6 +65,7 @@ if (!elements) {
applicationHbs = 'applicationEditor';
editorGroups = util.RESTCalls.getGroups();
editorCartridges = util.RESTCalls.getCartridges();
+ editorAutoscalePolicies = util.RESTCalls.getPolicyAutoScales();
}else if(elements.formtype == 'groups' && elements.action == 'new'){
applicationHbs = 'applicationsGroupEditor';
editorCartridges = util.RESTCalls.getCartridges();
@@ -122,6 +123,7 @@ var caramelData = {
topologyData: JSON.stringify(topologyData),
editorGroups: JSON.stringify(editorGroups),
editorCartridges: JSON.stringify(editorCartridges),
+ editorAutoscalePolicies: JSON.stringify(editorAutoscalePolicies),
applicationHbs: applicationHbs,
applicationName:applicationName,
applicationJSON:JSON.stringify(applicationJSON),
http://git-wip-us.apache.org/repos/asf/stratos/blob/958eee30/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 30a379c..6718317 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
@@ -494,6 +494,7 @@ var cartridgeBlockTemplate = {
"id": "root/subscribableInfo/autoscalingPolicy",
"default": "autoscale_policy_1",
"title":"Auto-scaling Policy: ",
+ "enum": [],
"required":false
},
"artifactRepository": {
@@ -534,7 +535,7 @@ var cartridgeBlockDefault = {
"cartridgeMax":2,
"subscribableInfo":{
"alias":"alias2",
- "autoscalingPolicy":"autoscale_policy_1",
+ "autoscalingPolicy":"",
"artifactRepository":{
"privateRepo":"true",
"repoUrl":"http://xxx:10080/git/default.git",
@@ -721,6 +722,15 @@ $(document).ready(function(){
if(blockType == 'cartridge' || blockType == 'group-cartridge'){
startval = cartridgeBlockDefault;
startval['type'] = ctype;
+ //get list of autosacles
+ var policies = editorAutoscalePolicies;
+ var policiesEnum = [];
+ for(var i=0; i<policies.length; i++){
+ policiesEnum.push(policies[i].id);
+ }
+
+ cartridgeBlockTemplate['properties']['subscribableInfo']['properties']['autoscalingPolicy']['enum']
+ =policiesEnum;
}else{
startval = groupBlockDefault;
startval['name'] = ctype;
http://git-wip-us.apache.org/repos/asf/stratos/blob/958eee30/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
index 0fb9dd3..771cb7d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
@@ -148,4 +148,5 @@
//use for application generation;
var cartridgeList = {{{editorCartridges}}};
var groupList = {{{editorGroups}}};
+ var editorAutoscalePolicies = {{{editorAutoscalePolicies}}};
</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/958eee30/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 fe30daf..8ad5bfa 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
@@ -269,6 +269,7 @@ var render = function (theme, data, meta, require) {
appName: data.appName,
editorCartridges: data.editorCartridges,
editorGroups:data.editorGroups,
+ editorAutoscalePolicies: data.editorAutoscalePolicies,
form_action: data.form_action,
formHtml: data.formHtml,
formData: data.formData,
[3/5] stratos git commit: add repository update to application schema
Posted by im...@apache.org.
add repository update to application schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b72dcd93
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b72dcd93
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b72dcd93
Branch: refs/heads/master
Commit: b72dcd93697f6d8abf6bd7ae357c7c25ec4c4d8e
Parents: b042d78
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Jan 19 16:00:07 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 19:06:20 2015 +0530
----------------------------------------------------------------------
.../theme0/js/custom/applications-editor.js | 66 ++++++++++++--------
1 file changed, 39 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b72dcd93/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 3c658fe..30a379c 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
@@ -459,60 +459,69 @@ var cartridgeBlockTemplate = {
"type":"string",
"id": "root/type",
"default": "name",
+ "title": "Cartridge Type: ",
"required":false
},
"cartridgeMax": {
"type":"number",
"id": "root/cartridgeMax",
"default":2,
+ "title":"Cartridge Max",
"required":false
},
"cartridgeMin": {
"type":"number",
"id": "root/cartridgeMin",
+ "title":"Cartridge Min",
"default":1,
"required":false
},
"subscribableInfo": {
"type":"object",
"id": "root/subscribableInfo",
+ "title":"Subscribable Info: ",
"required":false,
"properties":{
"alias": {
"type":"string",
"id": "root/subscribableInfo/alias",
"default": "alias2",
+ "title":"Alias: ",
"required":false
},
"autoscalingPolicy": {
"type":"string",
"id": "root/subscribableInfo/autoscalingPolicy",
"default": "autoscale_policy_1",
+ "title":"Auto-scaling Policy: ",
"required":false
},
- "privateRepo": {
- "type":"string",
- "id": "root/subscribableInfo/privateRepo",
- "default": "true",
- "required":false
- },
- "repoPassword": {
- "type":"string",
- "id": "root/subscribableInfo/repoPassword",
- "default": "password",
- "required":false
- },
- "repoURL": {
- "type":"string",
- "id": "root/subscribableInfo/repoURL",
- "default": "http://xxx:10080/git/default.git",
- "required":false
- },
- "repoUsername": {
- "type":"string",
- "id": "root/subscribableInfo/repoUsername",
- "default": "user",
- "required":false
+ "artifactRepository": {
+ "id": "root/subscribableInfo/artifactRepository",
+ "type": "object",
+ "properties": {
+ "privateRepo": {
+ "id": "root/subscribableInfo/artifactRepository/privateRepo",
+ "title":"Private Repository: ",
+ "type": "boolean"
+ },
+ "repoUrl": {
+ "id": "root/subscribableInfo/artifactRepository/repoUrl",
+ "title":"Repository URL: ",
+ "type": "string"
+ },
+ "repoUsername": {
+ "id": "root/subscribableInfo/artifactRepository/repoUsername",
+ "title":"Repository Username: ",
+ "type": "string"
+ },
+ "repoPassword": {
+ "id": "root/subscribableInfo/artifactRepository/repoPassword",
+ "title":"Repository Password: ",
+ "type": "string",
+ "format":"password"
+ }
+ }
}
}
}
@@ -526,10 +535,13 @@ var cartridgeBlockDefault = {
"subscribableInfo":{
"alias":"alias2",
"autoscalingPolicy":"autoscale_policy_1",
- "privateRepo":"true",
- "repoPassword":"password",
- "repoURL":"http://xxx:10080/git/default.git",
- "repoUsername":"user"
+ "artifactRepository":{
+ "privateRepo":"true",
+ "repoUrl":"http://xxx:10080/git/default.git",
+ "repoUsername":"user",
+ "repoPassword":"password",
+ }
+
}
};
[2/5] stratos git commit: add setTimeOut redirect logic on success
Posted by im...@apache.org.
add setTimeOut redirect logic on success
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/227aef0a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/227aef0a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/227aef0a
Branch: refs/heads/master
Commit: 227aef0a84e55838ab407a08a702e9a4c699c8e0
Parents: 958eee3
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Jan 19 18:21:18 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 19:06:20 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/configure_form.hbs | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/227aef0a/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 dc041ea..a5d3bde 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
@@ -330,6 +330,9 @@
var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
} else {
var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
+ window.setTimeout(function(){
+ window.location.href = '../';
+ }, 1500);
}
}
})
[4/5] stratos git commit: add redirect logic on success
Posted by im...@apache.org.
add redirect logic on success
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/51d22b32
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/51d22b32
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/51d22b32
Branch: refs/heads/master
Commit: 51d22b32a7970ae874ab23ffa4b8ceedabdaa8b0
Parents: 227aef0
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Jan 19 18:24:01 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 19:06:20 2015 +0530
----------------------------------------------------------------------
.../themes/theme0/js/custom/applications_group_editor.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/51d22b32/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
index fa5f100..17d9908 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
@@ -327,7 +327,7 @@ var groupBlockTemplate = {
},
"required": [
"name",
- "isGroupScalingEnabled",
+ "groupScalingEnabled",
"dependencies"
]
}
@@ -367,11 +367,14 @@ $(document).ready(function(){
var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
} else {
var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
+ window.setTimeout(function(){
+ window.location.href = '../';
+ }, 1500);
}
}
})
.always(function () {
- btn.html('Add Group Definition');
+ btn.html('Add Cartridge Group Definition');
});
});