[weld-commits] Weld SVN: r4727 - core/trunk/osgi-bundle.

[weld-commits at lists.jboss.org]

Author: rogerk
Date: 2009-11-07 08:50:47 -0500 (Sat, 07 Nov 2009)
New Revision: 4727

Modified:
   core/trunk/osgi-bundle/pom.xml
Log:
slf4j dependency

Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml	2009-11-07 13:50:26 UTC (rev 4726)
+++ core/trunk/osgi-bundle/pom.xml	2009-11-07 13:50:47 UTC (rev 4727)
@@ -56,7 +56,7 @@
                <instructions>
                   <_include>-osgi.bundle</_include>
 
-                  <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
+                  <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
 
                   <_exportcontents>
                      javax.inject;
@@ -82,15 +82,28 @@
                      javassist.util.proxy;version=${javassist.version}
                  </_exportcontents>
 
+                  <!-- A note about how slf4j is handled:
+                       We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
+                       We also bundle them privately along with the jdk14-logging binding. 
+                       This allows us to function even when there is no separate slf4j bundle.
+                       When there is a separate slf4j bundle, because of our optional Import-Package header,
+                       we will get wired to that bundle. Please also note that we don't import impl package,
+                       as it is sufficient to import just the api. In some other environment, user can
+                       deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
+                       a fragement which attaches itself to the api bundle. We will get wired to the 
+                       api bundle and everything will work.
+                       We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
+                       on foreign bundles.
+                  -->
                   <Import-Package>
-                     org.slf4j.cal10n; version=${slf4j.version},
-                     ch.qos.cal10n; version=${cal10n.version},
+                     org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
+                     ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
                      javax.interceptor.*, *;
                      resolution:=optional
                  </Import-Package>
 
                   <Private-Package>
-                     !javax.interceptor.*
+                     !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
                  </Private-Package>
 
                </instructions>
@@ -159,6 +172,13 @@
          <artifactId>jboss-interceptor</artifactId>
       </dependency>
       
+      <!-- We bundle jdk binding inside this OSGi bundle -->
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-jdk14</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      
    </dependencies>
    
 </project>