diff --git a/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorServiceDS.java b/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorServiceDS.java index 706b78182..7a70bd37d 100644 --- a/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorServiceDS.java +++ b/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorServiceDS.java @@ -15,10 +15,6 @@ */ package org.wso2.carbon.event.processor.core.internal.ds; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.MemberAttributeEvent; -import com.hazelcast.core.MembershipEvent; -import com.hazelcast.core.MembershipListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; @@ -126,41 +122,6 @@ protected void unsetEventStreamService(EventStreamService eventStreamService) { EventProcessorValueHolder.registerEventStreamService(null); } - @Reference( - name = "hazelcast.instance.service", - service = com.hazelcast.core.HazelcastInstance.class, - cardinality = ReferenceCardinality.OPTIONAL, - policy = ReferencePolicy.DYNAMIC, - unbind = "unsetHazelcastInstance") - protected void setHazelcastInstance(HazelcastInstance hazelcastInstance) { - - EventProcessorValueHolder.registerHazelcastInstance(hazelcastInstance); - hazelcastInstance.getCluster().addMembershipListener(new MembershipListener() { - - @Override - public void memberAdded(MembershipEvent membershipEvent) { - - } - - @Override - public void memberRemoved(MembershipEvent membershipEvent) { - - } - - @Override - public void memberAttributeChanged(MemberAttributeEvent memberAttributeEvent) { - - } - }); - EventProcessorValueHolder.getEventProcessorService().notifyServiceAvailability(EventProcessorConstants - .HAZELCAST_INSTANCE); - } - - protected void unsetHazelcastInstance(HazelcastInstance hazelcastInstance) { - - EventProcessorValueHolder.registerHazelcastInstance(null); - } - @Reference( name = "user.realm.delegating", service = org.wso2.carbon.user.core.UserRealm.class, diff --git a/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorValueHolder.java b/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorValueHolder.java index 55192bbe4..bc551e7e7 100644 --- a/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorValueHolder.java +++ b/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/ds/EventProcessorValueHolder.java @@ -15,7 +15,6 @@ */ package org.wso2.carbon.event.processor.core.internal.ds; -import com.hazelcast.core.HazelcastInstance; import org.apache.axis2.context.ConfigurationContext; import org.wso2.carbon.base.api.ServerConfigurationService; import org.wso2.carbon.event.processor.core.internal.CarbonEventProcessorManagementService; @@ -34,7 +33,6 @@ public class EventProcessorValueHolder { private static CarbonEventProcessorService eventProcessorService; private static EventManagementService eventManagementService; private static EventStreamService eventStreamService; - private static HazelcastInstance hazelcastInstance; private static UserRealm userRealm; private static DataSourceService dataSourceService; private static ServerConfigurationService serverConfiguration; @@ -60,15 +58,7 @@ public static void registerEventProcessorService(CarbonEventProcessorService ser public static CarbonEventProcessorService getEventProcessorService() { return eventProcessorService; } - - public static void registerHazelcastInstance(HazelcastInstance hazelcastInstance) { - EventProcessorValueHolder.hazelcastInstance = hazelcastInstance; - } - - public static HazelcastInstance getHazelcastInstance() { - return hazelcastInstance; - } - + // public static DataAccessService getDataAccessService() { // return dataAccessService; // } diff --git a/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/util/EventProcessorConstants.java b/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/util/EventProcessorConstants.java index b9d15a193..3161a8e09 100644 --- a/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/util/EventProcessorConstants.java +++ b/components/event-processor/org.wso2.carbon.event.processor.core/src/main/java/org/wso2/carbon/event/processor/core/internal/util/EventProcessorConstants.java @@ -64,8 +64,6 @@ private EventProcessorConstants() { public static final String CORRELATION = "correlation"; public static final String META_PREFIX = "meta_"; public static final String CORRELATION_PREFIX = "correlation_"; - - public static final String HAZELCAST_INSTANCE = "hazelcast.instance"; public static final String NO_DEPENDENCY_INFO_MSG = "No dependency information available for this event formatter"; // For storm query plan builder.