From 1b3c1cb5d96a386bd82242b6c5d403d223ed1395 Mon Sep 17 00:00:00 2001 From: gayan Date: Wed, 10 Dec 2014 12:27:17 +0530 Subject: [PATCH 1/5] update the categary of cartridge as a mandatory value --- .../controller/domain/CartridgeConfig.java | 14 +- .../controller/util/CloudControllerUtil.java | 1 + .../cartridgeagent/cartridgeagent/agent.py | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 5 + .../definition/CartridgeDefinitionBean.java | 7 +- .../bean/util/converter/PojoConverter.java | 1 + .../resources/CloudControllerService.wsdl | 334 +++++++++++++----- 7 files changed, 266 insertions(+), 98 deletions(-) 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 2513350f77..64e417a0da 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 @@ -39,6 +39,8 @@ public class CartridgeConfig implements Serializable { private String provider; + private String category; + private String displayName; private String description; @@ -311,7 +313,13 @@ public String getDeployerType() { public void setDeployerType(String deployerType) { this.deployerType = deployerType; - } - - + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } } 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 c7fc86e468..148353cec9 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 @@ -93,6 +93,7 @@ public static Cartridge toCartridge(CartridgeConfig config) { cartridge.setDeploymentDirs(Arrays.asList(deploymentDirs)); } cartridge.setProvider(config.getProvider()); + cartridge.setCategory(config.getCategory()); cartridge.setVersion(config.getVersion()); cartridge.setBaseDir(config.getBaseDir()); diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py index 7b699a6ade..d8bb7a019e 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py @@ -189,7 +189,7 @@ def on_instance_cleanup_cluster(self, msg): instance_in_payload = self.cartridge_agent_config.instance_id instance_in_event = event_obj.instance_id - if cluster_in_event == cluster_in_payload and instance_in_payload== instance_in_event: + if cluster_in_event == cluster_in_payload and instance_in_payload == instance_in_event: CartridgeAgent.extension_handler.on_instance_cleanup_cluster_event(event_obj) def register_topology_event_listeners(self): diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index c377b08aea..39d146fe7e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -107,6 +107,9 @@ public static void deployCartridge(CartridgeDefinitionBean cartridgeDefinitionBe if (cartridgeConfig == null) { throw new RestAPIException("Populated CartridgeConfig instance is null, cartridge deployment aborted"); } + if (cartridgeConfig.getCategory().equals("")|| cartridgeConfig.getCategory().isEmpty()) { + throw new RestAPIException("Category is not specified, cartridge deployment aborted"); + } try { CartridgeDeploymentManager.getDeploymentManager(cartridgeDefinitionBean.deployerType).deploy(cartridgeConfig); } catch (ADCException e) { @@ -764,6 +767,7 @@ static List getAvailableCartridgesByProvider(String provider, Configu Cartridge cartridge = new Cartridge(); cartridge.setCartridgeType(cartridgeType); cartridge.setProvider(cartridgeInfo.getProvider()); + cartridge.setCategory(cartridgeInfo.getCategory()); cartridge.setDisplayName(cartridgeInfo.getDisplayName()); cartridge.setDescription(cartridgeInfo.getDescription()); cartridge.setVersion(cartridgeInfo.getVersion()); @@ -856,6 +860,7 @@ static List getAvailableCartridges(String cartridgeSearchString, Bool Cartridge cartridge = new Cartridge(); cartridge.setCartridgeType(cartridgeType); cartridge.setProvider(cartridgeInfo.getProvider()); + cartridge.setCategory(cartridgeInfo.getCategory()); cartridge.setDisplayName(cartridgeInfo.getDisplayName()); cartridge.setDescription(cartridgeInfo.getDescription()); cartridge.setVersion(cartridgeInfo.getVersion()); 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 56dbfcf7b7..71fd764693 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 @@ -32,6 +32,9 @@ public class CartridgeDefinitionBean { public String provider; + //Four types - Application,Framework,Data,LB + public String category; + public String displayName; public String description; @@ -68,7 +71,7 @@ public class CartridgeDefinitionBean { public String toString () { - return "Type: " + type + ", Provider: " + provider + ", Host: " + host + ", Display Name: " + displayName + + 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() @@ -131,4 +134,6 @@ public String[] getExportingProperties() { public void setExportingProperties(String[] exportingProperties) { this.exportingProperties = exportingProperties; } + + } 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 128a33ecff..70a98cfad7 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 @@ -71,6 +71,7 @@ public static CartridgeConfig populateCartridgeConfigPojo(CartridgeDefinitionBea cartridgeConfig.setType(cartridgeDefinitionBean.type); cartridgeConfig.setHostName(cartridgeDefinitionBean.host); cartridgeConfig.setProvider(cartridgeDefinitionBean.provider); + cartridgeConfig.setCategory(cartridgeDefinitionBean.category); cartridgeConfig.setVersion(cartridgeDefinitionBean.version); cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.multiTenant); cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic); diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index 6e88f501be..7309a4e509 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@ -1,7 +1,24 @@ - + - + @@ -9,7 +26,8 @@ - + @@ -30,7 +48,8 @@ - + @@ -38,7 +57,8 @@ - + @@ -52,14 +72,16 @@ - + - + @@ -80,14 +102,16 @@ - + - + @@ -108,7 +132,8 @@ - + @@ -123,7 +148,8 @@ - + @@ -140,7 +166,8 @@ - + @@ -161,7 +188,8 @@ - + @@ -182,7 +210,8 @@ - + @@ -196,7 +225,8 @@ - + @@ -217,7 +247,8 @@ - + @@ -238,14 +269,16 @@ - + - + @@ -266,14 +299,16 @@ - + - + @@ -294,7 +329,8 @@ - + @@ -432,7 +468,8 @@ - + @@ -472,7 +509,8 @@ - + @@ -486,7 +524,8 @@ - + @@ -500,7 +539,8 @@ - + @@ -519,7 +559,8 @@ - + @@ -527,7 +568,8 @@ - + @@ -549,7 +591,8 @@ - + @@ -568,7 +611,8 @@ - + @@ -591,7 +635,8 @@ - + @@ -604,7 +649,8 @@ - + @@ -615,10 +661,12 @@ - + - + @@ -628,7 +676,8 @@ - + @@ -720,7 +769,9 @@ - + @@ -795,7 +846,8 @@ - + @@ -821,12 +873,14 @@ - + - + @@ -834,8 +888,10 @@ - - + + @@ -864,21 +920,26 @@ + - + - + - + - + @@ -910,7 +971,8 @@ - + @@ -923,7 +985,8 @@ - + @@ -1189,143 +1252,217 @@ - + - - + + - + - + - + - - - + + + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + @@ -1334,7 +1471,9 @@ - + @@ -1345,18 +1484,27 @@ - + - - + + - - + + @@ -2486,4 +2634,4 @@ - + \ No newline at end of file From bc9ac98258e0e1d4dc8167f2e1cb6872a1e3b99d Mon Sep 17 00:00:00 2001 From: gayan Date: Wed, 10 Dec 2014 12:53:22 +0530 Subject: [PATCH 2/5] update the categary of cartridge as a mandatory value --- .../definition/CartridgeDefinitionBean.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 71fd764693..14230fdb78 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 @@ -26,24 +26,24 @@ @XmlRootElement(name = "cartridgeDefinitionBean") public class CartridgeDefinitionBean { - public String type; + public String type; - public String host; + public String host; - public String provider; + public String provider; //Four types - Application,Framework,Data,LB public String category; - public String displayName; + public String displayName; - public String description; + public String description; - public String version; + public String version; - public boolean multiTenant; - - public boolean isPublic; + public boolean multiTenant; + + public boolean isPublic; public DeploymentBean deployment; From ad8742c0f4cd32a75022033ddb6a9940a4b1b77e Mon Sep 17 00:00:00 2001 From: gayan Date: Wed, 10 Dec 2014 12:55:38 +0530 Subject: [PATCH 3/5] update the categary of cartridge as a mandatory value --- .../controller/domain/CartridgeConfig.java | 36 +++++++------- .../controller/util/CloudControllerUtil.java | 26 +++++----- .../rest/endpoint/api/StratosApiV41Utils.java | 49 ++++++++++--------- 3 files changed, 56 insertions(+), 55 deletions(-) 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 64e417a0da..3c49786d9b 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 @@ -31,37 +31,37 @@ */ public class CartridgeConfig implements Serializable { - private static final long serialVersionUID = 3455721779991902731L; + private static final long serialVersionUID = 3455721779991902731L; - private String type; + private String type; - private String hostName; + private String hostName; - private String provider; + private String provider; private String category; - private String displayName; + private String displayName; - private String description; + private String description; - private String version; + private String version; - private boolean multiTenant; - - private boolean isPublic; + private boolean multiTenant; - private String baseDir; + private boolean isPublic; - private String[] deploymentDirs; + private String baseDir; - private PortMapping[] portMappings; - - private Persistence persistence; - - private String defaultAutoscalingPolicy; + private String[] deploymentDirs; + + private PortMapping[] portMappings; + + private Persistence persistence; + + private String defaultAutoscalingPolicy; - private String defaultDeploymentPolicy; + private String defaultDeploymentPolicy; private Properties properties; 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 148353cec9..c833911b14 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 @@ -82,20 +82,20 @@ public static Cartridge toCartridge(CartridgeConfig config) { return null; } Cartridge cartridge = new Cartridge(); - - // populate cartridge - cartridge.setType(config.getType()); - cartridge.setDisplayName(config.getDisplayName()); - cartridge.setDescription(config.getDescription()); - cartridge.setHostName(config.getHostName()); - String[] deploymentDirs = config.getDeploymentDirs(); - if((deploymentDirs != null) && (deploymentDirs.length > 0)) { - cartridge.setDeploymentDirs(Arrays.asList(deploymentDirs)); - } - cartridge.setProvider(config.getProvider()); + + // populate cartridge + cartridge.setType(config.getType()); + cartridge.setDisplayName(config.getDisplayName()); + cartridge.setDescription(config.getDescription()); + cartridge.setHostName(config.getHostName()); + String[] deploymentDirs = config.getDeploymentDirs(); + if ((deploymentDirs != null) && (deploymentDirs.length > 0)) { + cartridge.setDeploymentDirs(Arrays.asList(deploymentDirs)); + } + cartridge.setProvider(config.getProvider()); cartridge.setCategory(config.getCategory()); - cartridge.setVersion(config.getVersion()); - cartridge.setBaseDir(config.getBaseDir()); + cartridge.setVersion(config.getVersion()); + cartridge.setBaseDir(config.getBaseDir()); if (config.getPortMappings() != null) { cartridge.setPortMappings(Arrays.asList(config.getPortMappings())); diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index bb394bd61c..f17c0ba7b7 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -376,31 +376,32 @@ public static List getAvailableCartridges(String cartridgeSearchStrin continue; } - Cartridge cartridge = new Cartridge(); - cartridge.setCartridgeType(cartridgeType); - cartridge.setProvider(cartridgeInfo.getProvider()); + Cartridge cartridge = new Cartridge(); + cartridge.setCartridgeType(cartridgeType); + cartridge.setProvider(cartridgeInfo.getProvider()); cartridge.setCategory(cartridgeInfo.getCategory()); - cartridge.setDisplayName(cartridgeInfo.getDisplayName()); - cartridge.setDescription(cartridgeInfo.getDescription()); - cartridge.setVersion(cartridgeInfo.getVersion()); - cartridge.setMultiTenant(cartridgeInfo.getMultiTenant()); - cartridge.setHostName(cartridgeInfo.getHostName()); - cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy()); - cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy()); - //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED); - cartridge.setCartridgeAlias("-"); - cartridge.setPersistence(cartridgeInfo.getPersistence()); - cartridge.setServiceGroup(cartridgeInfo.getServiceGroup()); - - if (cartridgeInfo.getProperties() != null) { - for (org.apache.stratos.cloud.controller.stub.Property property : cartridgeInfo.getProperties()) { - if (property.getName().equals("load.balancer")) { - cartridge.setLoadBalancer(true); - } - } - } - //cartridge.setActiveInstances(0); - cartridges.add(cartridge); + cartridge.setDisplayName(cartridgeInfo.getDisplayName()); + cartridge.setDescription(cartridgeInfo.getDescription()); + cartridge.setVersion(cartridgeInfo.getVersion()); + cartridge.setMultiTenant(cartridgeInfo.getMultiTenant()); + cartridge.setHostName(cartridgeInfo.getHostName()); + cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy()); + cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy()); + //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED); + cartridge.setCartridgeAlias("-"); + cartridge.setPersistence(cartridgeInfo.getPersistence()); + cartridge.setServiceGroup(cartridgeInfo.getServiceGroup()); + + if (cartridgeInfo.getProperties() != null) { + for (org.apache.stratos.cloud.controller.stub.Property property : cartridgeInfo + .getProperties()) { + if (property.getName().equals("load.balancer")) { + cartridge.setLoadBalancer(true); + } + } + } + //cartridge.setActiveInstances(0); + cartridges.add(cartridge); if (cartridgeInfo.getMultiTenant() && !allowMultipleSubscription) { From 38beb6b372c53db874bd79477c00efbcef513c16 Mon Sep 17 00:00:00 2001 From: gayan Date: Wed, 10 Dec 2014 12:56:32 +0530 Subject: [PATCH 4/5] update the categary of cartridge as a mandatory value --- .../bean/util/converter/PojoConverter.java | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) 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 f0461c75a7..5b8cc66cdf 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 @@ -94,35 +94,36 @@ public class PojoConverter { public static CartridgeConfig populateCartridgeConfigPojo(CartridgeDefinitionBean cartridgeDefinitionBean) { - CartridgeConfig cartridgeConfig = new CartridgeConfig(); - - cartridgeConfig.setType(cartridgeDefinitionBean.type); - cartridgeConfig.setHostName(cartridgeDefinitionBean.host); - cartridgeConfig.setProvider(cartridgeDefinitionBean.provider); - cartridgeConfig.setCategory(cartridgeDefinitionBean.category); - cartridgeConfig.setVersion(cartridgeDefinitionBean.version); - cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.multiTenant); - cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic); - cartridgeConfig.setDisplayName(cartridgeDefinitionBean.displayName); - cartridgeConfig.setDescription(cartridgeDefinitionBean.description); - cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.defaultAutoscalingPolicy); - cartridgeConfig.setDefaultDeploymentPolicy(cartridgeDefinitionBean.defaultDeploymentPolicy); - cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.serviceGroup); - cartridgeConfig.setDeployerType(cartridgeDefinitionBean.deployerType); - - - //deployment information - if (cartridgeDefinitionBean.deployment != null) { - cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir); - if (cartridgeDefinitionBean.deployment.dir != null && !cartridgeDefinitionBean.deployment.dir.isEmpty()) { - cartridgeConfig.setDeploymentDirs(cartridgeDefinitionBean.deployment.dir. - toArray(new String[cartridgeDefinitionBean.deployment.dir.size()])); - } - } - //port mapping - if (cartridgeDefinitionBean.portMapping != null && !cartridgeDefinitionBean.portMapping.isEmpty()) { - cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.portMapping)); - } + CartridgeConfig cartridgeConfig = new CartridgeConfig(); + + cartridgeConfig.setType(cartridgeDefinitionBean.type); + cartridgeConfig.setHostName(cartridgeDefinitionBean.host); + cartridgeConfig.setProvider(cartridgeDefinitionBean.provider); + cartridgeConfig.setCategory(cartridgeDefinitionBean.category); + cartridgeConfig.setVersion(cartridgeDefinitionBean.version); + cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.multiTenant); + cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic); + cartridgeConfig.setDisplayName(cartridgeDefinitionBean.displayName); + cartridgeConfig.setDescription(cartridgeDefinitionBean.description); + cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.defaultAutoscalingPolicy); + cartridgeConfig.setDefaultDeploymentPolicy(cartridgeDefinitionBean.defaultDeploymentPolicy); + cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.serviceGroup); + cartridgeConfig.setDeployerType(cartridgeDefinitionBean.deployerType); + + //deployment information + if (cartridgeDefinitionBean.deployment != null) { + cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir); + if (cartridgeDefinitionBean.deployment.dir != null && !cartridgeDefinitionBean.deployment.dir.isEmpty()) { + cartridgeConfig.setDeploymentDirs(cartridgeDefinitionBean.deployment.dir. + toArray(new + String[cartridgeDefinitionBean.deployment.dir + .size()])); + } + } + //port mapping + if (cartridgeDefinitionBean.portMapping != null && !cartridgeDefinitionBean.portMapping.isEmpty()) { + cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.portMapping)); + } //persistance mapping if (cartridgeDefinitionBean.persistence != null) { From 8092bffd0fdc29daebb03767ff53a1c6ad9c513d Mon Sep 17 00:00:00 2001 From: gayan Date: Wed, 10 Dec 2014 12:59:08 +0530 Subject: [PATCH 5/5] update the categary of cartridge as a mandatory value --- .../bean/util/converter/PojoConverter.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) 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 5b8cc66cdf..1e5091f291 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 @@ -94,7 +94,7 @@ public class PojoConverter { public static CartridgeConfig populateCartridgeConfigPojo(CartridgeDefinitionBean cartridgeDefinitionBean) { - CartridgeConfig cartridgeConfig = new CartridgeConfig(); + CartridgeConfig cartridgeConfig = new CartridgeConfig(); cartridgeConfig.setType(cartridgeDefinitionBean.type); cartridgeConfig.setHostName(cartridgeDefinitionBean.host); @@ -110,20 +110,19 @@ public static CartridgeConfig populateCartridgeConfigPojo(CartridgeDefinitionBea cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.serviceGroup); cartridgeConfig.setDeployerType(cartridgeDefinitionBean.deployerType); - //deployment information - if (cartridgeDefinitionBean.deployment != null) { - cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir); - if (cartridgeDefinitionBean.deployment.dir != null && !cartridgeDefinitionBean.deployment.dir.isEmpty()) { - cartridgeConfig.setDeploymentDirs(cartridgeDefinitionBean.deployment.dir. - toArray(new - String[cartridgeDefinitionBean.deployment.dir - .size()])); - } - } - //port mapping - if (cartridgeDefinitionBean.portMapping != null && !cartridgeDefinitionBean.portMapping.isEmpty()) { - cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.portMapping)); - } + + //deployment information + if (cartridgeDefinitionBean.deployment != null) { + cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir); + if (cartridgeDefinitionBean.deployment.dir != null && !cartridgeDefinitionBean.deployment.dir.isEmpty()) { + cartridgeConfig.setDeploymentDirs(cartridgeDefinitionBean.deployment.dir. + toArray(new String[cartridgeDefinitionBean.deployment.dir.size()])); + } + } + //port mapping + if (cartridgeDefinitionBean.portMapping != null && !cartridgeDefinitionBean.portMapping.isEmpty()) { + cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.portMapping)); + } //persistance mapping if (cartridgeDefinitionBean.persistence != null) {