adding metadata keys
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8cc5960f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8cc5960f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8cc5960f Branch: refs/heads/master Commit: 8cc5960f12b0b15f0051db2b189f544a2dea44ce Parents: ac1711b Author: reka <[email protected]> Authored: Tue May 19 15:59:48 2015 +0530 Committer: reka <[email protected]> Committed: Tue May 19 17:29:15 2015 +0530 ---------------------------------------------------------------------- .../stratos/common/beans/cartridge/CartridgeBean.java | 10 ++++++++++ .../console/controllers/configure/configure_requests.jag | 4 ++-- .../rest/endpoint/util/converter/ObjectConverter.java | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8cc5960f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java index 9915116..bb82018 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java @@ -40,6 +40,7 @@ public class CartridgeBean { private boolean multiTenant; private DeploymentBean deployment; private List<PortMappingBean> portMapping; + private String[] metadataKeys; private List<IaasProviderBean> iaasProvider; private PersistenceBean persistence; /** @@ -212,8 +213,17 @@ public class CartridgeBean { ", Deployment" + getDeploymentDetails() + ", Port Mapping: " + getPortMappings() + ", IaaS Providers: " + getIaasProviders() + + ", Metadata keys: " + getMetadataKeys() + ", Persistence " + (getPersistence() == null ? "" : getPersistence().toString()) + ", Load Balancing IP Type: " + getLoadBalancingIPType() + ", Properties: " + getProperties(); } + + public String[] getMetadataKeys() { + return metadataKeys; + } + + public void setMetadataKeys(String[] metadataKeys) { + this.metadataKeys = metadataKeys; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/8cc5960f/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag index 14835cc..87c9daa 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag @@ -52,10 +52,10 @@ try { formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload); break; case "update-groups": - formSubmit = util.RESTCalls.deleteGroup(formPayload); + formSubmit = util.RESTCalls.updateGroupDefinition(formPayload); break; case "delete-groups": - formSubmit = util.RESTCalls.updateGroupDefinition(formPayload); + formSubmit = util.RESTCalls.deleteGroup(formPayload); break; case "delete-applicationpolicies": formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload); http://git-wip-us.apache.org/repos/asf/stratos/blob/8cc5960f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index c99b77f..000da07 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -79,7 +79,7 @@ public class ObjectConverter { cartridge.setDisplayName(cartridgeBean.getDisplayName()); cartridge.setDescription(cartridgeBean.getDescription()); cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType()); - //cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys()); + cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys()); // deployment information if (cartridgeBean.getDeployment() != null) { @@ -1590,9 +1590,9 @@ public class ObjectConverter { cartridge.setDescription(cartridgeInfo.getDescription()); cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType()); - /*if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) { + if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) { cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys()); - }*/ + } //convert persistence cartridge.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence()));
