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/06/04 20:29:22 UTC
[2/3] git commit: add payload properties at subscription payload
add payload properties at subscription payload
Conflicts:
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/33f57d42
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/33f57d42
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/33f57d42
Branch: refs/heads/master
Commit: 33f57d420dd7a8edefca21611ab1cd88f805e377
Parents: fd68006
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Jun 3 17:48:58 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Jun 4 23:42:08 2014 +0530
----------------------------------------------------------------------
.../manager/CartridgeSubscriptionManager.java | 7 ++++++-
.../manager/subscription/SubscriptionData.java | 18 +++++++++---------
.../rest/endpoint/bean/CartridgeInfoBean.java | 11 +++++++++++
.../bean/util/converter/PojoConverter.java | 2 +-
.../rest/endpoint/services/ServiceUtils.java | 8 ++++++--
5 files changed, 33 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/33f57d42/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index 9d1ae68..11fcf0f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -339,7 +339,12 @@ public class CartridgeSubscriptionManager {
if(cartridgeSubscription.getPayloadData() != null) {
cartridgeSubscription.getPayloadData().add(CartridgeConstants.COMMIT_ENABLED, String.valueOf(subscriptionData.isCommitsEnabled()));
}
-
+
+ if(subscriptionData.getProperties() != null){
+ for(Property property : subscriptionData.getProperties().getProperties()){
+ cartridgeSubscription.getPayloadData().add(property.getName(), property.getValue());
+ }
+ }
log.info("Tenant [" + subscriptionData.getTenantId() + "] with username [" + subscriptionData.getTenantAdminUsername() +
" subscribed to " + "] Cartridge with Alias " + subscriptionData.getCartridgeAlias() + ", Cartridge Type: " +
http://git-wip-us.apache.org/repos/asf/stratos/blob/33f57d42/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
index 7b26063..dd40481 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
@@ -19,6 +19,7 @@
package org.apache.stratos.manager.subscription;
import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
+import org.apache.stratos.cloud.controller.stub.pojo.Properties;
import org.apache.stratos.cloud.controller.stub.pojo.Property;
import java.util.Collections;
@@ -42,12 +43,12 @@ public class SubscriptionData {
private boolean isPrivateRepository;
private String repositoryUsername;
private String repositoryPassword;
- private Property[] properties;
private PersistenceContext persistanceCtxt;
private boolean isCommitsEnabled;
private String serviceGroup;
private Set<String> domains;
private Persistence persistence;
+ private Properties properties;
public SubscriptionData() {
this.domains = new HashSet<String>();
@@ -149,14 +150,6 @@ public class SubscriptionData {
this.repositoryPassword = repositoryPassword;
}
- public Property[] getProperties() {
- return properties;
- }
-
- public void setProperties(Property[] properties) {
- this.properties = properties;
- }
-
public PersistenceContext getPersistanceContext() {
return persistanceCtxt;
}
@@ -205,4 +198,11 @@ public class SubscriptionData {
this.persistence = persistence;
}
+ public Properties getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Properties properties) {
+ this.properties = properties;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/33f57d42/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
index e011edc..4a43499 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
@@ -19,6 +19,7 @@
package org.apache.stratos.rest.endpoint.bean;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
+import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
@@ -39,6 +40,8 @@ public class CartridgeInfoBean {
private String serviceGroup;
private PersistenceBean persistence;
+ private List<PropertyBean> property;
+
public CartridgeInfoBean() {
}
@@ -145,4 +148,12 @@ public class CartridgeInfoBean {
public void setPersistence(PersistenceBean persistence) {
this.persistence = persistence;
}
+
+ public List<PropertyBean> getProperty() {
+ return property;
+ }
+
+ public void setProperty(List<PropertyBean> property) {
+ this.property = property;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/33f57d42/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 0a0fec7..dc77ad5 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
@@ -174,7 +174,7 @@ public class PojoConverter {
}
- private static Properties getProperties (List<PropertyBean> propertyBeans) {
+ public static Properties getProperties(List<PropertyBean> propertyBeans) {
//convert to an array
PropertyBean [] propertyBeansArray = new PropertyBean[propertyBeans.size()];
http://git-wip-us.apache.org/repos/asf/stratos/blob/33f57d42/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 f5eaac3..f2cd555 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
@@ -989,6 +989,10 @@ public class ServiceUtils {
if(persistenceBean != null) {
subscriptionData.setPersistence(PojoConverter.getPersistence(persistenceBean));
}
+ if(cartridgeInfoBean.getProperty() != null){
+ subscriptionData.setProperties(PojoConverter.getProperties(cartridgeInfoBean.getProperty()));
+ }
+
/*
if (cartridgeInfoBean.isPersistanceRequired()) {
if (cartridgeInfoBean.getPersistence() != null) {
@@ -1079,7 +1083,7 @@ public class ServiceUtils {
subscriptionData.setTenantId(ApplicationManagementUtil.getTenantId(configurationContext));
subscriptionData.setTenantAdminUsername(userName);
subscriptionData.setRepositoryType("git");
- //subscriptionData.setProperties(props);
+ //subscriptionData.setPayloadProperties(props);
subscriptionData.setPrivateRepository(false);
cartridgeSubscription =
@@ -1089,7 +1093,7 @@ public class ServiceUtils {
cartridgeSubscription.getPayloadData().add("LOAD_BALANCED_SERVICE_TYPE", loadBalancedCartridgeType);
Properties lbProperties = new Properties();
- lbProperties.setProperties(props);
+ lbProperties.setPayloadProperties(props);
cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription, lbProperties);
if(log.isDebugEnabled()) {