removing snapshotID from persistance mapping and adding persistanceRequired boolean value
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/10188053 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/10188053 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/10188053 Branch: refs/heads/master Commit: 101880537d739f76d848f114bbb793edb0df76c0 Parents: 14f52b0 Author: Udara Liyanage <[email protected]> Authored: Wed Feb 12 11:48:59 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Feb 12 11:48:59 2014 -0500 ---------------------------------------------------------------------- .../controller/pojo/PersistanceMapping.java | 27 +++++++------------- .../cloud/controller/pojo/Registrant.java | 9 ------- .../definition/PersistanceMappingBean.java | 4 +-- .../bean/util/converter/PojoConverter.java | 2 +- .../main/resources/CloudControllerService.wsdl | 6 ++--- 5 files changed, 15 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10188053/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/PersistanceMapping.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/PersistanceMapping.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/PersistanceMapping.java index f555b0a..520de4d 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/PersistanceMapping.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/PersistanceMapping.java @@ -23,32 +23,16 @@ import java.io.Serializable; public class PersistanceMapping implements Serializable{ private static final long serialVersionUID = 3455721979991902731L; - private String snapshotId; + private boolean persistanceRequired; private int size; private String device; private boolean removeOntermination; public String toString () { - return "Snapshot: " + snapshotId + ", Size: " + size + ", device: " + device + " remove on termination " + removeOntermination; + return "Persistance Required: " + isPersistanceRequired() + ", Size: " + size + ", device: " + device + " remove on termination " + removeOntermination; } /** - * @return the snapshotId - */ - public String getSnapshotId() { - return snapshotId; - } - - - - /** - * @param snapshotId the snapshotId to set - */ - public void setSnapshotId(String snapshotId) { - this.snapshotId = snapshotId; - } - - /** * @return the size */ public int getSize() { @@ -90,4 +74,11 @@ public class PersistanceMapping implements Serializable{ this.removeOntermination = removeOntermination; } + public boolean isPersistanceRequired() { + return persistanceRequired; + } + + public void setPersistanceRequired(boolean persistanceRequired) { + this.persistanceRequired = persistanceRequired; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10188053/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java index aa429a1..fe7a7e9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java @@ -33,7 +33,6 @@ public class Registrant { private Properties properties; private String autoScalerPolicyName; private String deploymentPolicyName; - private boolean isPersistant; public String getTenantRange() { return tenantRange; @@ -92,12 +91,4 @@ public class Registrant { properties + ", autoScalerPolicyName=" + autoScalerPolicyName + ", deploymentPolicyName=" + deploymentPolicyName + "]"; } - - public boolean isPersistant() { - return isPersistant; - } - - public void setPersistant(boolean isPersistant) { - this.isPersistant = isPersistant; - } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10188053/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistanceMappingBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistanceMappingBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistanceMappingBean.java index 2b7229d..4fc446f 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistanceMappingBean.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistanceMappingBean.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class PersistanceMappingBean { - public String snapshotId; + public boolean persistanceRequired; public int size; @@ -33,6 +33,6 @@ public class PersistanceMappingBean { public boolean removeOnTermination; public String toString () { - return " [ Snapshot : " + snapshotId + ", Size: " + size + ", device: " + device + " remove on termination " + removeOnTermination +"] "; + return " [ Persistance Required : " + persistanceRequired + ", Size: " + size + ", device: " + device + " remove on termination " + removeOnTermination +"] "; } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10188053/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index bf89549..cdea1a1 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -96,7 +96,7 @@ public class PojoConverter { { System.out.println("persistance bean " + persistBeanArr[i].toString()); PersistanceMapping persistMapping = new PersistanceMapping(); - persistMapping.setSnapshotId(persistBeanArr[i].snapshotId); + persistMapping.setPersistanceRequired(persistBeanArr[i].persistanceRequired); persistMapping.setDevice(persistBeanArr[i].device); persistMapping.setSize(persistBeanArr[i].size); persistMapping.setRemoveOntermination(persistBeanArr[i].removeOnTermination); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10188053/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index 97b1f13..c51895b 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@ -234,7 +234,7 @@ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="initTime" type="xs:long"/> - <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> @@ -331,9 +331,9 @@ <xs:complexType name="PersistanceMapping"> <xs:sequence> <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"/> <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"/> <xs:element minOccurs="0" name="size" type="xs:int"/> - <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -862,4 +862,4 @@ <http:address location="https://10.100.0.38:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> </wsdl:port> </wsdl:service> -</wsdl:definitions> +</wsdl:definitions> \ No newline at end of file
