You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/02/26 07:55:42 UTC
[1/2] git commit: adding support for to get valid deployment policies
Repository: incubator-stratos
Updated Branches:
refs/heads/master fbcb4a062 -> 35304c14e
adding support for to get valid deployment policies
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2715d276
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2715d276
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2715d276
Branch: refs/heads/master
Commit: 2715d276b3a6372b3ef136d014cd932228e07cb2
Parents: 6fd2b5d
Author: rekathiru <rt...@gmail.com>
Authored: Wed Feb 26 12:25:01 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Wed Feb 26 12:25:01 2014 +0530
----------------------------------------------------------------------
.../console/subscribe_cartridge.jag | 2 +-
.../org.apache.stratos.manager.console/console/util/utility.jag | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2715d276/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
index 3fd8f78..eb31666 100644
--- a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
+++ b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
@@ -4,7 +4,7 @@ var caramel = require('caramel');
var utils = require('/util/utility.jag');
var type = request.getParameter('cartridgeType');
var autoScalePolicies = utils.consoleAppUtil.getAutoScalePolicies();
-var deploymentPolicies = utils.consoleAppUtil.getDeploymentPolicies();
+var deploymentPolicies = utils.consoleAppUtil.getApplicableDeploymentPolicies(type);
var cartridge = utils.consoleAppUtil.getSingleTenantCartridgeInfo(type);
caramel.render({
cartridge:cartridge,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2715d276/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 527f2f8..d3891b9 100644
--- a/components/org.apache.stratos.manager.console/console/util/utility.jag
+++ b/components/org.apache.stratos.manager.console/console/util/utility.jag
@@ -156,6 +156,10 @@ consoleAppUtil = new function(){
return this.sendReceive("GET","/policy/deployment",{}).data;
};
+ this.getApplicableDeploymentPolicies = function(cartridgeType){
+ return this.sendReceive("GET","/" + cartridgeType + "/policy/deployment",{}).data;
+ };
+
this.getPartitions = function(){
return this.sendReceive("GET","/partition",{}).data;
};
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/35304c14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/35304c14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/35304c14
Branch: refs/heads/master
Commit: 35304c14eec156088ac571218797c6904faa2f93
Parents: 2715d27 fbcb4a0
Author: rekathiru <rt...@gmail.com>
Authored: Wed Feb 26 12:25:25 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Wed Feb 26 12:25:25 2014 +0530
----------------------------------------------------------------------
.../controller/topology/TopologyBuilder.java | 44 ++++++++++----------
1 file changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------