You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/01/31 06:10:31 UTC
[3/9] stratos git commit: Add metadataKeys to the cartridge
Add metadataKeys to the cartridge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d71d5f4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d71d5f4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d71d5f4
Branch: refs/heads/master
Commit: 6d71d5f473d5512c61d9096f24f220fe5e52956b
Parents: 624f6c7
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Thu Jan 29 19:50:27 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Sat Jan 31 10:21:50 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/domain/Cartridge.java | 9 +
.../controller/domain/CartridgeConfig.java | 13 +-
.../impl/CloudControllerServiceImpl.java | 3 -
.../controller/util/CloudControllerUtil.java | 2 +
.../common/beans/cartridge/CartridgeBean.java | 9 +
.../util/converter/ObjectConverter.java | 1 +
samples/cartridges/mock/tomcat.json | 4 +-
.../main/resources/CloudControllerService.wsdl | 1009 +++++++++++++-----
8 files changed, 804 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
index c81f064..b849170 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
@@ -51,6 +51,7 @@ public class Cartridge implements Serializable{
private Persistence persistence;
private List<AppType> appTypeMappings;
private String serviceGroup;
+ private String[] metadataKeys;
/**
* Property map of this Cartridge.
@@ -381,4 +382,12 @@ public class Cartridge implements Serializable{
public void setTenantPartitions(String tenantPartitions) {
this.tenantPartitions = tenantPartitions;
}
+
+ public String[] getMetadataKeys() {
+ return metadataKeys;
+ }
+
+ public void setMetadataKeys(String[] metadataKeys) {
+ this.metadataKeys = metadataKeys;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
index 7fbc9f6..b1253d2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
@@ -19,12 +19,12 @@
package org.apache.stratos.cloud.controller.domain;
-import java.io.Serializable;
-
import org.apache.commons.lang3.ArrayUtils;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
+import java.io.Serializable;
+
/**
* This class is used as the pojo for supporting the service at CC,
* which is called by the Rest API in SM to deploy a cartridge definition
@@ -55,6 +55,7 @@ public class CartridgeConfig implements Serializable {
private String serviceGroup;
private String[] exportingProperties;
private String deployerType;
+ private String[] metadataKeys;
public String getType() {
return type;
@@ -302,4 +303,12 @@ public class CartridgeConfig implements Serializable {
public void setTenantPartitions(String tenantPartitions) {
this.tenantPartitions = tenantPartitions;
}
+
+ public String[] getMetadataKeys() {
+ return metadataKeys;
+ }
+
+ public void setMetadataKeys(String[] metadataKeys) {
+ this.metadataKeys = metadataKeys;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 05525cc..d7a5a7c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -1089,9 +1089,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
CloudControllerContext.getInstance().addClusterContext(clusterContext);
Cartridge cartridge=CloudControllerContext.getInstance().getCartridge(clusterContext.getCartridgeType());
- if(cartridge.getCategory().equals("lb")){
-
- }
// Create cluster object
Cluster cluster = new Cluster(appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(),
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 641fb9f..897c4d1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -108,6 +108,8 @@ public class CloudControllerUtil {
cartridge.setDefaultAutoscalingPolicy(config.getDefaultAutoscalingPolicy());
cartridge.setDefaultDeploymentPolicy(config.getDefaultDeploymentPolicy());
cartridge.setServiceGroup(config.getServiceGroup());
+ cartridge.setMetadataKeys(config.getMetadataKeys());
+
org.apache.stratos.common.Properties props = config.getProperties();
if (props != null) {
for (Property prop : props.getProperties()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
index 8fb4156..6c7f46b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
@@ -47,6 +47,7 @@ public class CartridgeBean {
private String serviceGroup;
private List<PropertyBean> property;
private List<String> exportingProperties;
+ private String[] metadataKeys;
public String toString () {
@@ -250,4 +251,12 @@ public class CartridgeBean {
public void setTenantPartitions(String tenantPartitions) {
this.tenantPartitions = tenantPartitions;
}
+
+ public String[] getMetadataKeys() {
+ return metadataKeys;
+ }
+
+ public void setMetadataKeys(String[] metadataKeys) {
+ this.metadataKeys = metadataKeys;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/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 a8650e6..fe42898 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
@@ -87,6 +87,7 @@ public class ObjectConverter {
cartridgeConfig.setDefaultDeploymentPolicy(cartridgeBean.getDefaultDeploymentPolicy());
cartridgeConfig.setServiceGroup(cartridgeBean.getServiceGroup());
cartridgeConfig.setTenantPartitions(cartridgeBean.getTenantPartitions());
+ cartridgeConfig.setMetadataKeys(cartridgeBean.getMetadataKeys());
//deployment information
if (cartridgeBean.getDeployment() != null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d71d5f4/samples/cartridges/mock/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/tomcat.json b/samples/cartridges/mock/tomcat.json
index 9fdca91..aff0622 100755
--- a/samples/cartridges/mock/tomcat.json
+++ b/samples/cartridges/mock/tomcat.json
@@ -42,5 +42,7 @@
}
]
}
- ]
+ ],
+ "metadataKeys":["writeparam1","writeparam2"]
+
}