Rebase the master and merge changes of PR 125
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ad66a0cd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ad66a0cd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ad66a0cd Branch: refs/heads/master Commit: ad66a0cdf3d4cd4f7f12e1ec94a657c61b435ebc Parents: bc1b31d Author: gayan <[email protected]> Authored: Thu Nov 27 11:39:05 2014 +0530 Committer: gayan <[email protected]> Committed: Fri Nov 28 18:27:08 2014 +0530 ---------------------------------------------------------------------- .../context/cluster/ClusterContextFactory.java | 16 +-- .../InstanceNotificationPublisher.java | 1 - .../monitor/cluster/ClusterMonitorFactory.java | 14 +-- .../rule/AutoscalerRuleEvaluator.java | 23 ++++ .../autoscaler/rule/RuleTasksDelegator.java | 5 +- .../apache/stratos/cartridge/agent/Main.java | 4 +- .../publisher/CartridgeAgentEventPublisher.java | 1 - .../impl/CloudControllerServiceImpl.java | 5 +- .../CloudControllerServiceComponent.java | 8 +- .../common/constants/StratosConstants.java | 13 +++ .../conf/LoadBalancerConfiguration.java | 5 +- .../TopologyFilterConfigurator.java | 14 +-- .../service/ServiceDeploymentManager.java | 10 +- .../internal/ADCManagementServerComponent.java | 8 +- .../manager/CartridgeSubscriptionManager.java | 1 - .../filter/LBCreationSubscriptionFilter.java | 12 +- .../utils/CartridgeSubscriptionUtils.java | 26 ++--- components/org.apache.stratos.messaging/pom.xml | 5 + .../messaging/message/filter/MessageFilter.java | 10 +- .../filter/topology/TopologyClusterFilter.java | 12 +- .../filter/topology/TopologyMemberFilter.java | 12 +- .../filter/topology/TopologyServiceFilter.java | 12 +- .../ApplicationsEventMessageDelegator.java | 3 - .../applications/ApplicationsEventReceiver.java | 4 +- .../ClusterStatusEventMessageDelegator.java | 5 - .../status/ClusterStatusEventReceiver.java | 4 +- .../health/stat/HealthStatEventReceiver.java | 4 +- .../InstanceNotifierEventMessageDelegator.java | 4 - .../notifier/InstanceNotifierEventReceiver.java | 6 +- .../InstanceStatusEventMessageDelegator.java | 5 - .../InstanceStatusEventMessageListener.java | 8 -- .../status/InstanceStatusEventReceiver.java | 4 +- .../tenant/TenantEventMessageDelegator.java | 3 +- .../receiver/tenant/TenantEventReceiver.java | 4 +- .../topology/TopologyEventReceiver.java | 22 ++-- .../stratos/messaging/util/Constants.java | 66 ----------- .../org/apache/stratos/messaging/util/Util.java | 117 +++++++++++++------ .../org/apache/stratos/Util/test/UtilTest.java | 35 ++++++ .../messaging/test/MessageFilterTest.java | 4 - .../rest/endpoint/api/StratosApiV40Utils.java | 4 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../extension/FaultHandlingWindowProcessor.java | 4 +- 42 files changed, 282 insertions(+), 245 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java index c2d3439..67cf413 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java @@ -41,7 +41,7 @@ import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.MemberStatus; -import org.apache.stratos.messaging.util.Constants; + import java.util.HashMap; import java.util.Map; @@ -255,15 +255,15 @@ public class ClusterContextFactory { java.util.Properties props = cluster.getProperties(); // get service type of load balanced cluster - String loadBalancedServiceType = props.getProperty(org.apache.stratos.messaging.util.Constants.LOAD_BALANCED_SERVICE_TYPE); + String loadBalancedServiceType = props.getProperty(StratosConstants.LOAD_BALANCED_SERVICE_TYPE); - if (props.containsKey(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF)) { - String value = props.getProperty(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF); + if (props.containsKey(StratosConstants.LOAD_BALANCER_REF)) { + String value = props.getProperty(StratosConstants.LOAD_BALANCER_REF); - if (value.equals(org.apache.stratos.messaging.util.Constants.DEFAULT_LOAD_BALANCER)) { + if (value.equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { networkPartitionLbHolder.setDefaultLbClusterId(clusterId); - } else if (value.equals(org.apache.stratos.messaging.util.Constants.SERVICE_AWARE_LOAD_BALANCER)) { + } else if (value.equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { String serviceName = cluster.getServiceName(); // TODO: check if this is correct networkPartitionLbHolder.addServiceLB(serviceName, clusterId); @@ -365,8 +365,8 @@ public class ClusterContextFactory { } // find lb reference type - if (properties.containsKey(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF)) { - String value = properties.getProperty(Constants.LOAD_BALANCER_REF); + if (properties.containsKey(StratosConstants.LOAD_BALANCER_REF)) { + String value = properties.getProperty(StratosConstants.LOAD_BALANCER_REF); //dockerClusterMonitor.setLbReferenceType(value); if (log.isDebugEnabled()) { log.debug("Set the lb reference type: " + value); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java index 0163d23..b1c419a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java @@ -26,7 +26,6 @@ import org.apache.stratos.messaging.broker.publish.EventPublisherPool; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent; import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent; -import org.apache.stratos.messaging.util.Constants; import org.apache.stratos.messaging.util.Util; public class InstanceNotificationPublisher { http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java index bfee5b3..051c9f8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java @@ -28,7 +28,7 @@ import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.MemberStatus; -import org.apache.stratos.messaging.util.Constants; + /* * Factory class for creating cluster monitors. @@ -36,7 +36,7 @@ import org.apache.stratos.messaging.util.Constants; public class ClusterMonitorFactory { private static final Log log = LogFactory.getLog(ClusterMonitorFactory.class); - + public static final String IS_PRIMARY = "PRIMARY"; /** * @param cluster the cluster to be monitored * @return the created cluster monitor @@ -71,8 +71,8 @@ public class ClusterMonitorFactory { java.util.Properties props = cluster.getProperties(); if (props != null) { - if (props.containsKey(Constants.LOAD_BALANCER_REF)) { - String value = props.getProperty(Constants.LOAD_BALANCER_REF); + if (props.containsKey(StratosConstants.LOAD_BALANCER_REF)) { + String value = props.getProperty(StratosConstants.LOAD_BALANCER_REF); clusterMonitor.setLbReferenceType(value); if (log.isDebugEnabled()) { log.debug("Set the lb reference type: " + value); @@ -81,7 +81,7 @@ public class ClusterMonitorFactory { // set hasPrimary property // hasPrimary is true if there are primary members available in that cluster - clusterMonitor.setHasPrimary(Boolean.parseBoolean(cluster.getProperties().getProperty(Constants.IS_PRIMARY))); + clusterMonitor.setHasPrimary(Boolean.parseBoolean(cluster.getProperties().getProperty(IS_PRIMARY))); } @@ -193,8 +193,8 @@ public class ClusterMonitorFactory { } // find lb reference type - if (properties.containsKey(Constants.LOAD_BALANCER_REF)) { - String value = properties.getProperty(Constants.LOAD_BALANCER_REF); + if (properties.containsKey(StratosConstants.LOAD_BALANCER_REF)) { + String value = properties.getProperty(StratosConstants.LOAD_BALANCER_REF); dockerClusterMonitor.setLbReferenceType(value); if (log.isDebugEnabled()) { log.debug("Set the lb reference type: " + value); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java index 9eac1da..ae307fb 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java @@ -214,6 +214,7 @@ public class AutoscalerRuleEvaluator { return ksession; } +<<<<<<< HEAD // public static String getLbClusterId(ClusterLevelPartitionContext clusterMonitorPartitionContext, String nwpartitionId) { // Properties props = clusterMonitorPartitionContext.getProperties(); // String value = @@ -234,6 +235,28 @@ public class AutoscalerRuleEvaluator { // } // return lbClusterId; // } +======= + public static String getLbClusterId(ClusterLevelPartitionContext clusterMonitorPartitionContext, String nwpartitionId) { + Properties props = clusterMonitorPartitionContext.getProperties(); + String value = + (String) props.get(StratosConstants.LOAD_BALANCER_REF); + + if (value == null){ + return null; + } + + String lbClusterId = null; + + NetworkPartitionLbHolder networkPartitionLbHolder = PartitionManager.getInstance().getNetworkPartitionLbHolder(nwpartitionId); + if (value.equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { + lbClusterId = networkPartitionLbHolder.getDefaultLbClusterId(); + } else if (value.equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { + String serviceName = clusterMonitorPartitionContext.getServiceName(); + lbClusterId = networkPartitionLbHolder.getLBClusterIdOfService(serviceName); + } + return lbClusterId; + } +>>>>>>> 684e52c... Rebase the master and merge changes of PR 121 private static KnowledgeBase readKnowledgeBase(String drlFileName) { KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index d58bb40..69d684e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -38,6 +38,7 @@ import org.apache.stratos.autoscaler.monitor.cluster.VMClusterMonitor; import org.apache.stratos.autoscaler.monitor.cluster.VMServiceClusterMonitor; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.MemberStatus; @@ -270,10 +271,10 @@ public class RuleTasksDelegator { String lbClusterId = null; if (lbRefType != null) { - if (lbRefType.equals(org.apache.stratos.messaging.util.Constants.DEFAULT_LOAD_BALANCER)) { + if (lbRefType.equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { lbClusterId = networkPartitionLbHolder.getDefaultLbClusterId(); // lbClusterId = nwPartitionCtxt.getDefaultLbClusterId(); - } else if (lbRefType.equals(org.apache.stratos.messaging.util.Constants.SERVICE_AWARE_LOAD_BALANCER)) { + } else if (lbRefType.equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { String serviceName = partitionCtxt.getServiceName(); lbClusterId = networkPartitionLbHolder.getLBClusterIdOfService(serviceName); // lbClusterId = nwPartitionCtxt.getLBClusterIdOfService(serviceName); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java index e77b3f1..79b979d 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.log4j.PropertyConfigurator; import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; import java.lang.reflect.Constructor; @@ -44,7 +44,7 @@ public class Main { public void run() { try { // Close event publisher connections to message broker - EventPublisherPool.close(Constants.INSTANCE_STATUS_TOPIC); + EventPublisherPool.close(Util.Topics.INSTANCE_STATUS_TOPIC.getTopicName()); mainThread.join(); } catch (Exception e) { log.error(e); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java index 2792824..b080c20 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java @@ -30,7 +30,6 @@ import org.apache.stratos.messaging.event.instance.status.InstanceActivatedEvent import org.apache.stratos.messaging.event.instance.status.InstanceMaintenanceModeEvent; import org.apache.stratos.messaging.event.instance.status.InstanceReadyToShutdownEvent; import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent; -import org.apache.stratos.messaging.util.Constants; import org.apache.stratos.messaging.util.Util; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/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 67b6e09..54a030e 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 @@ -58,7 +58,6 @@ import org.apache.stratos.kubernetes.client.model.ReplicationController; import org.apache.stratos.kubernetes.client.model.Service; import org.apache.stratos.messaging.domain.topology.*; import org.apache.stratos.messaging.event.topology.MemberReadyToShutdownEvent; -import org.apache.stratos.messaging.util.Constants; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadataBuilder; @@ -81,6 +80,8 @@ public class CloudControllerServiceImpl implements CloudControllerService { private static final Log LOG = LogFactory .getLog(CloudControllerServiceImpl.class); + public static final String IS_LOAD_BALANCER = "load.balancer"; + private FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder .getInstance(); @@ -1203,7 +1204,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } Properties props = CloudControllerUtil.toJavaUtilProperties(registrant.getProperties()); - String property = props.getProperty(Constants.IS_LOAD_BALANCER); + String property = props.getProperty(IS_LOAD_BALANCER); boolean isLb = property != null ? Boolean.parseBoolean(property) : false; //TODO fix the properties issue http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java index 7f63933..4570eed 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java @@ -32,7 +32,7 @@ import org.apache.stratos.cloud.controller.publisher.TopologySynchronizerTaskSch import org.apache.stratos.cloud.controller.receiver.instance.status.InstanceStatusTopicReceiver; import org.apache.stratos.cloud.controller.util.ServiceReferenceHolder; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.caching.impl.DistributedMapProvider; @@ -68,8 +68,8 @@ public class CloudControllerServiceComponent { protected void activate(ComponentContext context) { try { applicationTopicReceiver = new ApplicationTopicReceiver(); - Thread tApplicationTopicReceiver = new Thread(applicationTopicReceiver); - tApplicationTopicReceiver.start(); + ; + applicationTopicReceiver.run(); if (log.isInfoEnabled()) { log.info("Application Receiver thread started"); @@ -164,6 +164,6 @@ public class CloudControllerServiceComponent { protected void deactivate(ComponentContext ctx) { // Close event publisher connections to message broker - EventPublisherPool.close(Constants.TOPOLOGY_TOPIC); + EventPublisherPool.close(Util.Topics.TOPOLOGY_TOPIC.getTopicName()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java index d22709a..38e91af 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java @@ -171,5 +171,18 @@ public class StratosConstants { public static final String OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.vm.obsoletedMemberExpiryTimeout"; public static final String PENDING_CONTAINER_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.container.pendingMemberExpiryTimeout"; public static final String OBSOLETED_CONTAINER_MEMBER_EXPIRY_TIMEOUT = "autoscaler.member.container.obsoletedMemberExpiryTimeout"; + + public static final String FILTER_VALUE_SEPARATOR = ","; + public static final String TOPOLOGY_SERVICE_FILTER = "stratos.topology.service.filter"; + public static final String TOPOLOGY_CLUSTER_FILTER = "stratos.topology.cluster.filter"; + public static final String TOPOLOGY_MEMBER_FILTER = "stratos.topology.member.filter"; + + // to identify a lb cluster + public static final String LOAD_BALANCER_REF = "load.balancer.ref"; + 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"; + public static final String EXISTING_LOAD_BALANCERS = "existing.load.balancers"; + public static final String LOAD_BALANCED_SERVICE_TYPE = "load.balanced.service.type"; } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java index b235648..b62c3e1 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java @@ -22,6 +22,7 @@ package org.apache.stratos.load.balancer.conf; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.load.balancer.conf.domain.Algorithm; import org.apache.stratos.load.balancer.conf.domain.MemberIpType; import org.apache.stratos.load.balancer.conf.domain.TenantIdentifier; @@ -399,9 +400,9 @@ public class LoadBalancerConfiguration { throw new InvalidConfigurationException(String.format("Invalid tenant identifier regular expression: %s", tenantIdentifierRegex), e); } List<String> regexList = new ArrayList<String>(); - if(tenantIdentifierRegex.contains(org.apache.stratos.messaging.util.Constants.FILTER_VALUE_SEPARATOR)) { + if(tenantIdentifierRegex.contains(StratosConstants.FILTER_VALUE_SEPARATOR)) { String[] regexArray; - regexArray = tenantIdentifierRegex.split(org.apache.stratos.messaging.util.Constants.FILTER_VALUE_SEPARATOR); + regexArray = tenantIdentifierRegex.split(StratosConstants.FILTER_VALUE_SEPARATOR); for(String regex: regexArray) { regexList.add(regex); } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java index f7e9228..44ddc2d 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java @@ -22,8 +22,8 @@ package org.apache.stratos.load.balancer.conf.configurator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration; -import org.apache.stratos.messaging.util.Constants; /** * Topology filter configurator to configure topology filters. @@ -34,23 +34,23 @@ public class TopologyFilterConfigurator { public static void configure(LoadBalancerConfiguration configuration) { String serviceFilter = configuration.getTopologyServiceFilter(); if (StringUtils.isNotBlank(serviceFilter)) { - System.setProperty(Constants.TOPOLOGY_SERVICE_FILTER, serviceFilter); + System.setProperty(StratosConstants.TOPOLOGY_SERVICE_FILTER, serviceFilter); } String clusterFilter = configuration.getTopologyClusterFilter(); if (StringUtils.isNotBlank(clusterFilter)) { - System.setProperty(Constants.TOPOLOGY_CLUSTER_FILTER, clusterFilter); + System.setProperty(StratosConstants.TOPOLOGY_CLUSTER_FILTER, clusterFilter); } String memberFilter = configuration.getTopologyMemberFilter(); if (StringUtils.isNotBlank(memberFilter)) { - System.setProperty(Constants.TOPOLOGY_MEMBER_FILTER, memberFilter); + System.setProperty(StratosConstants.TOPOLOGY_MEMBER_FILTER, memberFilter); } if (log.isDebugEnabled()) { - log.debug(String.format("Setting service-filter = %s", System.getProperty(Constants.TOPOLOGY_SERVICE_FILTER))); - log.debug(String.format("Setting cluster-filter = %s", System.getProperty(Constants.TOPOLOGY_CLUSTER_FILTER))); - log.debug(String.format("Setting member-filter = %s", System.getProperty(Constants.TOPOLOGY_MEMBER_FILTER))); + log.debug(String.format("Setting service-fTopologyFilterConfigurator.javailter = %s", System.getProperty(StratosConstants.TOPOLOGY_SERVICE_FILTER))); + log.debug(String.format("Setting cluster-filter = %s", System.getProperty(StratosConstants.TOPOLOGY_CLUSTER_FILTER))); + log.debug(String.format("Setting member-filter = %s", System.getProperty(StratosConstants.TOPOLOGY_MEMBER_FILTER))); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java index c5921b6..a6f8e93 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java @@ -26,6 +26,7 @@ import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.service.multitenant.MultiTenantService; import org.apache.stratos.manager.deploy.service.multitenant.lb.DefaultLBService; @@ -38,7 +39,6 @@ import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager; import org.apache.stratos.manager.subscription.CartridgeSubscription; import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.CartridgeConstants; -import org.apache.stratos.messaging.util.Constants; import java.util.Collection; @@ -343,24 +343,24 @@ public class ServiceDeploymentManager { private void deployLBCluster (String loadBalancedService, LBDataContext lbDataCtxt, String tenantRange) throws ADCException, UnregisteredCartridgeException { - if (lbDataCtxt.getLbCategory() == null || lbDataCtxt.getLbCategory().equals(Constants.NO_LOAD_BALANCER)) { + if (lbDataCtxt.getLbCategory() == null || lbDataCtxt.getLbCategory().equals(StratosConstants.NO_LOAD_BALANCER)) { // no load balancer required return; } LBService lbService = null; - if (lbDataCtxt.getLbCategory().equals(Constants.EXISTING_LOAD_BALANCERS)) { + if (lbDataCtxt.getLbCategory().equals(StratosConstants.EXISTING_LOAD_BALANCERS)) { lbService = new ExistingLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(), lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(), tenantRange, false); - } else if (lbDataCtxt.getLbCategory().equals(Constants.DEFAULT_LOAD_BALANCER)) { + } else if (lbDataCtxt.getLbCategory().equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { lbService = new DefaultLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(), lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(), tenantRange, false); - } else if (lbDataCtxt.getLbCategory().equals(Constants.SERVICE_AWARE_LOAD_BALANCER)) { + } else if (lbDataCtxt.getLbCategory().equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { lbService = new ServiceAwareLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(), lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(), tenantRange, false); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java index 2156417..846b93a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java @@ -30,7 +30,7 @@ import org.apache.stratos.manager.utils.CartridgeConfigFileReader; import org.apache.stratos.manager.utils.UserRoleCreator; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; import org.apache.stratos.messaging.broker.subscribe.Subscriber; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.ntask.core.service.TaskService; import org.wso2.carbon.registry.core.service.RegistryService; @@ -89,7 +89,7 @@ public class ADCManagementServerComponent { if(log.isDebugEnabled()) { log.debug("Starting instance status topic subscriber..."); } - Subscriber subscriber = new Subscriber(Constants.INSTANCE_STATUS_TOPIC, new InstanceStatusListener()); + Subscriber subscriber = new Subscriber(Util.Topics.INSTANCE_STATUS_TOPIC.getTopicName(), new InstanceStatusListener()); Thread tsubscriber = new Thread(subscriber); tsubscriber.start(); @@ -198,8 +198,8 @@ public class ADCManagementServerComponent { protected void deactivate(ComponentContext context) { // Close event publisher connections to message broker - EventPublisherPool.close(Constants.INSTANCE_NOTIFIER_TOPIC); - EventPublisherPool.close(Constants.TENANT_TOPIC); + EventPublisherPool.close(Util.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName()); + EventPublisherPool.close(Util.Topics.TENANT_TOPIC.getTopicName()); //terminate Stratos Manager Topology Receiver stratosManagerTopologyEventReceiver.terminate(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/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 9f424a5..0a7206d 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 @@ -52,7 +52,6 @@ import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.event.tenant.SubscriptionDomainAddedEvent; import org.apache.stratos.messaging.event.tenant.SubscriptionDomainRemovedEvent; -import org.apache.stratos.messaging.util.Constants; import org.apache.stratos.messaging.util.Util; import org.wso2.carbon.context.CarbonContext; import org.apache.stratos.manager.publisher.CartridgeSubscriptionDataPublisher; http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java index 6057243..457bd75 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java @@ -27,6 +27,7 @@ import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.AlreadySubscribedException; import org.apache.stratos.manager.exception.DuplicateCartridgeAliasException; @@ -51,7 +52,6 @@ import org.apache.stratos.manager.subscription.SubscriptionData; import org.apache.stratos.manager.subscription.factory.CartridgeSubscriptionFactory; import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.CartridgeConstants; -import org.apache.stratos.messaging.util.Constants; /** * Responsible for making a subscription for a Load Balancer Cluster, @@ -98,7 +98,7 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { List<Property> lbProperperties = lbDataCtxt.getLbProperperties(); lbCartridgeSubscriptionProperties.setProperties(lbProperperties.toArray(new Property[lbProperperties.size()])); for (Property property : lbProperperties){ - if (org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF.equals(property.getName())) { + if (StratosConstants.LOAD_BALANCER_REF.equals(property.getName())) { filterProperties.addProperties(property); } } @@ -140,7 +140,7 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException { - if (lbDataContext.getLbCategory() == null || lbDataContext.getLbCategory().equals(Constants.NO_LOAD_BALANCER)) { + if (lbDataContext.getLbCategory() == null || lbDataContext.getLbCategory().equals(StratosConstants.NO_LOAD_BALANCER)) { // no load balancer subscription required generate SubscriptionKey log.info("No LB subscription required for the Subscription with alias: " + subscriptionData.getCartridgeAlias() + ", type: " + subscriptionData.getCartridgeType()); @@ -151,13 +151,13 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { String lbAlias = "lb" + lbDataContext.getLbCartridgeInfo().getType() + new Random().nextInt(); - if (lbDataContext.getLbCategory().equals(Constants.EXISTING_LOAD_BALANCERS)) { + if (lbDataContext.getLbCategory().equals(StratosConstants.EXISTING_LOAD_BALANCERS)) { loadBalancerCategory = new ExistingLoadBalancerCategory(); - } else if (lbDataContext.getLbCategory().equals(Constants.DEFAULT_LOAD_BALANCER)) { + } else if (lbDataContext.getLbCategory().equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { loadBalancerCategory = new DefaultLoadBalancerCategory(); - } else if (lbDataContext.getLbCategory().equals(Constants.SERVICE_AWARE_LOAD_BALANCER)) { + } else if (lbDataContext.getLbCategory().equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { loadBalancerCategory = new ServiceLevelLoadBalancerCategory(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java index ef735a2..8aa51a4 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy; import org.apache.stratos.cloud.controller.stub.pojo.*; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; @@ -42,7 +43,6 @@ import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent; import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent; -import org.apache.stratos.messaging.util.Constants; import org.apache.stratos.messaging.util.Util; import java.util.Set; @@ -264,7 +264,7 @@ public class CartridgeSubscriptionUtils { Properties lbReferenceProperties = lbConfig.getProperties(); Property lbRefProperty = new Property(); - lbRefProperty.setName(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF); + lbRefProperty.setName(StratosConstants.LOAD_BALANCER_REF); for (Property prop : lbReferenceProperties.getProperties()) { @@ -272,10 +272,10 @@ public class CartridgeSubscriptionUtils { String value = prop.getValue(); // TODO make following a chain of responsibility pattern - if (Constants.NO_LOAD_BALANCER.equals(name)) { + if (StratosConstants.NO_LOAD_BALANCER.equals(name)) { if ("true".equals(value)) { - lbDataCtxt.setLbCategory(Constants.NO_LOAD_BALANCER); + lbDataCtxt.setLbCategory(StratosConstants.NO_LOAD_BALANCER); if (log.isDebugEnabled()) { log.debug("This cartridge does not require a load balancer. " + "[Type] " + serviceType); @@ -284,9 +284,9 @@ public class CartridgeSubscriptionUtils { lbDataCtxt.addLoadBalancedServiceProperty(lbRefProperty); break; } - } else if (Constants.EXISTING_LOAD_BALANCERS.equals(name)) { + } else if (StratosConstants.EXISTING_LOAD_BALANCERS.equals(name)) { - lbDataCtxt.setLbCategory(Constants.EXISTING_LOAD_BALANCERS); + lbDataCtxt.setLbCategory(StratosConstants.EXISTING_LOAD_BALANCERS); String clusterIdsVal = value; if (log.isDebugEnabled()) { @@ -308,11 +308,11 @@ public class CartridgeSubscriptionUtils { lbDataCtxt.addLoadBalancedServiceProperty(lbRefProperty); break; - } else if (Constants.DEFAULT_LOAD_BALANCER.equals(name)) { + } else if (StratosConstants.DEFAULT_LOAD_BALANCER.equals(name)) { if ("true".equals(value)) { - lbDataCtxt.setLbCategory(Constants.DEFAULT_LOAD_BALANCER); + lbDataCtxt.setLbCategory(StratosConstants.DEFAULT_LOAD_BALANCER); lbRefProperty.setValue(name); @@ -329,7 +329,7 @@ public class CartridgeSubscriptionUtils { if (lbCartridgeInfo == null) { String msg = "Please specify a LB cartridge type for the cartridge: " + serviceType + " as category: " + - Constants.DEFAULT_LOAD_BALANCER; + StratosConstants.DEFAULT_LOAD_BALANCER; log.error(msg); throw new ADCException(msg); } @@ -385,11 +385,11 @@ public class CartridgeSubscriptionUtils { break; } - } else if (Constants.SERVICE_AWARE_LOAD_BALANCER.equals(name)) { + } else if (StratosConstants.SERVICE_AWARE_LOAD_BALANCER.equals(name)) { if ("true".equals(value)) { - lbDataCtxt.setLbCategory(Constants.SERVICE_AWARE_LOAD_BALANCER); + lbDataCtxt.setLbCategory(StratosConstants.SERVICE_AWARE_LOAD_BALANCER); lbRefProperty.setValue(name); @@ -406,7 +406,7 @@ public class CartridgeSubscriptionUtils { if (lbCartridgeInfo == null) { String msg = "Please specify a LB cartridge type for the cartridge: " + serviceType + " as category: " + - Constants.SERVICE_AWARE_LOAD_BALANCER; + StratosConstants.SERVICE_AWARE_LOAD_BALANCER; log.error(msg); throw new ADCException(msg); } @@ -415,7 +415,7 @@ public class CartridgeSubscriptionUtils { // add a property for the service type Property loadBalancedServiceTypeProperty = new Property(); - loadBalancedServiceTypeProperty.setName(Constants.LOAD_BALANCED_SERVICE_TYPE); + loadBalancedServiceTypeProperty.setName(StratosConstants.LOAD_BALANCED_SERVICE_TYPE); // set the load balanced service type loadBalancedServiceTypeProperty.setValue(serviceType); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml index 9533dc0..6779fc4 100644 --- a/components/org.apache.stratos.messaging/pom.xml +++ b/components/org.apache.stratos.messaging/pom.xml @@ -78,6 +78,11 @@ <artifactId>mqtt-client</artifactId> <version>0.4.0</version> </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.common</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/MessageFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/MessageFilter.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/MessageFilter.java index b22b54b..748209e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/MessageFilter.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/MessageFilter.java @@ -24,8 +24,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; -import org.apache.stratos.messaging.util.Constants; import java.util.*; @@ -35,6 +35,8 @@ import java.util.*; public class MessageFilter { private static final Log log = LogFactory.getLog(TopologyServiceFilter.class); + public static final String FILTER_VALUE_ASSIGN_OPERATOR = "="; + public static final String FILTER_KEY_VALUE_PAIR_SEPARATOR = "|"; private String filterName; private Map<String, Map<String, Boolean>> filterMap; @@ -47,9 +49,9 @@ public class MessageFilter { private Map<String, String> splitToMap(String filter) { HashMap<String, String> keyValuePairMap = new HashMap<String, String>(); - List<String> keyValuePairList = splitUsingTokenizer(filter, Constants.FILTER_KEY_VALUE_PAIR_SEPARATOR); + List<String> keyValuePairList = splitUsingTokenizer(filter,FILTER_KEY_VALUE_PAIR_SEPARATOR); for (String keyValuePair : keyValuePairList) { - List<String> keyValueList = splitUsingTokenizer(keyValuePair, Constants.FILTER_VALUE_ASSIGN_OPERATOR); + List<String> keyValueList = splitUsingTokenizer(keyValuePair, FILTER_VALUE_ASSIGN_OPERATOR); if (keyValueList.size() == 2) { keyValuePairMap.put(keyValueList.get(0).trim(), keyValueList.get(1).trim()); } else { @@ -86,7 +88,7 @@ public class MessageFilter { for (String propertyName : keyValuePairMap.keySet()) { propertyValue = keyValuePairMap.get(propertyName); propertyValueMap = new HashMap<String, Boolean>(); - propertyValueArray = propertyValue.split(Constants.FILTER_VALUE_SEPARATOR); + propertyValueArray = propertyValue.split(StratosConstants.FILTER_VALUE_SEPARATOR); for (String value : propertyValueArray) { propertyValueMap.put(value, true); if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyClusterFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyClusterFilter.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyClusterFilter.java index 60acd39..bf1af02 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyClusterFilter.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyClusterFilter.java @@ -22,7 +22,6 @@ package org.apache.stratos.messaging.message.filter.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.message.filter.MessageFilter; -import org.apache.stratos.messaging.util.Constants; import java.util.Collection; @@ -31,10 +30,13 @@ import java.util.Collection; */ public class TopologyClusterFilter extends MessageFilter { private static final Log log = LogFactory.getLog(TopologyServiceFilter.class); + public static final String TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID = "cluster-id"; + public static final String TOPOLOGY_CLUSTER_FILTER = "stratos.topology.cluster.filter"; + private static volatile TopologyClusterFilter instance; public TopologyClusterFilter() { - super(Constants.TOPOLOGY_CLUSTER_FILTER); + super(TOPOLOGY_CLUSTER_FILTER); } public static TopologyClusterFilter getInstance() { @@ -52,14 +54,14 @@ public class TopologyClusterFilter extends MessageFilter { } public boolean clusterIdIncluded(String value) { - return included(Constants.TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID, value); + return included(TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID, value); } public boolean clusterIdExcluded(String value) { - return excluded(Constants.TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID, value); + return excluded(TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID, value); } public Collection<String> getIncludedClusterIds() { - return getIncludedPropertyValues(Constants.TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID); + return getIncludedPropertyValues(TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyMemberFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyMemberFilter.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyMemberFilter.java index 44aaa75..1ccc8b4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyMemberFilter.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyMemberFilter.java @@ -23,7 +23,6 @@ package org.apache.stratos.messaging.message.filter.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.message.filter.MessageFilter; -import org.apache.stratos.messaging.util.Constants; import java.util.Collection; @@ -32,10 +31,13 @@ import java.util.Collection; */ public class TopologyMemberFilter extends MessageFilter { private static final Log log = LogFactory.getLog(TopologyServiceFilter.class); + public static final String TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID = "lb-cluster-id"; + public static final String TOPOLOGY_MEMBER_FILTER = "stratos.topology.member.filter"; + private static volatile TopologyMemberFilter instance; public TopologyMemberFilter() { - super(Constants.TOPOLOGY_MEMBER_FILTER); + super(TOPOLOGY_MEMBER_FILTER); } public static TopologyMemberFilter getInstance() { @@ -53,14 +55,14 @@ public class TopologyMemberFilter extends MessageFilter { } public boolean lbClusterIdIncluded(String value) { - return included(Constants.TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID, value); + return included(TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID, value); } public boolean lbClusterIdExcluded(String value) { - return excluded(Constants.TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID, value); + return excluded(TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID, value); } public Collection<String> getIncludedLbClusterIds() { - return getIncludedPropertyValues(Constants.TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID); + return getIncludedPropertyValues(TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyServiceFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyServiceFilter.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyServiceFilter.java index 46024bf..9607df6 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyServiceFilter.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/filter/topology/TopologyServiceFilter.java @@ -21,8 +21,8 @@ package org.apache.stratos.messaging.message.filter.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.message.filter.MessageFilter; -import org.apache.stratos.messaging.util.Constants; import java.util.Collection; @@ -31,10 +31,12 @@ import java.util.Collection; */ public class TopologyServiceFilter extends MessageFilter { private static final Log log = LogFactory.getLog(TopologyServiceFilter.class); + public static final String TOPOLOGY_SERVICE_FILTER_SERVICE_NAME = "service-name"; + private static volatile TopologyServiceFilter instance; public TopologyServiceFilter() { - super(Constants.TOPOLOGY_SERVICE_FILTER); + super(StratosConstants.TOPOLOGY_SERVICE_FILTER); } public static TopologyServiceFilter getInstance() { @@ -52,14 +54,14 @@ public class TopologyServiceFilter extends MessageFilter { } public boolean serviceNameIncluded(String value) { - return included(Constants.TOPOLOGY_SERVICE_FILTER_SERVICE_NAME, value); + return included(TOPOLOGY_SERVICE_FILTER_SERVICE_NAME, value); } public boolean serviceNameExcluded(String value) { - return excluded(Constants.TOPOLOGY_SERVICE_FILTER_SERVICE_NAME, value); + return excluded(TOPOLOGY_SERVICE_FILTER_SERVICE_NAME, value); } public Collection<String> getIncludedServiceNames() { - return getIncludedPropertyValues(Constants.TOPOLOGY_SERVICE_FILTER_SERVICE_NAME); + return getIncludedPropertyValues(TOPOLOGY_SERVICE_FILTER_SERVICE_NAME); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageDelegator.java index 71c379b..77f4630 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageDelegator.java @@ -24,9 +24,6 @@ import org.apache.stratos.messaging.domain.Message; import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; import org.apache.stratos.messaging.message.processor.applications.ApplicationsMessageProcessorChain; -import org.apache.stratos.messaging.util.Constants; - -import javax.jms.TextMessage; public class ApplicationsEventMessageDelegator implements Runnable { private static final Log log = LogFactory.getLog(ApplicationsEventMessageDelegator.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventReceiver.java index ac7a28b..d034b8a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventReceiver.java @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; public class ApplicationsEventReceiver implements Runnable { private static final Log log = LogFactory.getLog(ApplicationsEventReceiver.class); @@ -46,7 +46,7 @@ public class ApplicationsEventReceiver implements Runnable { public void run() { try { // Start topic subscriber thread - subscriber = new Subscriber(Constants.APPLICATIONS_TOPIC, messageListener); + subscriber = new Subscriber(Util.Topics.APPLICATIONS_TOPIC.getTopicName(), messageListener); // subscriber.setMessageListener(messageListener); Thread subscriberThread = new Thread(subscriber); subscriberThread.start(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageDelegator.java index b4f8e7b..fb30fb4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageDelegator.java @@ -25,11 +25,6 @@ import org.apache.stratos.messaging.domain.Message; import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; import org.apache.stratos.messaging.message.processor.cluster.status.ClusterStatusMessageProcessorChain; -import org.apache.stratos.messaging.message.processor.instance.notifier.InstanceNotifierMessageProcessorChain; -import org.apache.stratos.messaging.util.Constants; - -import javax.jms.TextMessage; - /** * Implements logic for processing instance notifier event messages based on a given http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java index c085545..05bcf02 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; /** * A thread for receiving instance notifier information from message broker. @@ -49,7 +49,7 @@ public class ClusterStatusEventReceiver implements Runnable { public void run() { try { // Start topic subscriber thread - subscriber = new Subscriber(Constants.CLUSTER_STATUS_TOPIC, messageListener); + subscriber = new Subscriber(Util.Topics.CLUSTER_STATUS_TOPIC.getTopicName(), messageListener); // subscriber.setMessageListener(messageListener); Thread subscriberThread = new Thread(subscriber); subscriberThread.start(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java index d010f70..c5ddbb4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; /** * A thread for receiving health stat information from message broker @@ -50,7 +50,7 @@ public class HealthStatEventReceiver implements Runnable { public void run() { try { // Start topic subscriber thread - subscriber = new Subscriber(Constants.HEALTH_STAT_TOPIC, messageListener); + subscriber = new Subscriber(Util.Topics.HEALTH_STAT_TOPIC.getTopicName(), messageListener); // subscriber.setMessageListener(messageListener); Thread subscriberThread = new Thread(subscriber); subscriberThread.start(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageDelegator.java index 16899ea..538360d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageDelegator.java @@ -25,10 +25,6 @@ import org.apache.stratos.messaging.domain.Message; import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; import org.apache.stratos.messaging.message.processor.instance.notifier.InstanceNotifierMessageProcessorChain; -import org.apache.stratos.messaging.util.Constants; - -import javax.jms.TextMessage; - /** * Implements logic for processing instance notifier event messages based on a given http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java index 28a69b7..8bfcbeb 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java @@ -19,11 +19,12 @@ package org.apache.stratos.messaging.message.receiver.instance.notifier; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; /** * A thread for receiving instance notifier information from message broker. @@ -49,9 +50,10 @@ public class InstanceNotifierEventReceiver implements Runnable { public void run() { try { // Start topic subscriber thread - subscriber = new Subscriber(Constants.INSTANCE_NOTIFIER_TOPIC, messageListener); + subscriber = new Subscriber(Util.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName(), messageListener); // subscriber.setMessageListener(messageListener); Thread subscriberThread = new Thread(subscriber); + subscriberThread.start(); if (log.isDebugEnabled()) { log.debug("InstanceNotifier event message receiver thread started"); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageDelegator.java index 4524813..cff26c6 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageDelegator.java @@ -24,12 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.domain.Message; import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; -import org.apache.stratos.messaging.message.processor.instance.notifier.InstanceNotifierMessageProcessorChain; import org.apache.stratos.messaging.message.processor.instance.status.InstanceStatusMessageProcessorChain; -import org.apache.stratos.messaging.util.Constants; - -import javax.jms.TextMessage; - /** * Implements logic for processing instance notifier event messages based on a given http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java index 6ce598f..383773d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java @@ -23,14 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.MessageListener; import org.apache.stratos.messaging.domain.Message; -import org.apache.stratos.messaging.util.Constants; -import org.apache.stratos.messaging.util.Util; -import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; -import org.eclipse.paho.client.mqttv3.MqttCallback; -import org.eclipse.paho.client.mqttv3.MqttMessage; - -import javax.jms.JMSException; -import javax.jms.TextMessage; /** * Implements functionality for receiving text based event messages from the http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java index a3ae076..72742cc 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; /** * A thread for receiving instance notifier information from message broker. @@ -49,7 +49,7 @@ public class InstanceStatusEventReceiver implements Runnable { public void run() { try { // Start topic subscriber thread - subscriber = new Subscriber(Constants.INSTANCE_STATUS_TOPIC, messageListener); + subscriber = new Subscriber(Util.Topics.INSTANCE_STATUS_TOPIC.getTopicName(), messageListener); // subscriber.setMessageListener(messageListener); Thread subscriberThread = new Thread(subscriber); subscriberThread.start(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java index 30adebe..2b2214b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java @@ -25,9 +25,8 @@ import org.apache.stratos.messaging.domain.Message; import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; import org.apache.stratos.messaging.message.processor.tenant.TenantMessageProcessorChain; -import org.apache.stratos.messaging.util.Constants; -import javax.jms.TextMessage; + /** http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java index 0e4c980..d8fc663 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; /** * A thread for receiving tenant information from message broker and @@ -50,7 +50,7 @@ public class TenantEventReceiver implements Runnable { public void run() { try { // Start topic subscriber thread - subscriber = new Subscriber(Constants.TENANT_TOPIC, messageListener); + subscriber = new Subscriber(Util.Topics.TENANT_TOPIC.getTopicName(), messageListener); // subscriber.setMessageListener(messageListener); Thread subscriberThread = new Thread(subscriber); subscriberThread.start(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java index 60acbd9..5b411d3 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java @@ -23,7 +23,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.Subscriber; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.util.Constants; +import org.apache.stratos.messaging.util.Util; + + /** * A thread for receiving topology information from message broker and @@ -46,14 +48,16 @@ public class TopologyEventReceiver implements Runnable { messageDelegator.addEventListener(eventListener); } - @Override - public void run() { - try { - // Start topic subscriber thread - subscriber = new Subscriber(Constants.TOPOLOGY_TOPIC, messageListener); -// subscriber.setMessageListener(messageListener); - Thread subscriberThread = new Thread(subscriber); - subscriberThread.start(); + @Override + public void run() { + try { + // Start topic subscriber thread + subscriber = new Subscriber(Util.Topics.TOPOLOGY_TOPIC.getTopicName(), messageListener); + // subscriber.setMessageListener(messageListener); + + Thread subscriberThread = new Thread(subscriber); + subscriberThread.start(); + if (log.isDebugEnabled()) { log.debug("Topology event message receiver thread started"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/ad66a0cd/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 deleted file mode 100644 index af450b9..0000000 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.stratos.messaging.util; - -public class Constants { - /* Message broker topic names */ - public static final String TOPOLOGY_TOPIC = "topology/#"; - public static final String HEALTH_STAT_TOPIC = "summarized-health-stats"; - public static final String INSTANCE_STATUS_TOPIC = "instance/status/#"; - public static final String INSTANCE_NOTIFIER_TOPIC = "instance/notifier/#"; - public static final String APPLICATIONS_TOPIC = "applications/#"; - public static final String CLUSTER_STATUS_TOPIC = "cluster/status/#"; - public static final String TENANT_TOPIC = "tenant/#"; - - public static final String TENANT_RANGE_ALL = "*"; - public static final String TENANT_RANGE_DELIMITER = "-"; - - /* Topology filter constants */ - public static final String FILTER_VALUE_ASSIGN_OPERATOR = "="; - public static final String FILTER_KEY_VALUE_PAIR_SEPARATOR = "|"; - public static final String FILTER_VALUE_SEPARATOR = ","; - - public static final String TOPOLOGY_SERVICE_FILTER = "stratos.topology.service.filter"; - public static final String TOPOLOGY_SERVICE_FILTER_SERVICE_NAME = "service-name"; - - public static final String TOPOLOGY_CLUSTER_FILTER = "stratos.topology.cluster.filter"; - public static final String TOPOLOGY_CLUSTER_FILTER_CLUSTER_ID = "cluster-id"; - - 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"; - public static final String LOAD_BALANCER_REF = "load.balancer.ref"; - 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"; - public static final String EXISTING_LOAD_BALANCERS = "existing.load.balancers"; - public static final String LOAD_BALANCED_SERVICE_TYPE = "load.balanced.service.type"; - - public static final String IS_PRIMARY = "PRIMARY"; - - // System Properties - public static final String AVERAGE_PING_INTERVAL_PROPERTY = "stratos.messaging.averagePingInterval"; - public static final String FAILOVER_PING_INTERVAL_PROPERTY = "stratos.messaging.failoverPingInterval"; - - // Default values - public static final int DEFAULT_AVERAGE_PING_INTERVAL = 1000; - public static final int DEFAULT_FAILOVER_PING_INTERVAL = 30000; -}
