Repository: stratos Updated Branches: refs/heads/grouping 19273e1d5 -> 308f6d34f
change CompositeApplication according to the last Json format Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e22f59f3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e22f59f3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e22f59f3 Branch: refs/heads/grouping Commit: e22f59f3bbd3a516d20c05202ce9fdb0dd81dabc Parents: 19273e1 Author: Udara Liyanage <[email protected]> Authored: Fri Jul 11 12:02:36 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Fri Jul 11 12:02:36 2014 +0530 ---------------------------------------------------------------------- .../beans/SubscribableDefinition.java | 55 ++++++++++++++++++++ .../RegistryBasedPersistenceManager.java | 2 +- .../definition/CartridgeDefinition.java | 15 ++++++ .../definition/ComponentDefinition.java | 40 ++++++++++++++ .../CompositeApplicationDefinitionBean.java | 4 +- .../definition/ConfigCartridge.java | 8 --- .../definition/ConfigGroup.java | 35 ------------- .../bean/util/converter/PojoConverter.java | 16 +++--- .../rest/endpoint/services/ServiceUtils.java | 4 +- 9 files changed, 123 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableDefinition.java index 291594b..d85f235 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableDefinition.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableDefinition.java @@ -28,6 +28,13 @@ public class SubscribableDefinition { private String alias; + private String deploymentPolicy; + private String autoscalingPolicy; + private String repoUrl; + private boolean isPrivateRepo; + private String repoUsername; + private String repoPassword; + public String getType() { return type; @@ -44,4 +51,52 @@ public class SubscribableDefinition { public void setAlias(String alias) { this.alias = alias; } + + public String getDeploymentPolicy() { + return deploymentPolicy; + } + + public void setDeploymentPolicy(String deploymentPolicy) { + this.deploymentPolicy = deploymentPolicy; + } + + public String getAutoscalingPolicy() { + return autoscalingPolicy; + } + + public void setAutoscalingPolicy(String autoscalingPolicy) { + this.autoscalingPolicy = autoscalingPolicy; + } + + public String getRepoUrl() { + return repoUrl; + } + + public void setRepoUrl(String repoUrl) { + this.repoUrl = repoUrl; + } + + public boolean isPrivateRepo() { + return isPrivateRepo; + } + + public void setPrivateRepo(boolean isPrivateRepo) { + this.isPrivateRepo = isPrivateRepo; + } + + public String getRepoUsername() { + return repoUsername; + } + + public void setRepoUsername(String repoUsername) { + this.repoUsername = repoUsername; + } + + public String getRepoPassword() { + return repoPassword; + } + + public void setRepoPassword(String repoPassword) { + this.repoPassword = repoPassword; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java index f4eb8ba..50bd56b 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java @@ -228,7 +228,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager { throws PersistenceManagerException { if (log.isDebugEnabled()) { - log.debug("trying to persiste ConfigCompositeApplication [ " + configCompositeAapplication.getAlias() + " ]"); + log.debug(String.format("trying to persist ConfigCompositeApplication [ %s ]", configCompositeAapplication.getAlias())); } int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); if (tenantId != MultitenantConstants.SUPER_TENANT_ID) { http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CartridgeDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CartridgeDefinition.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CartridgeDefinition.java new file mode 100644 index 0000000..ccd1662 --- /dev/null +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CartridgeDefinition.java @@ -0,0 +1,15 @@ +package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "cartridge") +public class CartridgeDefinition { + public String alias; + public String type; + private String deploymentPolicy; + private String autoscalingPolicy; + private String repoUrl; + private boolean privateRepo; + private String username; + private String password; +} http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ComponentDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ComponentDefinition.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ComponentDefinition.java new file mode 100644 index 0000000..3207557 --- /dev/null +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ComponentDefinition.java @@ -0,0 +1,40 @@ +package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition; + +import org.apache.stratos.manager.composite.application.beans.SubscribableInfo; + +import java.util.List; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "components") +public class ComponentDefinition { + public String group; + public String alias; + public List<SubscribableInfo> subscribables; + public ConfigDependencies dependencies; + public String deploymentPolicy; + public String autoscalingPolicy; + + /* + public String getAlias() { + return alias; + } + public void setAlias(String alias) { + this.alias = alias; + } + public List<String> getSubscribables() { + return subscribables; + } + public void setSubscribables(List<String> subscribables) { + this.subscribables = subscribables; + } + public ConfigDependencies getDependencies() { + return dependencies; + } + public void setDependencies(ConfigDependencies dependencies) { + this.dependencies = dependencies; + } + */ + + +} http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java index 2efc62b..a0b1624 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java @@ -10,8 +10,8 @@ public class CompositeApplicationDefinitionBean { public String applicationId; public String alias; - public List<ConfigGroup> components; - public List<ConfigCartridge> cartridges; + public List<ComponentDefinition> components; + public List<CartridgeDefinition> cartridges; } http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java deleted file mode 100644 index 85d57ce..0000000 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "cartridge") -public class ConfigCartridge { - public String alias; -} http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java deleted file mode 100644 index bbdd0e3..0000000 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition; - -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "components") -public class ConfigGroup { - public String alias; - public List<String> subscribables; - public ConfigDependencies dependencies; - - /* - public String getAlias() { - return alias; - } - public void setAlias(String alias) { - this.alias = alias; - } - public List<String> getSubscribables() { - return subscribables; - } - public void setSubscribables(List<String> subscribables) { - this.subscribables = subscribables; - } - public ConfigDependencies getDependencies() { - return dependencies; - } - public void setDependencies(ConfigDependencies dependencies) { - this.dependencies = dependencies; - } - */ - - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/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 6a771aa..4abbefc 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 @@ -29,10 +29,10 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.*; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.*; +import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CartridgeDefinition; +import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ComponentDefinition; import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CompositeApplicationDefinitionBean; -import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigCartridge; import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigDependencies; -import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigGroup; import org.apache.stratos.rest.endpoint.bean.topology.Member; import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication; import org.apache.commons.logging.Log; @@ -654,7 +654,7 @@ public class PojoConverter { private static Log log = LogFactory.getLog(PojoConverter.class); - + /* public static ConfigCompositeApplication convertToCompositeApplication(CompositeApplicationDefinitionBean appBean) { ConfigCompositeApplication configApp = new ConfigCompositeApplication(); @@ -664,7 +664,7 @@ public class PojoConverter { List<org.apache.stratos.messaging.domain.topology.ConfigCartridge> configCartridges = new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigCartridge>(); - for (ConfigCartridge beanCartridge : appBean.cartridges ) { + for (CartridgeDefinition beanCartridge : appBean.cartridges ) { org.apache.stratos.messaging.domain.topology.ConfigCartridge configCartridge = new org.apache.stratos.messaging.domain.topology.ConfigCartridge(); configCartridge.setAlias(beanCartridge.alias); @@ -676,7 +676,7 @@ public class PojoConverter { List<org.apache.stratos.messaging.domain.topology.ConfigGroup> configGroups = new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigGroup>(); - for (ConfigGroup beanGroup : appBean.components ) { + for (ComponentDefinition beanGroup : appBean.components ) { org.apache.stratos.messaging.domain.topology.ConfigGroup configGroup = new org.apache.stratos.messaging.domain.topology.ConfigGroup(); configGroup.setAlias(beanGroup.alias); @@ -701,7 +701,7 @@ public class PojoConverter { return configApp; } - + */ // grouping public static CompositeApplicationDefinition convertToCompositeApplicationForCC (CompositeApplicationDefinitionBean appBean) { CompositeApplicationDefinition configApp = new CompositeApplicationDefinition(); @@ -714,7 +714,7 @@ public class PojoConverter { List<org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge> configCartridges = new ArrayList<org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge>(); - for (ConfigCartridge beanCartridge : appBean.cartridges ) { + for (CartridgeDefinition beanCartridge : appBean.cartridges ) { org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge configCartridge = new org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge(); configCartridge.setAlias(beanCartridge.alias); @@ -729,7 +729,7 @@ public class PojoConverter { List<org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup> configGroups = new ArrayList<org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup>(); - for (ConfigGroup beanGroup : appBean.components ) { + for (ComponentDefinition beanGroup : appBean.components ) { org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup configGroup = new org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup(); configGroup.setAlias(beanGroup.alias); http://git-wip-us.apache.org/repos/asf/stratos/blob/e22f59f3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 879370b..7458b96 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -144,7 +144,7 @@ public class ServiceUtils { applicationDefinitionBean.alias); if (applicationDefinitionBean.components != null) { log.debug("application config groups size " + applicationDefinitionBean.components.size()); - for (ConfigGroup cfg : applicationDefinitionBean.components) { + for (ComponentDefinition cfg : applicationDefinitionBean.components) { log.debug("listing application config groups " + cfg.alias + " /sub " + cfg.subscribables + " /dep " + cfg.dependencies); if (cfg.dependencies != null) { @@ -1440,7 +1440,7 @@ public class ServiceUtils { log.info("Successfully deployed the Service Group Definition with name " + serviceGroupDefinition.getName()); StratosAdminResponse stratosAdminResponse = new StratosAdminResponse(); - stratosAdminResponse.setMessage("Successfully deplpoyed Service Group Definition with name " + serviceGroupDefinition.getName()); + stratosAdminResponse.setMessage("Successfully deployed Service Group Definition with name " + serviceGroupDefinition.getName()); return stratosAdminResponse; }
