From commits-return-11064-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sat Dec 02 00:31:34 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 55428 invoked from network); 2 Dec 2006 00:31:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2006 00:31:33 -0000 Received: (qmail 51757 invoked by uid 500); 2 Dec 2006 00:31:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 51730 invoked by uid 500); 2 Dec 2006 00:31:42 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 51719 invoked by uid 99); 2 Dec 2006 00:31:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 16:31:42 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 16:31:32 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8A75C1A9846; Fri, 1 Dec 2006 16:30:53 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r481458 - in /directory/sandbox/jconlon/osgi-services/logging-service: pom.xml src/main/java/org/apache/directory/osgi/services/logging/Activator.java Date: Sat, 02 Dec 2006 00:30:53 -0000 To: commits@directory.apache.org From: jconlon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061202003053.8A75C1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jconlon Date: Fri Dec 1 16:30:52 2006 New Revision: 481458 URL: http://svn.apache.org/viewvc?view=rev&rev=481458 Log: Using DynamicImports, made the org.osgi.compendium bundle optional. When the optional bundle is present a slf4j implemenation of the org.osgi.service.log.LogService will be registered. Modified: directory/sandbox/jconlon/osgi-services/logging-service/pom.xml directory/sandbox/jconlon/osgi-services/logging-service/src/main/java/org/apache/directory/osgi/services/logging/Activator.java Modified: directory/sandbox/jconlon/osgi-services/logging-service/pom.xml URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-services/logging-service/pom.xml?view=diff&rev=481458&r1=481457&r2=481458 ============================================================================== --- directory/sandbox/jconlon/osgi-services/logging-service/pom.xml (original) +++ directory/sandbox/jconlon/osgi-services/logging-service/pom.xml Fri Dec 1 16:30:52 2006 @@ -1,5 +1,5 @@ - + 4.0.0 org.apache.directory.osgi.services @@ -22,6 +22,7 @@ ${pom.artifactId} + org.osgi.service.log !javax.jms, !javax.mail, Modified: directory/sandbox/jconlon/osgi-services/logging-service/src/main/java/org/apache/directory/osgi/services/logging/Activator.java URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-services/logging-service/src/main/java/org/apache/directory/osgi/services/logging/Activator.java?view=diff&rev=481458&r1=481457&r2=481458 ============================================================================== --- directory/sandbox/jconlon/osgi-services/logging-service/src/main/java/org/apache/directory/osgi/services/logging/Activator.java (original) +++ directory/sandbox/jconlon/osgi-services/logging-service/src/main/java/org/apache/directory/osgi/services/logging/Activator.java Fri Dec 1 16:30:52 2006 @@ -13,7 +13,6 @@ import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; -import org.osgi.service.log.LogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,11 +74,29 @@ registerLogService( bundleContext ); } + /** + * We dynamically import the osgi log service service API, so it + * might not actually be available, so we catch and ignore + * the exception when we try to register the service. + * @param bundleContext + */ private void registerLogService( BundleContext bundleContext ) { Dictionary parameters = new Hashtable(); parameters.put( Constants.SERVICE_VENDOR, VENDOR ); - bundleContext.registerService( LogService.class.getName(), new LogServiceImpl(), parameters ); + + try + { + + bundleContext.registerService( + org.osgi.service.log.LogService.class.getName(), + new LogServiceImpl(), parameters); + } + catch (Throwable th) + { + // Ignore. + } + } public void stop( BundleContext arg0 ) throws Exception