You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/12/11 15:27:39 UTC
[1/7] git commit: merging
Updated Branches:
refs/heads/master e078a1104 -> e62bdd774
merging
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e62bdd77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e62bdd77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e62bdd77
Branch: refs/heads/master
Commit: e62bdd7748e71887c0dbb021cf4e8bca7bab767f
Parents: 76b79f5
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 19:53:38 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/topology/TopologyBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e62bdd77/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index 42b400e..19c279b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -26,11 +26,11 @@ import org.apache.stratos.cloud.controller.pojo.ClusterContext;
import org.apache.stratos.cloud.controller.pojo.PortMapping;
import org.apache.stratos.cloud.controller.pojo.Registrant;
import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
-import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.messaging.domain.topology.*;
import org.apache.stratos.messaging.event.instance.status.InstanceActivatedEvent;
import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
+import org.apache.stratos.messaging.util.Constants;
import java.util.List;
import java.util.Properties;
[6/7] git commit: setting lb type (default/service etc.) property
while subscribing
Posted by ni...@apache.org.
setting lb type (default/service etc.) property while subscribing
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/76b79f51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/76b79f51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/76b79f51
Branch: refs/heads/master
Commit: 76b79f510e91e8a7eaab854f0535564768ceee92
Parents: 271bb5c
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 19:38:17 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../rest/endpoint/services/ServiceUtils.java | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/76b79f51/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 de951e1..7c7cb84 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
@@ -51,6 +51,7 @@ import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.wso2.carbon.context.PrivilegedCarbonContext;
+import java.beans.PropertyVetoException;
import java.util.*;
import java.util.regex.Pattern;
@@ -610,10 +611,10 @@ public class ServiceUtils {
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
- CartridgeInfo cartridgeConfig;
+ CartridgeInfo cartridgeInfo;
try {
- cartridgeConfig = cloudControllerServiceClient.getCartridgeInfo(cartridgeType);
+ cartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(cartridgeType);
} catch (Exception e) {
String msg = "Cannot get cartridge info: " + cartridgeType;
log.error(msg, e);
@@ -623,7 +624,7 @@ public class ServiceUtils {
boolean isLb = false;
// analyze properties and pick up, if not a LB.
- org.apache.stratos.cloud.controller.pojo.Property[] properties = cartridgeConfig.getProperties();
+ org.apache.stratos.cloud.controller.pojo.Property[] properties = cartridgeInfo.getProperties();
if (properties != null ) {
for (org.apache.stratos.cloud.controller.pojo.Property prop :
properties) {
@@ -641,9 +642,11 @@ public class ServiceUtils {
}
}
+ org.apache.stratos.cloud.controller.pojo.Property lbRefProp = null;
+
if (!isLb) {
// if not an LB Cartridge
- LoadbalancerConfig lbConfig = cartridgeConfig.getLbConfig();
+ LoadbalancerConfig lbConfig = cartridgeInfo.getLbConfig();
if (lbConfig == null || lbConfig.getProperties() == null) {
if (log.isDebugEnabled()) {
@@ -665,7 +668,9 @@ public class ServiceUtils {
Properties lbProperties = lbConfig.getProperties();
for (org.apache.stratos.cloud.controller.pojo.Property prop : lbProperties.getProperties()) {
-
+ // lb ref prop
+ lbRefProp = prop;
+
// TODO make following a chain of responsibility pattern
if (Constants.NO_LOAD_BALANCER.equals(prop.getName())) {
if ("true".equals(prop.getValue())) {
@@ -775,9 +780,10 @@ public class ServiceUtils {
}
}
- CartridgeSubscription cartridgeSubscription = cartridgeSubsciptionManager.subscribeToCartridge(cartridgeType,
+ CartridgeSubscription cartridgeSubscription = cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(cartridgeType,
alias.trim(), autoscalingPolicy, deploymentPolicy ,tenantDomain, ApplicationManagementUtil.getTenantId(configurationContext),
- userName, "git", repoURL, privateRepo, repoUsername, repoPassword);
+ userName, "git", repoURL, privateRepo, repoUsername, repoPassword,
+ lbRefProp != null ? new org.apache.stratos.cloud.controller.pojo.Property[]{lbRefProp}:null);
if(dataCartridgeAlias != null && !dataCartridgeAlias.trim().isEmpty()) {
[2/7] git commit: a new operation to set properties while subscribing
Posted by ni...@apache.org.
a new operation to set properties while subscribing
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/271bb5c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/271bb5c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/271bb5c5
Branch: refs/heads/master
Commit: 271bb5c5e27a33635a7bfc585045e729e4f745e7
Parents: 9f2da65
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 19:25:12 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../manager/CartridgeSubscriptionManager.java | 127 +++++++++++++------
.../ApplicationCartridgeSubscription.java | 2 +
2 files changed, 89 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/271bb5c5/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
index 5cdeb06..7c30fbe 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
@@ -95,28 +95,58 @@ public class CartridgeSubscriptionManager {
UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException,
RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException {
- //validate cartridge alias
+ return subscribeToCartridgeWithProperties(cartridgeType, cartridgeAlias, autoscalingPolicyName,
+ deploymentPolicyName, tenantDomain, tenantId, tenantAdminUsername,
+ repositoryType, repositoryURL, isPrivateRepository, repositoryUsername,
+ repositoryPassword, null);
+ }
+
+ public CartridgeSubscription subscribeToCartridgeWithProperties(String cartridgeType, String cartridgeAlias,
+ String autoscalingPolicyName, String deploymentPolicyName, String tenantDomain,
+ int tenantId, String tenantAdminUsername, String repositoryType, String repositoryURL,
+ boolean isPrivateRepository, String repositoryUsername, String repositoryPassword, Property[] props)
+
+ throws ADCException,
+ InvalidCartridgeAliasException,
+ DuplicateCartridgeAliasException,
+ PolicyException,
+ UnregisteredCartridgeException,
+ RepositoryRequiredException,
+ RepositoryCredentialsRequiredException,
+ RepositoryTransportException,
+ AlreadySubscribedException,
+ InvalidRepositoryException {
+
+ // validate cartridge alias
ApplicationManagementUtil.validateCartridgeAlias(cartridgeAlias, cartridgeType);
- //TODO - remove, now autoscaling policy is at autoscaler. Just need to pass the name
- /*Policy autoScalingPolicy;
- if(autoscalingPolicyName != null && !autoscalingPolicyName.isEmpty()) {
- autoScalingPolicy = PolicyHolder.getInstance().getPolicy(autoscalingPolicyName);
- } else {
- autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy();
- }
-
- if(autoScalingPolicy == null) {
- throw new PolicyException("Could not load the auto scaling policy.");
- } */
+ // TODO - remove, now autoscaling policy is at autoscaler. Just need to pass the name
+ /*
+ * Policy autoScalingPolicy;
+ * if(autoscalingPolicyName != null && !autoscalingPolicyName.isEmpty()) {
+ * autoScalingPolicy = PolicyHolder.getInstance().getPolicy(autoscalingPolicyName);
+ * } else {
+ * autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy();
+ * }
+ *
+ * if(autoScalingPolicy == null) {
+ * throw new PolicyException("Could not load the auto scaling policy.");
+ * }
+ */
CartridgeInfo cartridgeInfo;
try {
- cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
+ cartridgeInfo =
+ CloudControllerServiceClient.getServiceClient()
+ .getCartridgeInfo(cartridgeType);
+ if (props != null) {
+ cartridgeInfo.setProperties(props);
+ }
} catch (UnregisteredCartridgeException e) {
- String message = cartridgeType
- + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
+ String message =
+ cartridgeType +
+ " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
log.error(message);
throw e;
@@ -128,55 +158,72 @@ public class CartridgeSubscriptionManager {
Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain);
- CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory.getCartridgeSubscriptionInstance(cartridgeInfo);
-
- Repository repository = cartridgeSubscription.manageRepository(repositoryURL, repositoryUsername,
- repositoryPassword, isPrivateRepository, cartridgeAlias, cartridgeInfo, tenantDomain);
-
- cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName, deploymentPolicyName, repository);
- cartridgeSubscription.setSubscriptionKey(generateSubscriptionKey()); // TODO ---- fix properly
+ CartridgeSubscription cartridgeSubscription =
+ CartridgeSubscriptionFactory.getCartridgeSubscriptionInstance(cartridgeInfo);
- log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername +
- " subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " + cartridgeType +
- ", Repo URL: " + repositoryURL + ", Policy: " + autoscalingPolicyName);
+ Repository repository =
+ cartridgeSubscription.manageRepository(repositoryURL,
+ repositoryUsername,
+ repositoryPassword,
+ isPrivateRepository,
+ cartridgeAlias,
+ cartridgeInfo, tenantDomain);
- Payload payload = PayloadFactory.getPayloadInstance(cartridgeInfo.getProvider(), cartridgeType,
- "/tmp/" + tenantDomain + "-" + cartridgeAlias + ".zip");
+ cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName,
+ deploymentPolicyName, repository);
+ cartridgeSubscription.setSubscriptionKey(generateSubscriptionKey()); // TODO ---- fix
+ // properly
+
+ log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername +
+ " subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " +
+ cartridgeType + ", Repo URL: " + repositoryURL + ", Policy: " +
+ autoscalingPolicyName);
+
+ Payload payload =
+ PayloadFactory.getPayloadInstance(cartridgeInfo.getProvider(),
+ cartridgeType, "/tmp/" + tenantDomain +
+ "-" + cartridgeAlias +
+ ".zip");
PayloadArg payloadArg = cartridgeSubscription.createPayloadParameters();
if (payloadArg != null) {
- //populate the payload
+ // populate the payload
payload.populatePayload(payloadArg);
cartridgeSubscription.setPayload(payload);
}
- //get the payload parameters defined in the cartridge definition file for this cartridge type
+ // get the payload parameters defined in the cartridge definition file for this cartridge
+ // type
if (cartridgeInfo.getProperties() != null && cartridgeInfo.getProperties().length != 0) {
StringBuilder customPayloadParamsBuilder = new StringBuilder();
- for(Property property : cartridgeInfo.getProperties()) {
- //check if a property is related to the payload. Currently this is done by checking if the
- //property name starts with 'payload_parameter.' suffix. If so the payload param name will
- //be taken as the substring from the index of '.' to the end of the property name.
- if(property.getName().startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
+ for (Property property : cartridgeInfo.getProperties()) {
+ // check if a property is related to the payload. Currently this is done by checking
+ // if the
+ // property name starts with 'payload_parameter.' suffix. If so the payload param
+ // name will
+ // be taken as the substring from the index of '.' to the end of the property name.
+ if (property.getName()
+ .startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
String payloadParamName = property.getName();
customPayloadParamsBuilder.append(",");
- customPayloadParamsBuilder.append(payloadParamName.
- substring(payloadParamName.indexOf(".") + 1));
+ customPayloadParamsBuilder.append(payloadParamName.substring(payloadParamName.indexOf(".") + 1));
customPayloadParamsBuilder.append("=");
customPayloadParamsBuilder.append(property.getValue());
}
}
- //if valid payload related parameters are found in the cartridge definition file, add them to the payload
+ // if valid payload related parameters are found in the cartridge definition file, add
+ // them to the payload
String customPayloadParamString = customPayloadParamsBuilder.toString();
- if(!customPayloadParamString.isEmpty()) {
+ if (!customPayloadParamString.isEmpty()) {
payload.populatePayload(customPayloadParamString);
cartridgeSubscription.setPayload(payload);
}
}
- //CartridgeInstanceCache.getCartridgeInstanceCache().
- // addCartridgeInstance(new CartridgeInstanceCacheKey(tenantId, cartridgeAlias), cartridgeSubscription);
+ // CartridgeInstanceCache.getCartridgeInstanceCache().
+ // addCartridgeInstance(new CartridgeInstanceCacheKey(tenantId, cartridgeAlias),
+ // cartridgeSubscription);
return cartridgeSubscription;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/271bb5c5/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java
index b406048..ecacc37 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java
@@ -32,6 +32,8 @@ import org.apache.stratos.cloud.controller.pojo.Properties;
public class ApplicationCartridgeSubscription extends CartridgeSubscription {
+ private static final long serialVersionUID = 3969055979835359336L;
+
/**
* Constructor
*
[7/7] git commit: setting LB_CLUSTER_ID in the payload
Posted by ni...@apache.org.
setting LB_CLUSTER_ID in the payload
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9f2da65e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9f2da65e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9f2da65e
Branch: refs/heads/master
Commit: 9f2da65e36789d3ebfe00cf2a4e03ed7612c3fc7
Parents: edfc2d8
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 19:04:21 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../controller/impl/CloudControllerServiceImpl.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f2da65e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 6dfbab8..7f14253 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -396,8 +396,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
member.setMemberId(memberID);
// have to add memberID to the payload
StringBuilder payload = new StringBuilder(ctxt.getPayload());
- payload.append(",");
- payload.append("MEMBER_ID=" + memberID);
+ addToPayload(payload, "MEMBER_ID", memberID);
+ addToPayload(payload, "LB_CLUSTER_ID", member.getLbClusterId());
+
if (log.isDebugEnabled()) {
log.debug("Payload: " + payload.toString());
}
@@ -520,7 +521,12 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// }
- /**
+ private void addToPayload(StringBuilder payload, String name, String value) {
+ payload.append(",");
+ payload.append(name+"=" + value);
+ }
+
+ /**
* Persist data in registry.
*/
private void persist() {
[4/7] git commit: merge conflict
Posted by ni...@apache.org.
merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/df0ab5ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/df0ab5ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/df0ab5ec
Branch: refs/heads/master
Commit: df0ab5ecd646cec93772a9bbed6475a6a8157141
Parents: e078a11
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 19:43:19 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/messaging/util/Constants.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df0ab5ec/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
index f39dcd0..79034eb 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
@@ -42,4 +42,7 @@ public class Constants {
public static final String TOPOLOGY_MEMBER_FILTER = "stratos.topology.member.filter";
public static final String TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID = "lb-cluster-id";
+
+ // to identify a lb cluster
+ public static final String IS_LOAD_BALANCER = "load.balancer";
}
[3/7] git commit: use load.balancer property of messaging component
Posted by ni...@apache.org.
use load.balancer property of messaging component
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5af35def
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5af35def
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5af35def
Branch: refs/heads/master
Commit: 5af35def9dbcd79e519e4d9564d740a076039638
Parents: df0ab5e
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 17:34:16 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/topology/TopologyBuilder.java | 2 +-
.../stratos/cloud/controller/util/CloudControllerConstants.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5af35def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index cb0d676..42b400e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -118,7 +118,7 @@ public class TopologyBuilder {
// } else {
Properties props = CloudControllerUtil.toJavaUtilProperties(registrant.getProperties());
- String property = props.getProperty(CloudControllerConstants.IS_LOAD_BALANCER);
+ String property = props.getProperty(Constants.IS_LOAD_BALANCER);
boolean isLb = property != null ? Boolean.parseBoolean(property) : false;
Cluster cluster;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5af35def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index d357a58..89cb9c9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -246,5 +246,4 @@ public final class CloudControllerConstants {
public static final String AUTO_ASSIGN_IP = "autoAssignIp";
public static final String INSTANCE_TYPE = "instanceType";
- public static final String IS_LOAD_BALANCER = "load.balancer";
}
[5/7] git commit: use load.balancer property of messaging component
Posted by ni...@apache.org.
use load.balancer property of messaging component
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/edfc2d8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/edfc2d8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/edfc2d8c
Branch: refs/heads/master
Commit: edfc2d8c170a4d9dab99e3c9024f75a81b9a713b
Parents: 5af35de
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Dec 11 17:34:32 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Dec 11 19:56:16 2013 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/stratos/rest/endpoint/Constants.java | 1 -
.../org/apache/stratos/rest/endpoint/services/ServiceUtils.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/edfc2d8c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
index 033560e..5719dd2 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/Constants.java
@@ -24,7 +24,6 @@ package org.apache.stratos.rest.endpoint;
public class Constants {
public static final String SUPER_TENANT_SERVICE = "super.tenant.service";
- public static final String IS_LOAD_BALANCER = "load.balancer";
public static final String SERVICE_AWARE_LOAD_BALANCER = "service.aware.load.balancer";
public static final String DEFAULT_LOAD_BALANCER = "default.load.balancer";
public static final String NO_LOAD_BALANCER = "no.load.balancer";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/edfc2d8c/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 22c3e6c..de951e1 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
@@ -628,7 +628,7 @@ public class ServiceUtils {
for (org.apache.stratos.cloud.controller.pojo.Property prop :
properties) {
- if (Constants.IS_LOAD_BALANCER.equals(prop.getName())) {
+ if (org.apache.stratos.messaging.util.Constants.IS_LOAD_BALANCER.equals(prop.getName())) {
if ("true".equals(prop.getValue())) {
isLb = true;
if (log.isDebugEnabled()) {