cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1187653 - /cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
Date Sat, 22 Oct 2011 06:04:02 GMT
Author: dkulp
Date: Sat Oct 22 06:04:02 2011
New Revision: 1187653

URL: http://svn.apache.org/viewvc?rev=1187653&view=rev
Log:
Put anything that depends on cxf-specs into cxf namespace and using cxf
version number to make sure multiple versions don't get installed.

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1187653&r1=1187652&r2=1187653&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Sat Oct 22 06:04:02 2011
@@ -22,17 +22,17 @@
     <feature name="activemq" version="5.4.2">
         <!-- The ActiveMQ features.xml that is provided by 5.4.2 does not work with modern
Karaf versions -->
         <!-- Thus, we'll duplicate the main activemq definition here with the 'karaf'
stuff removed -->
-        <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-jta_1.1_spec/1.1.1</bundle>

-        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>

-        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>

-        <bundle>mvn:commons-pool/commons-pool/1.5.4</bundle>
-        <bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
-        <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
+        <bundle start-level='10' dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
+        <bundle start-level='10' dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>

+        <bundle start-level='10' dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>

+        <bundle start-level='10' dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>

+        <bundle dependency="true">mvn:commons-pool/commons-pool/1.5.4</bundle>
+        <bundle dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
+        <bundle dependency="true">mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
+        <bundle dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/5.4.2</bundle> 
         <bundle>mvn:org.apache.activemq/kahadb/5.4.2</bundle> 
         <bundle>mvn:org.apache.activemq/activemq-console/5.4.2</bundle>
@@ -43,7 +43,7 @@
 
 
     <feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
-        <bundle start-level='9' dependency="true">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
+        <bundle start-level='9'>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
         <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>
@@ -55,14 +55,14 @@
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${cxf.servicemix.specs.version}</bundle>
     </feature>
 
-    <feature name='cxf-jaxb' version='${cxf.jaxb.bundle.version}' resolver='(obr)'>
+    <feature name='cxf-jaxb' version='${project.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>
     <!-- Current the abdera bundle is not working as we expect -->
-    <feature name='abdera' version='${cxf.abdera.version}' resolver='(obr)'>
-        <bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
+    <feature name='cxf-abdera' version='${project.version}' resolver='(obr)'>
+        <bundle dependency="true">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>
 
@@ -75,7 +75,7 @@
         <bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>
         <bundle>mvn:org.apache.abdera/abdera-client/${cxf.abdera.version}</bundle>
         <bundle>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
-        <feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
+        <feature version='${project.version}'>cxf-jaxb</feature>
     </feature>
     <feature name="opensaml" version="${cxf.opensaml.osgi.version}" resolver='(obr)'>
         <bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
@@ -83,11 +83,11 @@
     </feature>
     <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 dependency="true">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="saaj-impl" version="${cxf.saaj.impl.version}"  resolver='(obr)'>
+    <feature name="cxf-saaj-impl" version="${project.version}"  resolver='(obr)'>
         <feature version="${project.version}">cxf-specs</feature>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
     </feature>
@@ -101,7 +101,7 @@
         <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>
 
-        <feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
+        <feature version='${project.version}'>cxf-jaxb</feature>
         <feature version="[2,3)">http</feature>
         <feature version="[2,3)">war</feature>
         <feature version="[3,4)">spring</feature>
@@ -109,24 +109,24 @@
         <feature version="[3,4)">spring-jms</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
         <feature version="[7.2,8)">jetty</feature>
-        <feature version='${cxf.abdera.version}'>abdera</feature>
-        <feature version="${cxf.saaj.impl.version}">saaj-impl</feature>
+        <feature version='${project.version}'>cxf-abdera</feature>
+        <feature version="${project.version}">cxf-saaj-impl</feature>
 
-        <bundle>mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
-        <bundle>mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
 
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${cxf.asm.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
         <bundle>mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${cxf.xmlbeans.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${cxf.rhino.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
-        <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
 
         <bundle>mvn:org.apache.cxf/cxf-bundle/${project.version}</bundle>
         <bundle>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>



Mime
View raw message