Author: dkulp
Date: Tue Oct 27 16:57:25 2009
New Revision: 830248
URL: http://svn.apache.org/viewvc?rev=830248&view=rev
Log:
Merged revisions 830247 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r830247 | dkulp | 2009-10-27 12:51:39 -0400 (Tue, 27 Oct 2009) | 2 lines
Add dyn-imports for the slf4j and commons-logging stuff we'll use to
detect logging impl
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=830248&r1=830247&r2=830248&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Tue Oct 27
16:57:25 2009
@@ -278,7 +278,10 @@
<DynamicImport-Package>
com.sun.xml.bind.api.*,
com.sun.xml.internal.bind.api.*,
- com.ctc.wstx.*
+ com.ctc.wstx.*,
+ org.apache.commons.logging.*,
+ org.slf4j.*,
+ org.slf4j.impl.*
</DynamicImport-Package>
<Import-Package>
!org.apache.cxf.*,
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=830248&r1=830247&r2=830248&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Tue Oct 27
16:57:25 2009
@@ -119,7 +119,10 @@
<Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
<Specification-Version>${pom.version}</Specification-Version>
<DynamicImport-Package>
- com.ctc.wstx.*
+ com.ctc.wstx.*,
+ org.apache.commons.logging.*,
+ org.slf4j.*,
+ org.slf4j.impl.*
</DynamicImport-Package>
<Import-Package>
!org.apache.cxf.*,
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=830248&r1=830247&r2=830248&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Tue Oct 27
16:57:25 2009
@@ -160,7 +160,10 @@
<DynamicImport-Package>
com.ctc.wstx.*,
com.sun.xml.bind.api.*,
- com.sun.xml.internal.bind.api.*
+ com.sun.xml.internal.bind.api.*,
+ org.apache.commons.logging.*,
+ org.slf4j.*,
+ org.slf4j.impl.*
</DynamicImport-Package>
<Import-Package>
!org.apache.cxf.*,