You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/18 11:37:30 UTC
[2/4] stratos git commit: Removing metadata keys
Removing metadata keys
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d54fab10
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d54fab10
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d54fab10
Branch: refs/heads/master
Commit: d54fab101818c6e2b2c1604b0f9e043391e7a93f
Parents: f6ef5ff
Author: reka <rt...@gmail.com>
Authored: Mon May 18 12:37:50 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon May 18 14:39:14 2015 +0530
----------------------------------------------------------------------
.../stratos/common/beans/cartridge/CartridgeBean.java | 10 ----------
.../rest/endpoint/util/converter/ObjectConverter.java | 6 +++---
2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d54fab10/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 9bd9e78..7f41830 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,7 +47,6 @@ public class CartridgeBean {
* Load balancing ip type: public|private
*/
private String loadBalancingIPType;
- private String[] metadataKeys;
private List<PropertyBean> property;
private String getDeploymentDetails() {
@@ -209,14 +208,6 @@ public class CartridgeBean {
this.loadBalancingIPType = loadBalancingIPType;
}
- public String[] getMetadataKeys() {
- return metadataKeys;
- }
-
- public void setMetadataKeys(String[] metadataKeys) {
- this.metadataKeys = metadataKeys;
- }
-
public String toString() {
return "Type: " + getType() +
@@ -233,7 +224,6 @@ public class CartridgeBean {
", IaaS Providers: " + getIaasProviders() +
", Persistence " + (getPersistence() == null ? "" : getPersistence().toString()) +
", Load Balancing IP Type: " + getLoadBalancingIPType() +
- ", Metadata Keys: " + getMetadataKeys() +
", Properties: " + getProperties();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d54fab10/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 921bfdc..3add8f8 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
@@ -80,7 +80,7 @@ public class ObjectConverter {
cartridge.setDescription(cartridgeBean.getDescription());
cartridge.setTenantPartitions(cartridgeBean.getTenantPartitions());
cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType());
- cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys());
+ //cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys());
// deployment information
if (cartridgeBean.getDeployment() != null) {
@@ -1593,9 +1593,9 @@ public class ObjectConverter {
cartridge.setDescription(cartridgeInfo.getDescription());
cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType());
- if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) {
+ /*if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) {
cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys());
- }
+ }*/
cartridge.setTenantPartitions(cartridgeInfo.getTenantPartitions());