Repository: stratos Updated Branches: refs/heads/master 786b8d9af -> 95422e9ad
Adding scaling order parameter to stratos manager dependency definition Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/95422e9a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/95422e9a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/95422e9a Branch: refs/heads/master Commit: 95422e9ad570e12cce916f0b42245d27162e12ef Parents: 786b8d9 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Nov 12 12:54:44 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Nov 12 12:54:44 2014 +0530 ---------------------------------------------------------------------- .../grouping/definitions/DependencyDefinitions.java | 14 ++++++++++++-- .../deployer/DefaultServiceGroupDeployer.java | 8 +++++++- 2 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/95422e9a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/DependencyDefinitions.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/DependencyDefinitions.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/DependencyDefinitions.java index 7510a21..3b71e8e 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/DependencyDefinitions.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/DependencyDefinitions.java @@ -30,8 +30,10 @@ public class DependencyDefinitions implements Serializable { * */ private static final long serialVersionUID = 1L; - - private List<String> startupOrders; + + private List<String> startupOrders; + + private List<String> scalingOrders; private String terminationBehaviour; @@ -50,4 +52,12 @@ public class DependencyDefinitions implements Serializable { public void setStartupOrders(List<String> startupOrders) { this.startupOrders = startupOrders; } + + public List<String> getScalingOrders() { + return scalingOrders; + } + + public void setScalingOrders(List<String> scalingOrders) { + this.scalingOrders = scalingOrders; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/95422e9a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index 0f1a986..0a70f8c 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -282,10 +282,16 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { DependencyDefinitions depsDef = new DependencyDefinitions(); String [] startupOrders = deps.getStartupOrders(); if (startupOrders != null && startupOrders[0] != null) { - List<String> startupOrdersDef = Arrays.asList(startupOrders); + List<String> startupOrdersDef = Arrays.asList(startupOrders); depsDef.setStartupOrders(startupOrdersDef); } + String [] scalingOrders = deps.getScalingOrders(); + if (scalingOrders != null && scalingOrders[0] != null) { + List<String> scalingOrdersDef = Arrays.asList(scalingOrders); + depsDef.setStartupOrders(scalingOrdersDef); + } + depsDef.setTerminationBehaviour(deps.getTerminationBehaviour()); servicegroupDef.setDependencies(depsDef); }
