Repository: stratos Updated Branches: refs/heads/master 6743601da -> 66f173226
JCA: removing no longer supported tenant Event listeners (subscribed / unsubscribed) Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/66f17322 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/66f17322 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/66f17322 Branch: refs/heads/master Commit: 66f1732262b88576e72167456ddf8969a4dc9800 Parents: 6743601 Author: Martin Eppel <[email protected]> Authored: Mon Mar 16 20:32:07 2015 -0700 Committer: Martin Eppel <[email protected]> Committed: Mon Mar 16 20:32:07 2015 -0700 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 3 +- .../agent/CartridgeAgentEventListeners.java | 57 ++++++++++++++------ 2 files changed, 44 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/66f17322/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index 4d8cc70..4377050 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -97,10 +97,11 @@ public class CartridgeAgent implements Runnable { } // Start tenant event receiver thread + /* registerTenantEventListeners(); if (log.isInfoEnabled()) { log.info("Cartridge agent registerTenantEventListeners done"); - } + } */ // Start application event receiver thread registerApplicationEventListeners(); http://git-wip-us.apache.org/repos/asf/stratos/blob/66f17322/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java index 6a3433b..b55027b 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java @@ -12,18 +12,19 @@ import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent; import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent; import org.apache.stratos.messaging.event.tenant.CompleteTenantEvent; -import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent; -import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent; +import org.apache.stratos.messaging.event.tenant.TenantCreatedEvent; +import org.apache.stratos.messaging.event.tenant.TenantRemovedEvent; +import org.apache.stratos.messaging.event.tenant.TenantUpdatedEvent; import org.apache.stratos.messaging.event.topology.*; import org.apache.stratos.messaging.listener.application.signup.ApplicationSignUpRemovedEventListener; import org.apache.stratos.messaging.listener.instance.notifier.ArtifactUpdateEventListener; import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupClusterEventListener; import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupMemberEventListener; import org.apache.stratos.messaging.listener.tenant.CompleteTenantEventListener; -import org.apache.stratos.messaging.listener.tenant.TenantSubscribedEventListener; -import org.apache.stratos.messaging.listener.tenant.TenantUnSubscribedEventListener; +import org.apache.stratos.messaging.listener.tenant.TenantCreatedEventListener; +import org.apache.stratos.messaging.listener.tenant.TenantRemovedEventListener; +import org.apache.stratos.messaging.listener.tenant.TenantUpdatedEventListener; import org.apache.stratos.messaging.listener.topology.*; -import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver; import org.apache.stratos.messaging.message.receiver.application.signup.ApplicationSignUpEventReceiver; import org.apache.stratos.messaging.message.receiver.instance.notifier.InstanceNotifierEventReceiver; import org.apache.stratos.messaging.message.receiver.tenant.TenantEventReceiver; @@ -407,16 +408,18 @@ public class CartridgeAgentEventListeners } }); - tenantEventReceiver.addEventListener(new TenantSubscribedEventListener() { + tenantEventReceiver.addEventListener(new TenantRemovedEventListener() { @Override protected void onEvent(Event event) { try { TenantManager.acquireReadLock(); if (log.isDebugEnabled()) { - log.debug("Tenant subscribed event received"); + log.debug("Tenant removed event received"); + } + TenantRemovedEvent tenantRemovedEvent = (TenantRemovedEvent) event; + if (log.isDebugEnabled()) { + log.debug("Tenant removed event received: " + tenantRemovedEvent); } - TenantSubscribedEvent tenantSubscribedEvent = (TenantSubscribedEvent) event; - extensionHandler.onTenantSubscribedEvent(tenantSubscribedEvent); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Error processing tenant subscribed event", e); @@ -427,19 +430,43 @@ public class CartridgeAgentEventListeners } }); - tenantEventReceiver.addEventListener(new TenantUnSubscribedEventListener() { + tenantEventReceiver.addEventListener(new TenantUpdatedEventListener() { + @Override + protected void onEvent(Event event) { + try { + TenantManager.acquireReadLock(); + if (log.isDebugEnabled()) { + log.debug("Tenant updated event received"); + } + TenantUpdatedEvent tenantUpdatedEvent = (TenantUpdatedEvent) event; + if (log.isDebugEnabled()) { + log.debug("Tenant updated event received: " + tenantUpdatedEvent); + } + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Error processing tenant updated event", e); + } + } finally { + TenantManager.releaseReadLock(); + } + } + }); + + tenantEventReceiver.addEventListener(new TenantCreatedEventListener() { @Override protected void onEvent(Event event) { try { TenantManager.acquireReadLock(); if (log.isDebugEnabled()) { - log.debug("Tenant unSubscribed event received"); + log.debug("Tenant updated event received"); + } + TenantCreatedEvent tenantCreatedEvent = (TenantCreatedEvent) event; + if (log.isDebugEnabled()) { + log.debug("Tenant updated event received: " + tenantCreatedEvent); } - TenantUnSubscribedEvent tenantUnSubscribedEvent = (TenantUnSubscribedEvent) event; - extensionHandler.onTenantUnSubscribedEvent(tenantUnSubscribedEvent); } catch (Exception e) { if (log.isErrorEnabled()) { - log.error("Error processing tenant unSubscribed event", e); + log.error("Error processing tenant updated event", e); } } finally { TenantManager.releaseReadLock(); @@ -450,7 +477,7 @@ public class CartridgeAgentEventListeners if(log.isInfoEnabled()) { log.info("Tenant event listener added ... "); } - } + } private void addApplicationsEventListeners() { applicationsEventReceiver.addEventListener(new ApplicationSignUpRemovedEventListener() {
