You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/07/11 20:32:30 UTC
[5/6] git commit: moving beans to manager
moving beans to manager
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fad15e2d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fad15e2d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fad15e2d
Branch: refs/heads/4.0.0-grouping
Commit: fad15e2d66a7fe8b648241f43602e42a8d0d1800
Parents: e22f59f
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Jul 11 20:01:58 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Jul 11 20:01:58 2014 +0530
----------------------------------------------------------------------
.../application/beans/CartridgeDefinition.java | 69 ++++++++++++++++++++
.../application/beans/ComponentDefinition.java | 54 +++++++++++++++
.../beans/CompositeAppDefinition.java | 21 +++---
.../application/beans/SubscribableInfo.java | 10 +++
.../DefaultCompositeApplicationParser.java | 49 ++++++--------
.../definition/CartridgeDefinition.java | 15 -----
.../definition/ComponentDefinition.java | 40 ------------
.../CompositeApplicationDefinitionBean.java | 17 -----
.../definition/ConfigDependencies.java | 57 ----------------
.../bean/util/converter/PojoConverter.java | 8 +--
.../rest/endpoint/services/ServiceUtils.java | 5 +-
.../rest/endpoint/services/StratosAdmin.java | 18 +++--
12 files changed, 182 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
new file mode 100644
index 0000000..7788dc6
--- /dev/null
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
@@ -0,0 +1,69 @@
+package org.apache.stratos.manager.composite.application.beans;
+
+
+public class CartridgeDefinition {
+ private String alias;
+ private String type;
+ private String deploymentPolicy;
+ private String autoscalingPolicy;
+ private String repoUrl;
+ private boolean privateRepo;
+ private String username;
+ private String password;
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ 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 privateRepo;
+ }
+
+ public void setPrivateRepo(boolean privateRepo) {
+ this.privateRepo = privateRepo;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
new file mode 100644
index 0000000..6a2ab2b
--- /dev/null
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
@@ -0,0 +1,54 @@
+package org.apache.stratos.manager.composite.application.beans;
+
+import java.util.List;
+
+/**
+ * Created by udara on 7/11/14.
+ */
+public class ComponentDefinition {
+ private String group;
+ private String alias;
+ private List<SubscribableInfo> subscribables;
+ private String deploymentPolicy;
+ private String autoscalingPolicy;
+
+ public String getGroup() {
+ return group;
+ }
+
+ public void setGroup(String group) {
+ this.group = group;
+ }
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public List<SubscribableInfo> getSubscribables() {
+ return subscribables;
+ }
+
+ public void setSubscribables(List<SubscribableInfo> subscribables) {
+ this.subscribables = subscribables;
+ }
+
+ 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;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CompositeAppDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CompositeAppDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CompositeAppDefinition.java
index 2eea073..477e098 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CompositeAppDefinition.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CompositeAppDefinition.java
@@ -29,10 +29,9 @@ public class CompositeAppDefinition {
private String alias;
- private List<GroupDefinition> groups;
-
- private List<SubscribableInfo> subscribableInfo;
+ private List<ComponentDefinition> components;
+ private List<CartridgeDefinition> cartridges;
public String getApplicationId() {
return applicationId;
@@ -50,19 +49,19 @@ public class CompositeAppDefinition {
this.alias = alias;
}
- public List<GroupDefinition> getGroups() {
- return groups;
+ public List<ComponentDefinition> getComponents() {
+ return components;
}
- public void setGroups(List<GroupDefinition> groups) {
- this.groups = groups;
+ public void setComponents(List<ComponentDefinition> components) {
+ this.components = components;
}
- public List<SubscribableInfo> getSubscribableInfo() {
- return subscribableInfo;
+ public List<CartridgeDefinition> getCartridges() {
+ return cartridges;
}
- public void setSubscribableInfo(List<SubscribableInfo> subscribableInfo) {
- this.subscribableInfo = subscribableInfo;
+ public void setCartridges(List<CartridgeDefinition> cartridges) {
+ this.cartridges = cartridges;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java
index e3b26ba..0190599 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java
@@ -21,6 +21,8 @@ package org.apache.stratos.manager.composite.application.beans;
public class SubscribableInfo {
+ private String type;
+
private String alias;
private String deploymentPolicy;
@@ -90,4 +92,12 @@ public class SubscribableInfo {
public void setPassword(String password) {
this.password = password;
}
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
index da560a9..8e67c80 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
@@ -19,11 +19,9 @@
package org.apache.stratos.manager.composite.application.parser;
+import org.apache.commons.lang3.StringUtils;
import org.apache.stratos.cloud.controller.stub.pojo.CompositeApplicationDefinition;
-import org.apache.stratos.manager.composite.application.beans.CompositeAppDefinition;
-import org.apache.stratos.manager.composite.application.beans.GroupDefinition;
-import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition;
-import org.apache.stratos.manager.composite.application.beans.SubscribableInfo;
+import org.apache.stratos.manager.composite.application.beans.*;
import org.apache.stratos.manager.exception.CompositeApplicationDefinitionException;
import org.apache.stratos.manager.exception.PersistenceManagerException;
import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
@@ -56,53 +54,48 @@ public class DefaultCompositeApplicationParser implements CompositeApplicationPa
}
String compositeAppId = compositeAppDefinition.getApplicationId();
+ if(StringUtils.isEmpty(compositeAppId)){
+ throw new CompositeApplicationDefinitionException("Application ID can not be empty");
+ }
String compositeAppAlias = compositeAppDefinition.getAlias();
- // groups
- processGroups(compositeAppDefinition.getGroups());
-
- // get subscription related information
- if (compositeAppDefinition.getSubscribableInfo() != null) {
- // get the set (flat structure, not recursive) iterate and fill in..
- }
+ // components
+ processComponents(compositeAppDefinition.getComponents());
return null;
}
// TODO: should return the relevant object type to send to CC
- private void processGroups (List<GroupDefinition> groups) throws CompositeApplicationDefinitionException {
+ private void processComponents(List<ComponentDefinition> components) throws CompositeApplicationDefinitionException {
- if (groups == null) {
+ if (components == null) {
return;
}
- for (GroupDefinition group : groups) {
+ for (ComponentDefinition component : components) {
// process the group definitions
- String groupName = group.getName();
- String groupAlias = group.getAlias();
+ String groupName = component.getGroup();
+ String groupAlias = component.getAlias();
// neither group name nor alias can be empty
- if (groupName == null || groupName.isEmpty()) {
+ if (StringUtils.isEmpty(groupName)) {
throw new CompositeApplicationDefinitionException("Group Name is invalid");
}
- if (groupAlias == null || groupAlias.isEmpty()) {
+ if (StringUtils.isEmpty(groupAlias)) {
throw new CompositeApplicationDefinitionException("Group Alias is invalid");
}
// check if the group is deployed. if not can't continue
if (!isGroupDeployed(groupName)) {
- throw new CompositeApplicationDefinitionException("No Service Group found with name [ " + groupName + " ]");
+ throw new CompositeApplicationDefinitionException(String.format("No Service Group found with name [ %s ]", groupName));
}
// get group level policy information
- String groupDepPolicy = group.getDeploymentPolicy();
- String groupScalePolicy = group.getAutoscalingPolicy();
+ String groupDepPolicy = component.getDeploymentPolicy();
+ String groupScalePolicy = component.getAutoscalingPolicy();
// subscribables
- processSubscribables(group.getSubscribables());
-
- // nested groups
- processGroups(group.getGroups());
+ processSubscribables(component.getSubscribables());
}
}
@@ -121,13 +114,13 @@ public class DefaultCompositeApplicationParser implements CompositeApplicationPa
}
// TODO: should return the relevant object type to send to CC
- private void processSubscribables (List<SubscribableDefinition> subscribables) throws CompositeApplicationDefinitionException {
+ private void processSubscribables (List<SubscribableInfo> subscribables) throws CompositeApplicationDefinitionException {
if (subscribables == null) {
return;
}
- for (SubscribableDefinition subscribable : subscribables) {
+ for (SubscribableInfo subscribable : subscribables) {
String cartridgeType = subscribable.getType();
String subscriptionAlias = subscribable.getAlias();
@@ -139,7 +132,7 @@ public class DefaultCompositeApplicationParser implements CompositeApplicationPa
if (subscriptionAlias == null || subscriptionAlias.isEmpty()) {
throw new CompositeApplicationDefinitionException("Subscription Alias is invalid");
}
-
+ // TODO should validate if there exist a cartridge with $cartridgeType
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/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
deleted file mode 100644
index ccd1662..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CartridgeDefinition.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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/fad15e2d/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
deleted file mode 100644
index 3207557..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ComponentDefinition.java
+++ /dev/null
@@ -1,40 +0,0 @@
-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/fad15e2d/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
deleted file mode 100644
index a0b1624..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import java.util.List;
-
-@XmlRootElement(name = "applicationDefinitionBean")
-
-public class CompositeApplicationDefinitionBean {
-
- public String applicationId;
- public String alias;
- public List<ComponentDefinition> components;
- public List<CartridgeDefinition> cartridges;
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java
deleted file mode 100644
index 5efd201..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "dependencies")
-public class ConfigDependencies {
- public List<Pair> startup_order = new ArrayList<Pair>();
- public String kill_behavior;
-
- /*
- public String getKill_behavior() {
- return kill_behavior;
- }
-
- public void setKill_behavior(String kill_behavior) {
- this.kill_behavior = kill_behavior;
- }
-
- public List<Pair> getStartup_order() {
- return startup_order;
- }
-
- public void setStartup_order(List<Pair> startup_order) {
- this.startup_order = startup_order;
- }
- */
-
-
- public static class Pair {
- private String key;
- private String value;
-
- private Pair() {}
-
- public Pair(String key, String value) {
- this.key = key;
- this.value = value;
- }
-
- public String getKey() {
- return key;
- }
- public void setKey(String key) {
- this.key = key;
- }
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/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 4abbefc..b47ac0d 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,12 +29,7 @@ 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.ConfigDependencies;
import org.apache.stratos.rest.endpoint.bean.topology.Member;
-import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
import org.apache.commons.logging.Log;
import java.util.ArrayList;
@@ -703,6 +698,7 @@ public class PojoConverter {
}
*/
// grouping
+ /*
public static CompositeApplicationDefinition convertToCompositeApplicationForCC (CompositeApplicationDefinitionBean appBean) {
CompositeApplicationDefinition configApp = new CompositeApplicationDefinition();
@@ -770,5 +766,5 @@ public class PojoConverter {
return configApp;
}
-
+ */
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/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 7458b96..468c67a 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
@@ -66,7 +66,6 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.Autosca
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CompositeApplicationDefinitionBean;
import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payload;
import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
@@ -208,7 +207,7 @@ public class ServiceUtils {
stratosAdminResponse.setMessage("Successfully deployed application definition w" + applicationDefinitionBean);
return stratosAdminResponse;
} */
-
+ /*
static StratosAdminResponse deployCompositeApplicationDefinition (CompositeApplicationDefinitionBean compositeApplicationDefinition, ConfigurationContext ctxt,
String userName, String tenantDomain) throws RestAPIException {
@@ -251,7 +250,7 @@ public class ServiceUtils {
stratosAdminResponse.setMessage("Successfully deployed composite application to cloud controller");
return stratosAdminResponse;
}
-
+*/
static StratosAdminResponse deployCompositeApplicationDefintion (CompositeAppDefinition compositeAppDefinition)
throws RestAPIException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/fad15e2d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index 5262163..8cdf16b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -41,7 +41,6 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.Autosca
import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CompositeApplicationDefinitionBean;
import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payload;
import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
@@ -108,6 +107,7 @@ public class StratosAdmin extends AbstractAdmin {
entity(Utils.buildAuthenticationSuccessMessage(sessionId)).build();
}
+ /*
@POST
@Path("/application/definition/")
@Produces("application/json")
@@ -118,13 +118,23 @@ public class StratosAdmin extends AbstractAdmin {
public StratosAdminResponse deployApplicationDefinition(CompositeApplicationDefinitionBean applicationDefinitionBean)
throws RestAPIException {
- /*return ServiceUtils.deployApplication(applicationDefinitionBean, getConfigContext(), getUsername(),
- getTenantDomain());
- */
return ServiceUtils.deployCompositeApplicationDefinition(applicationDefinitionBean, getConfigContext(), getUsername(),
getTenantDomain());
}
+*/
+ @POST
+ @Path("/application/definition/")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ @SuperTenantService(true)
+ // Grouping
+ public StratosAdminResponse deployApplicationDefinition(CompositeAppDefinition applicationDefinitionBean)
+ throws RestAPIException {
+ return ServiceUtils.deployCompositeApplicationDefintion(applicationDefinitionBean);
+
+ }
/* @POST
@Path("/application/definition/")