Author: ffang
Date: Mon Jun 20 06:07:43 2011
New Revision: 1137509
URL: http://svn.apache.org/viewvc?rev=1137509&view=rev
Log:
[CXF-3600]add OBR resolver to karaf features descriptor
Modified:
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1137509&r1=1137508&r2=1137509&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
(original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Mon
Jun 20 06:07:43 2011
@@ -18,7 +18,7 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";
name="cxf-${project.version}">
- <feature name="cxf-specs" version="${project.version}">
+ <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>
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle>
@@ -30,12 +30,12 @@
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${cxf.servicemix.specs.version}</bundle>
</feature>
- <feature name='cxf-jaxb' version='${cxf.jaxb.bundle.version}'>
+ <feature name='cxf-jaxb' version='${cxf.jaxb.bundle.version}'
resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
<bundle
start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
<bundle
start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
</feature>
- <feature name="spring-jms" version="${cxf.spring.version}">
+ <feature name="spring-jms" version="${cxf.spring.version}"
resolver='(obr)'>
<feature version="${cxf.spring.version}">spring</feature>
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
@@ -44,7 +44,7 @@
<bundle>mvn:org.springframework/spring-web/${cxf.spring.version}</bundle>
</feature>
<!-- Current the abdera bundle is not working as we expect -->
- <feature name='abdera' version='${cxf.abdera.version}'>
+ <feature name='abdera' version='${cxf.abdera.version}' resolver='(obr)'>
<bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${cxf.axiom.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${cxf.axiom.version}</bundle>
@@ -61,17 +61,17 @@
<bundle>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
<feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
</feature>
- <feature name="opensaml" version="${cxf.opensaml.osgi.version}">
+ <feature name="opensaml" version="${cxf.opensaml.osgi.version}"
resolver='(obr)'>
<bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
</feature>
- <feature name="wss4j" version="${cxf.wss4j.version}">
+ <feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
<feature version='[2.4,3)'>opensaml</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
- <feature name="cxf" version="${project.version}">
+ <feature name="cxf" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
<bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
