Repository: stratos Updated Branches: refs/heads/4.1.0-test 52e780279 -> d7627b81c
update the categary of cartridge as a mandatory value Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d7627b81 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d7627b81 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d7627b81 Branch: refs/heads/4.1.0-test Commit: d7627b81c8a025b014de534f2034fdc15d6eda33 Parents: 968d2aa Author: gayan <[email protected]> Authored: Wed Dec 10 12:59:08 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 10 12:29:52 2014 +0000 ---------------------------------------------------------------------- .../bean/util/converter/PojoConverter.java | 29 ++++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d7627b81/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 5b8cc66..1e5091f 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 class PojoConverter { 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) {
