Author: hadrian
Date: Tue Dec  7 14:35:52 2010
New Revision: 1043063

URL: http://svn.apache.org/viewvc?rev=1043063&view=rev
Log:
CAMEL-3380. Patch applied with thanks to Jean Baptiste

Modified:
    camel/trunk/components/camel-quickfix/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/components/camel-quickfix/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/pom.xml?rev=1043063&r1=1043062&r2=1043063&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/pom.xml (original)
+++ camel/trunk/components/camel-quickfix/pom.xml Tue Dec  7 14:35:52 2010
@@ -19,11 +19,11 @@
 
        <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-parent</artifactId>
-               <version>2.6-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <parent>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-parent</artifactId>
+            <version>2.6-SNAPSHOT</version>
+            <relativePath>../../parent</relativePath>
        </parent>
 
        <artifactId>camel-quickfix</artifactId>
@@ -31,9 +31,10 @@
        <name>Camel :: QuickFIX/J</name>
        <description>Camel QuickFIX/J support</description>
 
-       <properties>
-               
<camel.osgi.export.pkg>org.apache.camel.component.quickfixj.*</camel.osgi.export.pkg>
-       </properties>
+        <properties>
+           
<camel.osgi.export.pkg>org.apache.camel.component.quickfixj.*</camel.osgi.export.pkg>
+            
<camel.osgi.import.additional>org.slf4j*;resolution:=optional</camel.osgi.import.additional>
+        </properties>
 
     <repositories>
         <repository>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1043063&r1=1043062&r2=1043063&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Dec  7 14:35:52 2010
@@ -105,6 +105,7 @@
       <pax.web.version>0.7.2</pax.web.version>
       <quartz-bundle-version>1.8.4_1-SNAPSHOT</quartz-bundle-version>
       <qpid-bundle-version>0.5.0_2</qpid-bundle-version>
+      <quickfix-bundle-version>1.5.0_1-SNAPSHOT</quickfix-bundle-version>
       <rome-bundle-version>1.0_1</rome-bundle-version>
       <saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
       <scala-bundle-version>2.8.0_1</scala-bundle-version>

Modified: 
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1043063&r1=1043062&r2=1043063&view=diff
==============================================================================
--- 
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml 
(original)
+++ 
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml 
Tue Dec  7 14:35:52 2010
@@ -466,6 +466,11 @@
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
   </feature>
+  <feature name='camel-quickfix' version='${pom.version}'>
+    <feature version='${pom.version}'>camel-spring</feature>
+    
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-quickfix/${pom.version}</bundle>
+  </feature>
   <feature name='camel-restlet' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1043063&r1=1043062&r2=1043063&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue 
Dec  7 14:35:52 2010
@@ -469,6 +469,11 @@
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
   </feature>
+  <feature name='camel-quickfix' version='${pom.version}'>
+    <feature version='${pom.version}'>camel-spring</feature>
+    
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-quickfix/${pom.version}</bundle>
+  </feature>
   <feature name='camel-restlet' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>


Reply via email to