Repository: stratos Updated Branches: refs/heads/4.1.0-beta-deployment-policy-fix 686c0b89e -> 714cbc5f3
adding deployment policy reference to cartridge group Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b21ecca8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b21ecca8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b21ecca8 Branch: refs/heads/4.1.0-beta-deployment-policy-fix Commit: b21ecca8b6172ce9e442f992e9ad5179ea4dd6cd Parents: 686c0b8 Author: R-Rajkumar <[email protected]> Authored: Thu Feb 19 13:01:53 2015 +0530 Committer: R-Rajkumar <[email protected]> Committed: Thu Feb 19 13:01:53 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/applications/pojo/GroupContext.java | 6 +++--- .../common/beans/application/GroupReferenceBean.java | 11 ++++++++++- .../rest/endpoint/util/converter/ObjectConverter.java | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b21ecca8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java index 4f8686f..f440e11 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java @@ -33,7 +33,7 @@ public class GroupContext implements Serializable{ private int groupMaxInstances; - //private String deploymentPolicy; + private String deploymentPolicy; //private boolean isGroupInstanceMonitoringEnabled; @@ -128,13 +128,13 @@ public class GroupContext implements Serializable{ this.cartridgeContexts = cartridgeContexts; } - /* public String getDeploymentPolicy() { + public String getDeploymentPolicy() { return deploymentPolicy; } public void setDeploymentPolicy(String deploymentPolicy) { this.deploymentPolicy = deploymentPolicy; - }*/ + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/b21ecca8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java index a4d00b2..16f5592 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java @@ -22,6 +22,7 @@ package org.apache.stratos.common.beans.application; import org.apache.stratos.common.beans.cartridge.CartridgeReferenceBean; import javax.xml.bind.annotation.XmlRootElement; + import java.io.Serializable; import java.util.List; @@ -35,6 +36,7 @@ public class GroupReferenceBean implements Serializable { private int groupMinInstances; private int groupMaxInstances; private boolean isGroupScalingEnabled; + private String deploymentPolicy; private List<CartridgeReferenceBean> cartridges; private List<GroupReferenceBean> groups; @@ -93,5 +95,12 @@ public class GroupReferenceBean implements Serializable { public void setGroups(List<GroupReferenceBean> groups) { this.groups = groups; } - + + public String getDeploymentPolicy() { + return deploymentPolicy; + } + + public void setDeploymentPolicy(String deploymentPolicy) { + this.deploymentPolicy = deploymentPolicy; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/b21ecca8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 20d14ef..05ac03a 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1503,6 +1503,7 @@ public class ObjectConverter { groupContext.setGroupMaxInstances(groupDefinition.getGroupMaxInstances()); groupContext.setGroupMinInstances(groupDefinition.getGroupMinInstances()); groupContext.setGroupScalingEnabled(groupDefinition.isGroupScalingEnabled()); + groupContext.setDeploymentPolicy(groupDefinition.getDeploymentPolicy()); // Groups if (groupDefinition.getGroups() != null) { @@ -1869,7 +1870,7 @@ public class ObjectConverter { npRef.setNetworkPartitionId(np.getId()); nprList.add(npRef); } - applicationPolicy.setNetworkPartitionReference(nprList + applicationPolicy.setNetworkPartitionReferences(nprList .toArray(new ApplicationPolicyNetworkPartitionReference[nprList.size()])); return applicationPolicy; }
