Use the cxf:2.4.0 feature descriptor

rkettelerij · Apr 25, 2011 · 14cf07a · 14cf07a
1 parent 6b303d8
commit 14cf07a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 40 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,6 +55,7 @@
     <properties>
         <activemq.version>5.5.0</activemq.version>
         <camel.version>2.7.1</camel.version>
+        <cxf.version>2.4.0</cxf.version>
         <karaf.version>2.2.0</karaf.version>
     </properties>
 
@@ -111,6 +112,15 @@
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- Apache CXF -->
+            <dependency>
+                <groupId>org.apache.cxf.karaf</groupId>
+                <artifactId>apache-cxf</artifactId>
+                <version>${cxf.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
             <!-- Apache Karaf -->
             <dependency>
                 <groupId>org.apache.karaf</groupId>

diff --git a/talend-if/pom.xml b/talend-if/pom.xml
@@ -52,6 +52,14 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Apache CXF -->
+        <dependency>
+            <groupId>org.apache.cxf.karaf</groupId>
+            <artifactId>apache-cxf</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- Apache ActiveMQ -->
         <dependency>
             <groupId>org.apache.activemq</groupId>
@@ -108,6 +116,7 @@
                                 <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
                                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
                             </descriptors>
                             <features>

diff --git a/talend-if/src/main/filtered-resources/features.xml b/talend-if/src/main/filtered-resources/features.xml
@@ -7,6 +7,7 @@
 
     <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
     <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
+    <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
     <repository>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</repository>
 
     <feature name="tif-core" version="${project.version}" resolver='(obr)'>
@@ -66,47 +67,8 @@
     </feature>
 
     <feature name='tif-camel-cxf' version="${project.version}" resolver='(obr)'>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
-        <bundle dependency="true">mvn:org.springframework/spring-jms/3.0.5.RELEASE</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/1.2.7_3</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_3</bundle>
-        <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
-        <bundle dependency="true">mvn:org.codehaus.jettison/jettison/1.3</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_4</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_3</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_3</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_4</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.5.0_1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/1.4.4_1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_3</bundle>
-        <bundle dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/4.1.1</bundle>
-        <bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/3.1.1</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.0</bundle>
-        <bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
-        <bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_3</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_4</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_1</bundle>
-        <bundle dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/1.4.3</bundle>
-        <bundle dependency="true">mvn:org.apache.neethi/neethi/3.0.0</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/0.4.0-incubating_4</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/1.7.0</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/1.7.0</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/1.3.2_2</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/1.6.2_3</bundle>
-        <bundle dependency="true">mvn:org.apache.ws.security/wss4j/1.6.0</bundle>
-        <bundle dependency="true">mvn:joda-time/joda-time/1.6.2</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/1.7.0</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/1.3.2_3</bundle>
-        <bundle>mvn:org.apache.cxf/cxf-bundle/2.4.0</bundle>
+        <feature version='2.4.0'>cxf</feature>
         <feature version='2.7.1'>camel-spring</feature>
-        <feature>jetty</feature>
         <bundle>mvn:org.apache.camel/camel-cxf/2.7.1</bundle>
     </feature>