Repository: stratos Updated Branches: refs/heads/master 26d09fbf1 -> 223ebfff6
Removing tenant partitions from cartridge bean Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1be6f64d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1be6f64d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1be6f64d Branch: refs/heads/master Commit: 1be6f64db3a1b4db00a460a014f41c52e861b221 Parents: a651a78 Author: Vishanth <[email protected]> Authored: Tue May 19 11:20:39 2015 +0530 Committer: Vishanth <[email protected]> Committed: Tue May 19 11:20:39 2015 +0530 ---------------------------------------------------------------------- .../stratos/common/beans/cartridge/CartridgeBean.java | 10 ---------- .../controllers/forms/default/configure/cartridges.json | 1 - .../controllers/forms/schema/configure/cartridges.json | 10 ---------- .../rest/endpoint/util/converter/ObjectConverter.java | 3 --- 4 files changed, 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1be6f64d/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 7f41830..9915116 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 @@ -40,7 +40,6 @@ public class CartridgeBean { private boolean multiTenant; private DeploymentBean deployment; private List<PortMappingBean> portMapping; - private String tenantPartitions; private List<IaasProviderBean> iaasProvider; private PersistenceBean persistence; /** @@ -192,14 +191,6 @@ public class CartridgeBean { this.property = property; } - public String getTenantPartitions() { - return tenantPartitions; - } - - public void setTenantPartitions(String tenantPartitions) { - this.tenantPartitions = tenantPartitions; - } - public String getLoadBalancingIPType() { return loadBalancingIPType; } @@ -220,7 +211,6 @@ public class CartridgeBean { ", Multi-Tenant " + isMultiTenant() + ", Deployment" + getDeploymentDetails() + ", Port Mapping: " + getPortMappings() + - ", Tenant Partitions: " + getTenantPartitions() + ", IaaS Providers: " + getIaasProviders() + ", Persistence " + (getPersistence() == null ? "" : getPersistence().toString()) + ", Load Balancing IP Type: " + getLoadBalancingIPType() + http://git-wip-us.apache.org/repos/asf/stratos/blob/1be6f64d/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json index cefb303..236dfaf 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json @@ -7,7 +7,6 @@ "description":"PHP Cartridge", "version":"7", "multiTenant":"false", - "tenantPartitions": "[1-100]", "loadBalancingIPType": "private", "portMapping":[ { http://git-wip-us.apache.org/repos/asf/stratos/blob/1be6f64d/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json index fba6f5d..c0e2499 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json @@ -100,16 +100,6 @@ "maxItems": 1, "enum": ["private","public"] }, - "tenantPartitions": { - "type": "string", - "id": "root/tenantPartitions", - "title": "Tenant Partitions", - "name": "Tenant Partitions", - "minLength":2, - "default": "[1-10][11-100]", - "propertyOrder": 1, - "maxItems": 1 - }, "portMapping": { "type": "array", "id": "root/portMapping", http://git-wip-us.apache.org/repos/asf/stratos/blob/1be6f64d/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 3add8f8..33a71ee 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 @@ -78,7 +78,6 @@ public class ObjectConverter { cartridge.setMultiTenant(cartridgeBean.isMultiTenant()); cartridge.setDisplayName(cartridgeBean.getDisplayName()); cartridge.setDescription(cartridgeBean.getDescription()); - cartridge.setTenantPartitions(cartridgeBean.getTenantPartitions()); cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType()); //cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys()); @@ -1597,8 +1596,6 @@ public class ObjectConverter { cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys()); }*/ - cartridge.setTenantPartitions(cartridgeInfo.getTenantPartitions()); - //convert persistence cartridge.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence()));
