You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/13 17:58:36 UTC

stratos git commit: Removing load balancer configuration from cartridge definition

Repository: stratos
Updated Branches:
  refs/heads/4.1.0-test 6e860f4b5 -> 9c7abbbe4


Removing load balancer configuration from cartridge definition


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9c7abbbe
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9c7abbbe
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9c7abbbe

Branch: refs/heads/4.1.0-test
Commit: 9c7abbbe4b11f30ff084989b140658dd06e6585c
Parents: 6e860f4
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 13 22:28:11 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 13 22:28:28 2014 +0530

----------------------------------------------------------------------
 .../cartridge/definition/CartridgeDefinitionBean.java   | 12 +-----------
 .../endpoint/bean/util/converter/PojoConverter.java     |  4 ----
 2 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/9c7abbbe/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 14230fd..b5d346c 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
@@ -53,8 +53,6 @@ public class CartridgeDefinitionBean {
 
     public List<IaasProviderBean> iaasProvider;
 
-    public LoadBalancerBean loadBalancer;
-
     public List<PropertyBean> property;
     
     public String defaultAutoscalingPolicy;
@@ -74,7 +72,7 @@ public class CartridgeDefinitionBean {
         return "Type: " + type + ", Provider: " + provider + ", Category: " + category+ ", Host: " + host + ", Display Name: " + displayName +
                 ", Description: " + description +  ", Version: " + version + ", Multitenant " + multiTenant +", Public " + isPublic + "\n" +
                 getDeploymentDetails() + "\n PortMapping: " + getPortMappings() + "\n IaaS: " + getIaasProviders() +
-                "\n LoadBalancer: " + getLoadBalancerInfo() + "\n Properties: " + getProperties() +"\n VolumeBean mappings "+ persistence.toString()
+                "\n Properties: " + getProperties() +"\n VolumeBean mappings "+ persistence.toString()
                 + "\n Exports " + exportingProperties.toString();
     }
 
@@ -86,14 +84,6 @@ public class CartridgeDefinitionBean {
         return null;
     }
 
-    private String getLoadBalancerInfo() {
-
-        if(loadBalancer != null) {
-            return loadBalancer.toString();
-        }
-        return null;
-    }
-
     private String getPortMappings () {
 
         StringBuilder portMappingBuilder = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/stratos/blob/9c7abbbe/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 8afc315..53557f1 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
@@ -133,10 +133,6 @@ public class PojoConverter {
         if (cartridgeDefinitionBean.iaasProvider != null && !cartridgeDefinitionBean.iaasProvider.isEmpty()) {
             cartridgeConfig.setIaasConfigs(getIaasConfigsAsArray(cartridgeDefinitionBean.iaasProvider));
         }
-        //LB
-        if (cartridgeDefinitionBean.loadBalancer != null) {
-            cartridgeConfig.setLbConfig(getLBConfig(cartridgeDefinitionBean.loadBalancer));
-        }
         //Properties
         if (cartridgeDefinitionBean.property != null && !cartridgeDefinitionBean.property.isEmpty()) {
             cartridgeConfig.setProperties(getCCProperties(cartridgeDefinitionBean.property));