You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/02/11 07:39:37 UTC
[2/3] git commit: adding defaultDeploymentPolicy
adding defaultDeploymentPolicy
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d765dcaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d765dcaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d765dcaf
Branch: refs/heads/master
Commit: d765dcaff0944d01b6e2c18b29b5c4579d1768d7
Parents: 033086a
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Feb 11 01:38:40 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Feb 11 01:38:40 2014 -0500
----------------------------------------------------------------------
.../cloud/controller/pojo/CartridgeConfig.java | 10 +
.../cloud/controller/pojo/CartridgeInfo.java | 10 +
.../definition/CartridgeDefinitionBean.java | 2 +
.../bean/util/converter/PojoConverter.java | 3 +
.../main/resources/CloudControllerService.wsdl | 604 ++++++++++---------
5 files changed, 328 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d765dcaf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
index 6b46ec5..ef60b3c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
@@ -53,6 +53,8 @@ public class CartridgeConfig implements Serializable {
private String defaultAutoscalingPolicy;
+ private String defaultDeploymentPolicy;
+
private Properties properties;
private IaasConfig[] iaasConfigs;
@@ -249,4 +251,12 @@ public class CartridgeConfig implements Serializable {
public void setPersistanceMappings(PersistanceMapping [] persistanceMappings) {
this.persistanceMappings = persistanceMappings;
}
+
+ public String getDefaultDeploymentPolicy() {
+ return defaultDeploymentPolicy;
+ }
+
+ public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) {
+ this.defaultDeploymentPolicy = defaultDeploymentPolicy;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d765dcaf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
index 89977d2..cb06bb4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
@@ -51,6 +51,8 @@ public class CartridgeInfo {
private Property[] properties;
private String defaultAutoscalingPolicy;
+
+ private String defaultDeploymentPolicy;
private LoadbalancerConfig lbConfig;
@@ -180,4 +182,12 @@ public class CartridgeInfo {
public void setLbConfig(LoadbalancerConfig lbConfig) {
this.lbConfig = lbConfig;
}
+
+ public String getDefaultDeploymentPolicy() {
+ return defaultDeploymentPolicy;
+ }
+
+ public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) {
+ this.defaultDeploymentPolicy = defaultDeploymentPolicy;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d765dcaf/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
index 5466a51..62759f8 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
@@ -54,6 +54,8 @@ public class CartridgeDefinitionBean {
public String defaultAutoscalingPolicy;
+ public String defaultDeploymentPolicy;
+
public String toString () {
return "Type: " + type + ", Provider: " + provider + ", Host: " + host + ", Display Name: " + displayName +
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d765dcaf/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 3d3b814..8300426 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
@@ -46,6 +46,9 @@ public class PojoConverter {
cartridgeConfig.setDisplayName(cartridgeDefinitionBean.displayName);
cartridgeConfig.setDescription(cartridgeDefinitionBean.description);
cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.defaultAutoscalingPolicy);
+ cartridgeConfig.setDefaultDeploymentPolicy(cartridgeDefinitionBean.defaultDeploymentPolicy);
+
+
//deployment information
if(cartridgeDefinitionBean.deployment != null) {