Merge branch 'masterreviewfix2' of https://github.com/gayangunarathne/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/302c58b3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/302c58b3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/302c58b3 Branch: refs/heads/master Commit: 302c58b384b54c2215c6559122e2a41157adac4e Parents: 917be8e e390488 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Nov 28 19:01:10 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Nov 28 19:01:10 2014 +0530 ---------------------------------------------------------------------- .../context/cluster/ClusterContextFactory.java | 16 +- .../InstanceNotificationPublisher.java | 1 - .../monitor/cluster/ClusterMonitorFactory.java | 14 +- .../autoscaler/rule/RuleTasksDelegator.java | 5 +- .../apache/stratos/cartridge/agent/Main.java | 4 +- .../publisher/CartridgeAgentEventPublisher.java | 1 - .../impl/CloudControllerServiceImpl.java | 8 +- .../CloudControllerServiceComponent.java | 4 +- .../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 | 155 ++++++++++--------- .../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 +++++++++----- .../messaging/test/MessageFilterTest.java | 4 - .../rest/endpoint/api/StratosApiV40Utils.java | 4 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../extension/FaultHandlingWindowProcessor.java | 4 +- 40 files changed, 296 insertions(+), 317 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/302c58b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
