From 776a6b9bb7bb85b8ab2d0ee9bda208e2809da83b Mon Sep 17 00:00:00 2001
From: cnapagoda <cnapagoda@gmail.com>
Date: Wed, 3 Jun 2015 15:34:53 +0530
Subject: [PATCH] Fix for REGISTRY-2554 - G-Reg support for GC notification

---
 .../ui/i18n/Resources.properties              |   7 +
 .../registrysubscription-ajaxprocessor.jsp    |  11 +-
 .../handlers/GovernanceEventingHandler.java   | 221 +++++++++++++++---
 .../PublisherCheckListItemCheckedEvent.java   |  51 ++++
 .../PublisherCheckListItemUncheckedEvent.java |  51 ++++
 .../PublisherLifeCycleStateChangedEvent.java  |  51 ++++
 .../events/PublisherResourceUpdatedEvent.java |  51 ++++
 .../StoreLifeCycleStateChangedEvent.java      |  51 ++++
 .../events/StoreResourceUpdatedEvent.java     |  51 ++++
 .../eventing/internal/EventDataHolder.java    |  95 ++++++++
 ...nanceRegistryEventingServiceComponent.java |  14 +-
 .../registry/eventing/internal/Utils.java     |  94 --------
 12 files changed, 618 insertions(+), 130 deletions(-)
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemCheckedEvent.java
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemUncheckedEvent.java
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherLifeCycleStateChangedEvent.java
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherResourceUpdatedEvent.java
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreLifeCycleStateChangedEvent.java
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreResourceUpdatedEvent.java
 create mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/EventDataHolder.java
 delete mode 100644 components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/Utils.java

diff --git a/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/org/wso2/carbon/governance/notifications/ui/i18n/Resources.properties b/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/org/wso2/carbon/governance/notifications/ui/i18n/Resources.properties
index 31b8250f1..8cdbe39c8 100644
--- a/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/org/wso2/carbon/governance/notifications/ui/i18n/Resources.properties
+++ b/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/org/wso2/carbon/governance/notifications/ui/i18n/Resources.properties
@@ -86,3 +86,10 @@ work.list.add.new.notifications=Add Request To Work List
 work.list.hide=Hide
 work.list.create=Create
 work.list.cancel=Cancel
+
+publisher.checklist.checked=Publisher Checklist Check
+publisher.checklist.unchecked=Publisher Checklist Uncheck
+publisher.lifecycle.state.changed=Publisher Lifecycle Change
+publisher.update=Publisher Update
+store.lifecycle.state.changed=Store Lifecycle Change
+store.update=Store Update
diff --git a/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/web/notifications/registrysubscription-ajaxprocessor.jsp b/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/web/notifications/registrysubscription-ajaxprocessor.jsp
index 60665ccd0..baa3b5ab7 100644
--- a/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/web/notifications/registrysubscription-ajaxprocessor.jsp
+++ b/components/governance/org.wso2.carbon.governance.notifications.ui/src/main/resources/web/notifications/registrysubscription-ajaxprocessor.jsp
@@ -35,6 +35,7 @@
     String[] events = null;
     String[] resourceEventNames = null;
     String[] collectionEventNames = null;
+    boolean[] isEventVisible = null;
     boolean isResource = true;
     boolean canSubscribeOthers = false;
     boolean canSubscribeOtherRoles = false;
@@ -63,11 +64,17 @@
         events = new String[eventTypes.length];
         resourceEventNames = new String[eventTypes.length];
         collectionEventNames = new String[eventTypes.length];
+        isEventVisible = new boolean[eventTypes.length];
         for (int i = 0; i < eventTypes.length; i++) {
             if (eventTypes[i] != null) {
                 events[i] = eventTypes[i].getId();
                 resourceEventNames[i] = eventTypes[i].getResourceEvent();
                 collectionEventNames[i] = eventTypes[i].getCollectionEvent();
+                if (eventTypes[i].getId().startsWith("publisher") || eventTypes[i].getId().startsWith("store")){
+                    isEventVisible[i] = false;
+                } else{
+                    isEventVisible[i] = true;
+                }
             }
         }
         if (request.getParameter("path") != null) {
@@ -97,7 +104,7 @@
 <%
     for (int i = 0; i < events.length; i++) {
         if (isResource) {
-            if (resourceEventNames[i] != null) {
+            if (resourceEventNames[i] != null && isEventVisible[i]) {
 %>
                     <option value="<%=resourceEventNames[i]%>">
                         <% if (events[i].startsWith("custom:")) { %><%=events[i].substring("custom:".length())%>
@@ -105,7 +112,7 @@
                     </option>
 <%
             }
-        } else if (collectionEventNames[i] != null) {
+        } else if (collectionEventNames[i] != null && isEventVisible[i]) {
 %>
                     <option value="<%=collectionEventNames[i]%>">
                         <% if (events[i].startsWith("custom:")) { %><%=events[i].substring("custom:".length())%>
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/GovernanceEventingHandler.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/GovernanceEventingHandler.java
index d463897d1..98bbc2a4e 100644
--- a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/GovernanceEventingHandler.java
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/GovernanceEventingHandler.java
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*  Copyright (c) 2005-2010,2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 *
 *  WSO2 Inc. licenses this file to you under the Apache License,
 *  Version 2.0 (the "License"); you may not use this file except
@@ -23,20 +23,14 @@
 import org.wso2.carbon.governance.api.util.GovernanceConstants;
 import org.wso2.carbon.governance.lcm.tasks.events.LifecycleNotificationEvent;
 import org.wso2.carbon.governance.lcm.tasks.LCNotificationScheduler;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.CheckListItemCheckedEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.CheckListItemUncheckedEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.LifeCycleApprovalNeededEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.LifeCycleApprovalWithdrawnEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.LifeCycleApprovedEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.LifeCycleCreatedEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.LifeCycleDeletedEvent;
-import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.LifeCycleStateChangedEvent;
-import org.wso2.carbon.governance.registry.eventing.internal.Utils;
+import org.wso2.carbon.governance.registry.eventing.handlers.utils.events.*;
+import org.wso2.carbon.governance.registry.eventing.internal.EventDataHolder;
 import org.wso2.carbon.registry.common.eventing.RegistryEvent;
 import org.wso2.carbon.registry.core.Collection;
 import org.wso2.carbon.registry.core.Registry;
 import org.wso2.carbon.registry.core.Resource;
 import org.wso2.carbon.registry.core.ResourceImpl;
+import org.wso2.carbon.registry.core.config.Mount;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.jdbc.handlers.Handler;
 import org.wso2.carbon.registry.core.jdbc.handlers.RequestContext;
@@ -59,46 +53,58 @@ public class GovernanceEventingHandler extends Handler {
     private final String item_click = "itemClick";
 
     public void init(String defaultNotificationEndpoint) {
-        Utils.setDefaultNotificationServiceURL(defaultNotificationEndpoint);
+        EventDataHolder.getInstance().setDefaultNotificationServiceURL(defaultNotificationEndpoint);
     }
 
     public GovernanceEventingHandler() {
         try {
-            Utils.getRegistryNotificationService().registerEventType("checklist.item.checked", CheckListItemCheckedEvent.EVENT_NAME, CheckListItemCheckedEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("checklist.item.checked", CheckListItemCheckedEvent.EVENT_NAME, CheckListItemCheckedEvent.EVENT_NAME);
             /*Utils.getRegistryNotificationService().registerEventTypeExclusion("checklist.item.checked", "/");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("checklist.item.checked", "/system");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("checklist.item.checked", "/system/.*");*/
-            Utils.getRegistryNotificationService().registerEventType("checklist.item.unchecked", CheckListItemUncheckedEvent.EVENT_NAME, CheckListItemUncheckedEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("checklist.item.unchecked", CheckListItemUncheckedEvent.EVENT_NAME, CheckListItemUncheckedEvent.EVENT_NAME);
             /*Utils.getRegistryNotificationService().registerEventTypeExclusion("checklist.item.unchecked", "/");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("checklist.item.unchecked", "/system");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("checklist.item.unchecked", "/system/.*");*/
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.state.changed", LifeCycleStateChangedEvent.EVENT_NAME, LifeCycleStateChangedEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.state.changed", LifeCycleStateChangedEvent.EVENT_NAME, LifeCycleStateChangedEvent.EVENT_NAME);
             /*Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.state.changed", "/");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.state.changed", "/system");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.state.changed", "/system/.*");*/
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.deleted", LifeCycleDeletedEvent.EVENT_NAME, LifeCycleDeletedEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.deleted", LifeCycleDeletedEvent.EVENT_NAME, LifeCycleDeletedEvent.EVENT_NAME);
             /*Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.deleted", "/");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.deleted", "/system");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.deleted", "/system/.*");*/
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.created", LifeCycleCreatedEvent.EVENT_NAME, LifeCycleCreatedEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.created", LifeCycleCreatedEvent.EVENT_NAME, LifeCycleCreatedEvent.EVENT_NAME);
             /*Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.created", "/");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.created", "/system");
             Utils.getRegistryNotificationService().registerEventTypeExclusion("lifecycle.created", "/system/.*");*/
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.approved", LifeCycleApprovedEvent.EVENT_NAME, LifeCycleApprovedEvent.EVENT_NAME);
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.approval.need", LifeCycleApprovalNeededEvent.EVENT_NAME, LifeCycleApprovalNeededEvent.EVENT_NAME);
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.approval.withdrawn", LifeCycleApprovalWithdrawnEvent.EVENT_NAME, LifeCycleApprovalWithdrawnEvent.EVENT_NAME);
-            Utils.getRegistryNotificationService().registerEventType("lifecycle.checkpoint.notification", LifecycleNotificationEvent.EVENT_NAME, LifecycleNotificationEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.approved", LifeCycleApprovedEvent.EVENT_NAME, LifeCycleApprovedEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.approval.need", LifeCycleApprovalNeededEvent.EVENT_NAME, LifeCycleApprovalNeededEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.approval.withdrawn", LifeCycleApprovalWithdrawnEvent.EVENT_NAME, LifeCycleApprovalWithdrawnEvent.EVENT_NAME);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("lifecycle.checkpoint.notification", LifecycleNotificationEvent.EVENT_NAME, LifecycleNotificationEvent.EVENT_NAME);
+
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("publisher.checklist.checked", PublisherCheckListItemCheckedEvent.EVENT_NAME, null);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("publisher.checklist.item.unchecked", PublisherCheckListItemUncheckedEvent.EVENT_NAME, null);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("publisher.lifecycle.state.changed", PublisherLifeCycleStateChangedEvent.EVENT_NAME, null);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("publisher.update", PublisherResourceUpdatedEvent.EVENT_NAME,null);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("store.lifecycle.state.changed", StoreLifeCycleStateChangedEvent.EVENT_NAME, null);
+            EventDataHolder.getInstance().getRegistryNotificationService().registerEventType("store.update", StoreResourceUpdatedEvent.EVENT_NAME, null);
+
         } catch (Exception e) {
             handleException("Unable to register Event Types", e);
         }
     }
 
     public void put(RequestContext requestContext) throws RegistryException {
+
         String path = requestContext.getResourcePath().getPath();
         String relativePath = RegistryUtils.getRelativePath(requestContext.getRegistryContext(),
                 path);
         Resource oldResource = requestContext.getOldResource();
         Resource newResource = requestContext.getResource();
+
+        boolean isNotCollection = !(requestContext.getResource() instanceof Collection);
+
         if (oldResource == null || newResource == null ||
             oldResource.getProperties() == null || newResource.getProperties() == null) {
             return;
@@ -109,6 +115,7 @@ public void put(RequestContext requestContext) throws RegistryException {
         String oldLcName = oldResource.getProperty("registry.LC.name");
         List oldLifecycleList = (List) props.get("registry.Aspects");
         List newLifecycleList = (List) newProps.get("registry.Aspects");
+        boolean isNotificationSent = false;
         if (lcName == null && oldLcName != null) {
             StringBuilder messageBuilder = new StringBuilder("[").append(oldLcName)
                     .append("] The LifeCycle was deleted for resource at ").append(relativePath).append(".");
@@ -118,6 +125,7 @@ public void put(RequestContext requestContext) throws RegistryException {
             event.setTenantId(CurrentSession.getCallerTenantId());
             try {
                 notify(event, requestContext.getRegistry(), relativePath);
+                isNotificationSent = true;
             } catch (Exception e) {
                 handleException("Unable to send notification for Put Operation", e);
             }
@@ -147,6 +155,7 @@ public void put(RequestContext requestContext) throws RegistryException {
             event.setTenantId(CurrentSession.getCallerTenantId());
             try {
                 notify(event, requestContext.getRegistry(), relativePath);
+                isNotificationSent = true;
             } catch (Exception e) {
                 handleException("Unable to send notification for Put Operation", e);
             }
@@ -160,6 +169,7 @@ public void put(RequestContext requestContext) throws RegistryException {
            		approvalEvent.setTenantId(CurrentSession.getCallerTenantId());
            		try {
            			notify(approvalEvent, requestContext.getRegistry(), relativePath);
+                    isNotificationSent = true;
                 } catch (Exception e) {
                 	handleException("Unable to send notification for Put Operation", e);
                 }
@@ -167,7 +177,8 @@ public void put(RequestContext requestContext) throws RegistryException {
             }                  
             return;
         }
-        
+
+
         for (Map.Entry<Object, Object> e : props.entrySet()) {
             String propKey = (String) e.getKey();
             if (propKey.matches("registry\\p{Punct}.*\\p{Punct}checklist\\p{Punct}.*")) {
@@ -234,11 +245,36 @@ public void put(RequestContext requestContext) throws RegistryException {
                             } catch (Exception ex) {
                                 handleException("Unable to send notification for Put Operation", ex);
                             }
+                            createPublisherLCNotification(event, requestContext, relativePath);
+                            isNotificationSent = true;
                         }
                     }
                 }
             }
         }
+        if (oldResource != null && sendNotifications(requestContext,relativePath) && isNotCollection && !isNotificationSent) {
+            RegistryEvent<String> pubEvent = new PublisherResourceUpdatedEvent<String>("The resource at path " + relativePath + " was updated.");
+            ((PublisherResourceUpdatedEvent)pubEvent).setResourcePath(relativePath);
+            pubEvent.setParameter("RegistryOperation", "put");
+            pubEvent.setTenantId(CurrentSession.getCallerTenantId());
+            try {
+                notify(pubEvent, requestContext.getRegistry(), relativePath);
+            } catch (Exception e) {
+                handleException("Unable to send notification for Update Operation", e);
+            }
+
+            RegistryEvent<String> storeEvent = new StoreResourceUpdatedEvent<String>("The resource at path " + relativePath + " was updated.");
+            ((StoreResourceUpdatedEvent)storeEvent).setResourcePath(relativePath);
+            storeEvent.setParameter("RegistryOperation", "put");
+            storeEvent.setTenantId(CurrentSession.getCallerTenantId());
+
+            try {
+                notify(storeEvent, requestContext.getRegistry(), relativePath);
+            } catch (Exception e) {
+                handleException("Unable to send notification for Update Operation", e);
+            }
+
+        }
         invokeApprovalNotification(requestContext, relativePath);
     }
 
@@ -329,6 +365,7 @@ public void invokeAspect(RequestContext requestContext) throws RegistryException
                oldState = oldStates.get(property);
                newState = changeStates.get(property);
                String extendedMessage = "";
+               boolean isUpdateOnly = false;
                if (!oldPath.equals(path)) {
                    if (resource instanceof Collection) {
                        extendedMessage = ". The collection has moved from: '" + relativeOldPath + "' to: '" +
@@ -339,6 +376,7 @@ public void invokeAspect(RequestContext requestContext) throws RegistryException
                    }
                } else {
                    extendedMessage = " for resource at " + path + ".";
+                   isUpdateOnly = true;
                }
                RegistryEvent<String> event = new LifeCycleStateChangedEvent<String>("[" + lcName + "] The LifeCycle State Changed from '" +
                                                                                     oldState + "' to '" + newState+"'" + extendedMessage);
@@ -356,6 +394,17 @@ public void invokeAspect(RequestContext requestContext) throws RegistryException
                } catch (Exception e) {
                    handleException("Unable to send notification for Aspect Invoke Operation", e);
                }
+               if (isUpdateOnly) {
+                   //Send Store Notification
+                   sendPublisherLCNotification(lcName,oldState,newState,isEnvironmentChange,relativeOldPath,relativePath,requestContext, extendedMessage);
+                   //end of the store notification
+
+                   //Send publisher Notification
+                   sendStoreLCNotification(lcName,oldState,newState,isEnvironmentChange,relativeOldPath,relativePath,requestContext, extendedMessage);
+                   //end of the publisher notification
+               }
+
+
                // When LC move one stage to another, Approval notification may send to user
                if(sendInitialNotification(requestContext, relativePath)){
                    RegistryEvent<String> approveEvent = new LifeCycleApprovalNeededEvent<String>(
@@ -385,20 +434,22 @@ public void invokeAspect(RequestContext requestContext) throws RegistryException
 
     protected void notify(RegistryEvent event, Registry registry, String path) throws Exception {
         try {
-            if (Utils.getRegistryNotificationService() == null) {
+            if (EventDataHolder.getInstance().getRegistryNotificationService() == null) {
                 log.debug("Eventing service is unavailable.");
                 return;
             }
             if (registry == null || registry.getEventingServiceURL(path) == null) {
-                Utils.getRegistryNotificationService().notify(event);
+                EventDataHolder.getInstance().getRegistryNotificationService().notify(event);
                 return;
-            } else if (Utils.getDefaultNotificationServiceURL() == null) {
+            } else if (EventDataHolder.getInstance().getDefaultNotificationServiceURL() == null) {
                 log.error("Governance Eventing Handler is not properly initialized");
-            } else if (registry.getEventingServiceURL(path).equals(Utils.getDefaultNotificationServiceURL())) {
-                Utils.getRegistryNotificationService().notify(event);
+            } else if (registry.getEventingServiceURL(path).equals(
+                    EventDataHolder.getInstance().getDefaultNotificationServiceURL())) {
+                EventDataHolder.getInstance().getRegistryNotificationService().notify(event);
                 return;
             } else {
-                Utils.getRegistryNotificationService().notify(event, registry.getEventingServiceURL(path));
+                EventDataHolder.getInstance().getRegistryNotificationService()
+                               .notify(event, registry.getEventingServiceURL(path));
                 return;
             }
         } catch (RegistryException e) {
@@ -555,5 +606,121 @@ private String getLCName(String property){
         }
         return null;
     }
+
+    private void sendStoreLCNotification(String lcName, String oldState, String newState,boolean isEnvironmentChange, String relativeOldPath, String relativePath,RequestContext requestContext, String extendedMessage){
+        //Send Store Notification
+
+        RegistryEvent<String> storeLCChanges = new StoreLifeCycleStateChangedEvent<String>("[" + lcName + "] The LifeCycle State Changed from '" +
+                                                                                           oldState + "' to '" + newState+"'"+ extendedMessage);
+        storeLCChanges.setParameter("LifecycleName", lcName);
+        storeLCChanges.setParameter("OldLifecycleState", oldState);
+        storeLCChanges.setParameter("NewLifecycleState", newState);
+        if(isEnvironmentChange){
+            ((StoreLifeCycleStateChangedEvent)storeLCChanges).setResourcePath(relativeOldPath);
+        }else{
+            ((StoreLifeCycleStateChangedEvent)storeLCChanges).setResourcePath(relativePath);
+        }
+        storeLCChanges.setTenantId(CurrentSession.getCallerTenantId());
+        try {
+            notify(storeLCChanges, requestContext.getRegistry(), relativePath);
+        } catch (Exception e) {
+            handleException("Unable to send notification for Aspect Invoke Operation", e);
+        }
+        //end of the store notification
+    }
+
+    private void sendPublisherLCNotification(String lcName, String oldState, String newState,boolean isEnvironmentChange, String relativeOldPath, String relativePath,RequestContext requestContext, String extendedMessage){
+        //Send Store Notification
+        RegistryEvent<String> publisherLCChanges = new PublisherLifeCycleStateChangedEvent<String>("[" + lcName + "] The LifeCycle State Changed from '" +
+                                                                                                   oldState + "' to '" + newState+"'"+ extendedMessage);
+        publisherLCChanges.setParameter("LifecycleName", lcName);
+        publisherLCChanges.setParameter("OldLifecycleState", oldState);
+        publisherLCChanges.setParameter("NewLifecycleState", newState);
+        if(isEnvironmentChange){
+            ((PublisherLifeCycleStateChangedEvent)publisherLCChanges).setResourcePath(relativeOldPath);
+        }else{
+            ((PublisherLifeCycleStateChangedEvent)publisherLCChanges).setResourcePath(relativePath);
+        }
+        publisherLCChanges.setTenantId(CurrentSession.getCallerTenantId());
+        try {
+            notify(publisherLCChanges, requestContext.getRegistry(), relativePath);
+        } catch (Exception e) {
+            handleException("Unable to send notification for Aspect Invoke Operation", e);
+        }
+        //end of the store notification
+    }
+
+
+    private void createPublisherLCNotification(RegistryEvent event, RequestContext requestContext, String relativePath) {
+        if (event instanceof CheckListItemUncheckedEvent) {
+            RegistryEvent checkListEvent = new PublisherCheckListItemUncheckedEvent<String>(event.getMessage().toString());
+            ((PublisherCheckListItemUncheckedEvent)checkListEvent).setResourcePath(relativePath);
+            checkListEvent.setParameter("LifecycleState", ((Map<String, String>)event.getParameters()).get("LifecycleState"));
+            checkListEvent.setParameter("CheckItem", ((Map<String, String>)event.getParameters()).get("CheckItem"));
+            checkListEvent.setParameter("LifecycleName", ((Map<String, String>)event.getParameters()).get("LifecycleName"));
+            checkListEvent.setTenantId(CurrentSession.getCallerTenantId());
+            try {
+                notify(checkListEvent, requestContext.getRegistry(), relativePath);
+            } catch (Exception e) {
+                handleException("Unable to send notification for Aspect Invoke Operation", e);
+            }
+
+        } else if (event instanceof CheckListItemCheckedEvent) {
+            RegistryEvent checkListEvent = new PublisherCheckListItemCheckedEvent<String>(event.getMessage().toString());
+            ((PublisherCheckListItemCheckedEvent)checkListEvent).setResourcePath(relativePath);
+            checkListEvent.setParameter("LifecycleState", ((Map<String, String>)event.getParameters()).get("LifecycleState"));
+            checkListEvent.setParameter("CheckItem", ((Map<String, String>)event.getParameters()).get("CheckItem"));
+            checkListEvent.setTenantId(CurrentSession.getCallerTenantId());
+            checkListEvent.setParameter("LifecycleName", ((Map<String, String>)event.getParameters()).get("LifecycleName"));
+            try {
+                notify(checkListEvent, requestContext.getRegistry(), relativePath);
+            } catch (Exception e) {
+                handleException("Unable to send notification for Aspect Invoke Operation", e);
+            }
+        }
+
+    }
+
+    /**
+     * Method to get the actual depth of the request
+     */
+    private int getRequestDepth(RequestContext requestContext){
+        int requestDepth = -1;
+        if (requestContext.getRegistry().getRegistryContext() != null &&
+            requestContext.getRegistry().getRegistryContext().getDataAccessManager() != null &&
+            requestContext.getRegistry().getRegistryContext().getDataAccessManager().getDatabaseTransaction() != null) {
+            requestDepth =
+                    requestContext.getRegistry().getRegistryContext().getDataAccessManager().getDatabaseTransaction()
+                                  .getNestedDepth();
+        }
+        return requestDepth;
+    }
+
+    private boolean sendNotifications(RequestContext requestContext, String relativePath) {
+
+        boolean isMountPath = false;
+        List<Mount> mounts = requestContext.getRegistry().getRegistryContext().getMounts();
+        for (Mount mount : mounts) {
+            String mountPath = mount.getPath();
+            if (relativePath.startsWith(mountPath)) {
+                isMountPath = true;
+            }
+        }
+        if (isMountPath) {
+            if (getRequestDepth(requestContext) != 1) {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            int requestDepth = getRequestDepth(requestContext);
+            if (!(requestDepth == 1 || requestDepth == 3)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+    }
 }
 
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemCheckedEvent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemCheckedEvent.java
new file mode 100644
index 000000000..8425afe46
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemCheckedEvent.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.handlers.utils.events;
+
+import org.wso2.carbon.registry.common.eventing.RegistryEvent;
+
+public class PublisherCheckListItemCheckedEvent<T> extends RegistryEvent<T> {
+
+    private String resourcePath = null;
+
+    public static final String EVENT_NAME = "PublisherCheckListItemChecked";
+
+    public PublisherCheckListItemCheckedEvent() {
+        super();
+    }
+
+    /**
+     * Construct the Registry Event by using the message
+     * @param message any Object
+     */
+    public PublisherCheckListItemCheckedEvent(T message) {
+        super(message);
+    }
+
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        setTopic(TOPIC_SEPARATOR + EVENT_NAME + resourcePath);
+        setOperationDetails(resourcePath, EVENT_NAME, RegistryEvent.ResourceType.UNKNOWN);
+    }
+
+    public String getResourcePath() {
+        return resourcePath;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemUncheckedEvent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemUncheckedEvent.java
new file mode 100644
index 000000000..94afe6e38
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherCheckListItemUncheckedEvent.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.handlers.utils.events;
+
+import org.wso2.carbon.registry.common.eventing.RegistryEvent;
+
+public class PublisherCheckListItemUncheckedEvent<T> extends RegistryEvent<T> {
+
+    private String resourcePath = null;
+
+    public static final String EVENT_NAME = "PublisherCheckListItemUnchecked";
+
+    public PublisherCheckListItemUncheckedEvent() {
+        super();
+    }
+
+    /**
+     * Construct the Registry Event by using the message
+     * @param message any Object
+     */
+    public PublisherCheckListItemUncheckedEvent(T message) {
+        super(message);
+    }
+
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        setTopic(TOPIC_SEPARATOR + EVENT_NAME + resourcePath);
+        setOperationDetails(resourcePath, EVENT_NAME, RegistryEvent.ResourceType.UNKNOWN);
+    }
+
+    public String getResourcePath() {
+        return resourcePath;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherLifeCycleStateChangedEvent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherLifeCycleStateChangedEvent.java
new file mode 100644
index 000000000..b90b96db1
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherLifeCycleStateChangedEvent.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.handlers.utils.events;
+
+import org.wso2.carbon.registry.common.eventing.RegistryEvent;
+
+public class PublisherLifeCycleStateChangedEvent<T> extends RegistryEvent<T> {
+
+    private String resourcePath = null;
+
+    public static final String EVENT_NAME = "PublisherLifeCycleStateChanged";
+
+    public PublisherLifeCycleStateChangedEvent() {
+        super();
+    }
+
+    /**
+     * Construct the Registry Event by using the message
+     * @param message any Object
+     */
+    public PublisherLifeCycleStateChangedEvent(T message) {
+        super(message);
+    }
+
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        setTopic(TOPIC_SEPARATOR + EVENT_NAME + resourcePath);
+        setOperationDetails(resourcePath, EVENT_NAME, RegistryEvent.ResourceType.UNKNOWN);
+    }
+
+    public String getResourcePath() {
+        return resourcePath;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherResourceUpdatedEvent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherResourceUpdatedEvent.java
new file mode 100644
index 000000000..57bf39e50
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/PublisherResourceUpdatedEvent.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.handlers.utils.events;
+
+import org.wso2.carbon.registry.common.eventing.RegistryEvent;
+
+public class PublisherResourceUpdatedEvent<T> extends RegistryEvent<T> {
+
+    private String resourcePath = null;
+
+    public static final String EVENT_NAME = "PublisherResourceUpdated";
+
+    public PublisherResourceUpdatedEvent() {
+        super();
+    }
+
+    /**
+     * Construct the Registry Event by using the message
+     * @param message any Object
+     */
+    public PublisherResourceUpdatedEvent(T message) {
+        super(message);
+    }
+
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        setTopic(TOPIC_SEPARATOR + EVENT_NAME + resourcePath);
+        setOperationDetails(resourcePath, EVENT_NAME, RegistryEvent.ResourceType.RESOURCE);
+    }
+
+    public String getResourcePath() {
+        return resourcePath;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreLifeCycleStateChangedEvent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreLifeCycleStateChangedEvent.java
new file mode 100644
index 000000000..e50d23618
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreLifeCycleStateChangedEvent.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.handlers.utils.events;
+
+import org.wso2.carbon.registry.common.eventing.RegistryEvent;
+
+public class StoreLifeCycleStateChangedEvent<T> extends RegistryEvent<T> {
+
+    private String resourcePath = null;
+
+    public static final String EVENT_NAME = "StoreLifeCycleStateChanged";
+
+    public StoreLifeCycleStateChangedEvent() {
+        super();
+    }
+
+    /**
+     * Construct the Registry Event by using the message
+     * @param message any Object
+     */
+    public StoreLifeCycleStateChangedEvent(T message) {
+        super(message);
+    }
+
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        setTopic(TOPIC_SEPARATOR + EVENT_NAME + resourcePath);
+        setOperationDetails(resourcePath, EVENT_NAME, RegistryEvent.ResourceType.UNKNOWN);
+    }
+
+    public String getResourcePath() {
+        return resourcePath;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreResourceUpdatedEvent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreResourceUpdatedEvent.java
new file mode 100644
index 000000000..3691f2542
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/handlers/utils/events/StoreResourceUpdatedEvent.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.handlers.utils.events;
+
+import org.wso2.carbon.registry.common.eventing.RegistryEvent;
+
+public class StoreResourceUpdatedEvent<T> extends RegistryEvent<T> {
+
+    private String resourcePath = null;
+
+    public static final String EVENT_NAME = "StoreResourceUpdated";
+
+    public StoreResourceUpdatedEvent() {
+        super();
+    }
+
+    /**
+     * Construct the Registry Event by using the message
+     * @param message any Object
+     */
+    public StoreResourceUpdatedEvent(T message) {
+        super(message);
+    }
+
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        setTopic(TOPIC_SEPARATOR + EVENT_NAME + resourcePath);
+        setOperationDetails(resourcePath, EVENT_NAME, ResourceType.RESOURCE);
+    }
+
+    public String getResourcePath() {
+        return resourcePath;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/EventDataHolder.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/EventDataHolder.java
new file mode 100644
index 000000000..8101b4e82
--- /dev/null
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/EventDataHolder.java
@@ -0,0 +1,95 @@
+/*
+ *  Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.internal;
+
+import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.registry.common.eventing.NotificationService;
+
+public class EventDataHolder {
+
+    private static EventDataHolder holder = new EventDataHolder();
+
+    private EventDataHolder(){
+    }
+
+    public static EventDataHolder getInstance(){
+         return holder;
+    }
+
+    private RegistryService registryService;
+
+    private NotificationService registryNotificationService;
+
+    private String defaultNotificationServiceURL;
+
+    private String remoteTopicHeaderName;
+
+    private String remoteTopicHeaderNS;
+
+    private String remoteSubscriptionStoreContext;
+
+    public void setRegistryService(RegistryService service) {
+        registryService = service;
+    }
+
+    public RegistryService getRegistryService() {
+        return registryService;
+    }
+
+    public String getDefaultNotificationServiceURL() {
+        return defaultNotificationServiceURL;
+    }
+
+    public void setDefaultNotificationServiceURL(String defaultNotificationServiceURL) {
+        this.defaultNotificationServiceURL = defaultNotificationServiceURL;
+    }
+
+    public String getRemoteTopicHeaderName() {
+        return remoteTopicHeaderName;
+    }
+
+    public void setRemoteTopicHeaderName(String remoteTopicHeaderName) {
+        this.remoteTopicHeaderName = remoteTopicHeaderName;
+    }
+
+    public String getRemoteTopicHeaderNS() {
+        return remoteTopicHeaderNS;
+    }
+
+    public void setRemoteTopicHeaderNS(String remoteTopicHeaderNS) {
+        this.remoteTopicHeaderNS = remoteTopicHeaderNS;
+    }
+
+    public String getRemoteSubscriptionStoreContext() {
+        return remoteSubscriptionStoreContext;
+    }
+
+    public void setRemoteSubscriptionStoreContext(String remoteSubscriptionStoreContext) {
+        this.remoteSubscriptionStoreContext = remoteSubscriptionStoreContext;
+    }
+
+    public NotificationService getRegistryNotificationService() {
+        return registryNotificationService;
+    }
+
+    public void setRegistryNotificationService(NotificationService registryNotificationService) {
+        this.registryNotificationService = registryNotificationService;
+    }
+}
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/GovernanceRegistryEventingServiceComponent.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/GovernanceRegistryEventingServiceComponent.java
index 86755a131..66e3bc9dc 100644
--- a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/GovernanceRegistryEventingServiceComponent.java
+++ b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/GovernanceRegistryEventingServiceComponent.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *  Copyright (c) 2005-2008,2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  *  WSO2 Inc. licenses this file to you under the Apache License,
  *  Version 2.0 (the "License"); you may not use this file except
@@ -62,21 +62,21 @@ protected void deactivate(ComponentContext context) {
     }
 
     protected void setRegistryService(RegistryService registryService) {
-        Utils.setRegistryService(registryService);
+        EventDataHolder.getInstance().setRegistryService(registryService);
         initailize();
     }
 
     protected void unsetRegistryService(RegistryService registryService) {
-        Utils.setRegistryService(null);
+        EventDataHolder.getInstance().setRegistryService(null);
     }
 
     protected void setRegistryNotificationService(NotificationService notificationService) {
-        Utils.setRegistryNotificationService(notificationService);
+        EventDataHolder.getInstance().setRegistryNotificationService(notificationService);
         initailize();
     }
 
     protected void unsetRegistryNotificationService(NotificationService notificationService) {
-        Utils.setRegistryNotificationService(null);
+        EventDataHolder.getInstance().setRegistryNotificationService(null);
     }
 
     protected void setListenerManager(ListenerManager listenerManager) {
@@ -95,10 +95,10 @@ private void initailize() {
                     "generated unless a custom handler has been configured.");
             return;
         }
-        RegistryService registryService = Utils.getRegistryService();
+        RegistryService registryService = EventDataHolder.getInstance().getRegistryService();
         if (!initialized &&
                 listenerManager != null && registryService != null &&
-                Utils.getRegistryNotificationService() != null) {
+                EventDataHolder.getInstance().getRegistryNotificationService() != null) {
             if (registryService instanceof RemoteRegistryService) {
                 initialized = true;
                 log.warn("Eventing is not available on Remote Registry");
diff --git a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/Utils.java b/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/Utils.java
deleted file mode 100644
index a3368559b..000000000
--- a/components/governance/org.wso2.carbon.governance.registry.eventing/src/main/java/org/wso2/carbon/governance/registry/eventing/internal/Utils.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  WSO2 Inc. 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.wso2.carbon.governance.registry.eventing.internal;
-
-import javax.servlet.http.HttpServletRequest;
-import org.wso2.carbon.registry.core.Registry;
-import org.wso2.carbon.registry.core.RegistryConstants;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.common.eventing.NotificationService;
-import org.apache.axis2.context.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class Utils {
-    private static final Log log = LogFactory.getLog(Utils.class);
-
-    private static RegistryService registryService;
-
-    private static NotificationService registryNotificationService;
-
-    private static String defaultNotificationServiceURL;
-
-    private static String remoteTopicHeaderName;
-
-    private static String remoteTopicHeaderNS;
-
-    private static String remoteSubscriptionStoreContext;
-
-    public static void setRegistryService(RegistryService service) {
-        registryService = service;
-    }
-
-    public static RegistryService getRegistryService() {
-        return registryService;
-    }
-
-    public static String getDefaultNotificationServiceURL() {
-        return defaultNotificationServiceURL;
-    }
-
-    public static void setDefaultNotificationServiceURL(String defaultNotificationServiceURL) {
-        Utils.defaultNotificationServiceURL = defaultNotificationServiceURL;
-    }
-
-    public static String getRemoteTopicHeaderName() {
-        return remoteTopicHeaderName;
-    }
-
-    public static void setRemoteTopicHeaderName(String remoteTopicHeaderName) {
-        Utils.remoteTopicHeaderName = remoteTopicHeaderName;
-    }
-
-    public static String getRemoteTopicHeaderNS() {
-        return remoteTopicHeaderNS;
-    }
-
-    public static void setRemoteTopicHeaderNS(String remoteTopicHeaderNS) {
-        Utils.remoteTopicHeaderNS = remoteTopicHeaderNS;
-    }
-
-    public static String getRemoteSubscriptionStoreContext() {
-        return remoteSubscriptionStoreContext;
-    }
-
-    public static void setRemoteSubscriptionStoreContext(String remoteSubscriptionStoreContext) {
-        Utils.remoteSubscriptionStoreContext = remoteSubscriptionStoreContext;
-    }
-
-    public static NotificationService getRegistryNotificationService() {
-        return registryNotificationService;
-    }
-
-    public static void setRegistryNotificationService(NotificationService registryNotificationService) {
-        Utils.registryNotificationService = registryNotificationService;
-    }
-}