You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/12/10 13:30:32 UTC
[4/5] stratos git commit: update the categary of cartridge as a
mandatory value
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/968d2aaf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/968d2aaf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/968d2aaf
Branch: refs/heads/4.1.0-test
Commit: 968d2aafe582804802d94cfdbf2cf9e4f746a8b8
Parents: e8707fe
Author: gayan <ga...@puppet.gayan.org>
Authored: Wed Dec 10 12:56:32 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Dec 10 12:29:52 2014 +0000
----------------------------------------------------------------------
.../bean/util/converter/PojoConverter.java | 59 ++++++++++----------
1 file changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/968d2aaf/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 f0461c7..5b8cc66 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) {