resolving STRATOS-938
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d73fd92b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d73fd92b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d73fd92b Branch: refs/heads/docker-grouping-merge Commit: d73fd92bc6d509a0cd8ffb9f69e55a8d80ae145c Parents: 2c603d0 Author: Udara Liyanage <[email protected]> Authored: Wed Nov 5 14:44:35 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Nov 5 14:44:50 2014 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 2 +- .../stratos/autoscaler/pojo/Dependencies.java | 10 +- .../deployer/DefaultServiceGroupDeployer.java | 7 +- .../src/main/resources/AutoScalerService.wsdl | 686 +++++++++---------- 4 files changed, 352 insertions(+), 353 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d73fd92b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 9af36ff..9be2fa2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -579,7 +579,7 @@ public class DefaultApplicationParser implements ApplicationParser { assert serviceGroup != null; if (serviceGroup.getDependencies() != null) { - return serviceGroup.getDependencies().getKillBehaviour(); + return serviceGroup.getDependencies().getTerminationBehaviour(); } return null; http://git-wip-us.apache.org/repos/asf/stratos/blob/d73fd92b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java index 4403e6c..551e58d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java @@ -26,14 +26,14 @@ public class Dependencies implements Serializable { private String [] startupOrders; - private String killBehaviour; + private String terminationBehaviour; - public String getKillBehaviour() { - return killBehaviour; + public String getTerminationBehaviour() { + return terminationBehaviour; } - public void setKillBehaviour(String killBehaviour) { - this.killBehaviour = killBehaviour; + public void setTerminationBehaviour(String killBehaviour) { + this.terminationBehaviour = killBehaviour; } public String[] getStartupOrders() { http://git-wip-us.apache.org/repos/asf/stratos/blob/d73fd92b/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 2dedcd2..24ec9d6 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 @@ -22,12 +22,11 @@ package org.apache.stratos.manager.grouping.deployer; import org.apache.axis2.AxisFault; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.autoscaler.pojo.xsd.Dependencies; import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; import org.apache.stratos.autoscaler.stub.AutoScalerServiceAutoScalerExceptionException; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidServiceGroupExceptionException; -import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidServiceGroupExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.autoscaler.pojo.xsd.Dependencies; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.exception.ADCException; @@ -265,7 +264,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { } // validate termination behavior validateTerminationBehavior(depDefs.getTerminationBehaviour()); - deps.setKillBehaviour(depDefs.getTerminationBehaviour()); + deps.setTerminationBehaviour(depDefs.getTerminationBehaviour()); servicegroup.setDependencies(deps); } @@ -287,7 +286,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { depsDef.setStartupOrders(startupOrdersDef); } - depsDef.setTerminationBehaviour(deps.getKillBehaviour()); + depsDef.setTerminationBehaviour(deps.getTerminationBehaviour()); servicegroupDef.setDependencies(depsDef); }
