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:21 UTC
[15/16] stratos git commit: minor fixes for application deployment
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){