Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 77408 invoked from network); 21 Apr 2009 17:43:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Apr 2009 17:43:30 -0000 Received: (qmail 58531 invoked by uid 500); 21 Apr 2009 17:43:30 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 58465 invoked by uid 500); 21 Apr 2009 17:43:30 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 58456 invoked by uid 99); 21 Apr 2009 17:43:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 17:43:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 17:43:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A6DF123888E6; Tue, 21 Apr 2009 17:43:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r767238 - in /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint: Activator.java context/DefaultModuleContextEventSender.java Date: Tue, 21 Apr 2009 17:43:06 -0000 To: scm@geronimo.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090421174306.A6DF123888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Tue Apr 21 17:43:06 2009 New Revision: 767238 URL: http://svn.apache.org/viewvc?rev=767238&view=rev Log: Support for ModuleContextListener, remove a TODO Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java?rev=767238&r1=767237&r2=767238&view=diff ============================================================================== --- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java (original) +++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java Tue Apr 21 17:43:06 2009 @@ -36,7 +36,6 @@ import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; import org.osgi.framework.SynchronousBundleListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +80,6 @@ for (Bundle bundle : bundles) { destroyContext(bundle); } - // TODO: destroy all contexts context.removeBundleListener(this); this.sender.destroy(); this.handlers.destroy(); Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java?rev=767238&r1=767237&r2=767238&view=diff ============================================================================== --- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java (original) +++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java Tue Apr 21 17:43:06 2009 @@ -31,6 +31,7 @@ import org.osgi.service.event.EventConstants; import org.osgi.service.blueprint.context.ModuleContextEventConstants; import org.osgi.service.blueprint.context.ModuleContext; +import org.osgi.service.blueprint.context.ModuleContextListener; import org.apache.geronimo.blueprint.BlueprintConstants; import org.apache.geronimo.blueprint.ModuleContextEventSender; @@ -44,11 +45,14 @@ private final Bundle extenderBundle; private final ServiceTracker eventAdminServiceTracker; + private final ServiceTracker contextListenerTracker; public DefaultModuleContextEventSender(BundleContext bundleContext) { this.extenderBundle = bundleContext.getBundle(); this.eventAdminServiceTracker = new ServiceTracker(bundleContext, EventAdmin.class.getName(), null); this.eventAdminServiceTracker.open(); + this.contextListenerTracker = new ServiceTracker(bundleContext, ModuleContextListener.class.getName(), null); + this.contextListenerTracker.open(); } public void sendCreating(ModuleContext moduleContext) { @@ -80,6 +84,22 @@ } public void sendEvent(ModuleContext moduleContext, String topic, Throwable cause, String[] serviceObjectClass, String serviceFilter) { + + if (topic == TOPIC_CREATED || topic == TOPIC_FAILURE) { + Object[] listeners = contextListenerTracker.getServices(); + for (Object listener : listeners) { + try { + if (topic == TOPIC_CREATED) { + ((ModuleContextListener) listener).contextCreated(moduleContext.getBundleContext().getBundle()); + } else if (topic == TOPIC_FAILURE) { + ((ModuleContextListener) listener).contextCreationFailed(moduleContext.getBundleContext().getBundle(), cause); + } + } catch (Throwable t) { + t.printStackTrace(); // TODO: log + } + } + } + EventAdmin eventAdmin = getEventAdmin(); if (eventAdmin == null) { return; @@ -127,5 +147,6 @@ public void destroy() { this.eventAdminServiceTracker.close(); + this.contextListenerTracker.close(); } }