Author: dkulp
Date: Mon Aug 8 16:15:24 2011
New Revision: 1155004
URL: http://svn.apache.org/viewvc?rev=1155004&view=rev
Log:
Merged revisions 1153982 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1153982 | dkulp | 2011-08-04 15:55:04 -0400 (Thu, 04 Aug 2011) | 2 lines
Move saaj-impl to it's own feature that isn't installed by default.
Only needed on java5.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml?rev=1155004&r1=1155003&r2=1155004&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
Mon Aug 8 16:15:24 2011
@@ -18,6 +18,11 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";
name="cxf-${project.version}">
+ <feature name="saaj-impl" version="${cxf.saaj.impl.version}"
resolver='(obr)'>
+ <bundle
start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
+ <bundle
start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxpri/1.4.4_2</bundle>
+ </feature>
+
<feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
@@ -77,7 +82,6 @@
<bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
<bundle
start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
- <bundle
start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
<bundle
start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
<bundle
start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
