[jboss-osgi-commits] JBoss-OSGI SVN: r97292 - in projects/jboss-osgi/projects/bundles/common/trunk: src/main/java/org/jboss/osgi/common/internal and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-12-02 09:47:59 -0500 (Wed, 02 Dec 2009)
New Revision: 97292

Modified:
   projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java
Log:
Eagerly initialze the logging system

Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml	2009-12-02 14:47:14 UTC (rev 97291)
+++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml	2009-12-02 14:47:59 UTC (rev 97292)
@@ -21,7 +21,7 @@
   <artifactId>jboss-osgi-common</artifactId>
   <packaging>bundle</packaging>
   
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   
   <!-- Parent -->
   <parent>

Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java	2009-12-02 14:47:14 UTC (rev 97291)
+++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java	2009-12-02 14:47:59 UTC (rev 97292)
@@ -23,7 +23,6 @@
 
 //$Id$
 
-
 import org.jboss.osgi.common.log.LogServiceTracker;
 import org.jboss.osgi.common.log.LoggingService;
 import org.osgi.framework.BundleActivator;
@@ -31,6 +30,7 @@
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.LoggerFactory;
 
 /**
  * The common services activator
@@ -42,15 +42,18 @@
 {
    private LogServiceTracker logServiceTracker;
    private ServiceTracker logReaderTracker;
-   
+
    public void start(BundleContext context)
    {
+      // Initialize the logging systems
+      LoggerFactory.getLogger(CommonServicesActivator.class);
+      
       logServiceTracker = new LogServiceTracker(context);
-      
+
       // Track LogReaderService and add/remove LogListener
-      logReaderTracker = trackLogReaderService(context);
+      logReaderTracker = new LogReaderServiceServiceTracker(context);
       logReaderTracker.open();
-      
+
       // Register the logging marker service
       context.registerService(LoggingService.class.getName(), new LoggingService(){}, null);
    }
@@ -59,23 +62,24 @@
    {
       if (logServiceTracker != null)
          logServiceTracker.close();
-      
+
       if (logReaderTracker != null)
          logReaderTracker.close();
    }
 
-   private ServiceTracker trackLogReaderService(BundleContext context)
+   static class LogReaderServiceServiceTracker extends ServiceTracker
    {
-      ServiceTracker logTracker = new ServiceTracker(context, LogReaderService.class.getName(), null)
+      public LogReaderServiceServiceTracker(BundleContext context)
       {
-         @Override
-         public Object addingService(ServiceReference reference)
-         {
-            LogReaderService logReader = (LogReaderService)super.addingService(reference);
-            logReader.addLogListener(new LogListenerBridge());
-            return logReader;
-         }
-      };
-      return logTracker;
+         super(context, LogReaderService.class.getName(), null);
+      }
+
+      @Override
+      public Object addingService(ServiceReference reference)
+      {
+         LogReaderService logReader = (LogReaderService)super.addingService(reference);
+         logReader.addLogListener(new LogListenerBridge());
+         return logReader;
+      }
    }
 }
\ No newline at end of file