You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/09/29 04:56:21 UTC
svn commit: r819805 - in /camel/branches/camel-1.x: ./
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Tue Sep 29 02:56:20 2009
New Revision: 819805
URL: http://svn.apache.org/viewvc?rev=819805&view=rev
Log:
Merged revisions 818744 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r818744 | gnodet | 2009-09-25 15:04:26 +0800 (Fri, 25 Sep 2009) | 1 line
Fix some camel components for karaf
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 29 02:56:20 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=819805&r1=819804&r2=819805&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Sep 29 02:56:20 2009
@@ -78,7 +78,7 @@
<jsch-bundle-version>0.1.31_1</jsch-bundle-version>
<juel-bundle-version>2.1.0_1</juel-bundle-version>
<junit-bundle-version>4.4_1</junit-bundle-version>
- <mina-bundle-version>1.1.7_1</mina-bundle-version>
+ <mina-bundle-version>1.1.7_2-SNAPSHOT</mina-bundle-version>
<mvel-bundle-version>2.0.9_1</mvel-bundle-version>
<neethi-bundle-version>2.0.4_1</neethi-bundle-version>
<ognl-bundle-version>2.7.3_1</ognl-bundle-version>
Modified: camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=819805&r1=819804&r2=819805&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml Tue Sep 29 02:56:20 2009
@@ -83,6 +83,9 @@
<bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle>
</feature>
<feature name='camel-jms' version='${pom.version}'>
+ <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
@@ -162,6 +165,7 @@
</feature>
<feature name='camel-hl7' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>