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/e8707fec Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e8707fec Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e8707fec Branch: refs/heads/4.1.0-test Commit: e8707fec10f105e8572fc688c1f0d250862c87c6 Parents: d15c5ba Author: gayan <[email protected]> Authored: Wed Dec 10 12:55:38 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 10 12:29:52 2014 +0000 ---------------------------------------------------------------------- .../controller/domain/CartridgeConfig.java | 36 +++++++------- .../controller/util/CloudControllerUtil.java | 26 +++++------ .../rest/endpoint/api/StratosApiV41Utils.java | 49 ++++++++++---------- 3 files changed, 56 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e8707fec/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java ---------------------------------------------------------------------- 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 64e417a..3c49786 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 @@ import org.apache.stratos.common.Property; */ 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; http://git-wip-us.apache.org/repos/asf/stratos/blob/e8707fec/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- 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 148353c..c833911 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 class CloudControllerUtil { 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())); http://git-wip-us.apache.org/repos/asf/stratos/blob/e8707fec/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- 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 d2fbdc9..c9b95e7 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 @@ -363,31 +363,32 @@ public class StratosApiV41Utils { 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) {
