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/30 06:04:47 UTC
svn commit: r820169 - in /camel/branches/camel-1.x: ./
components/camel-msv/pom.xml components/camel-restlet/pom.xml
parent/pom.xml platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Wed Sep 30 04:04:47 2009
New Revision: 820169
URL: http://svn.apache.org/viewvc?rev=820169&view=rev
Log:
Merged revisions 819956 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r819956 | ningjiang | 2009-09-29 22:10:26 +0800 (Tue, 29 Sep 2009) | 1 line
CAMEL-2041 fixed some bundle version issues of the camel features
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-msv/pom.xml
camel/branches/camel-1.x/components/camel-restlet/pom.xml
camel/branches/camel-1.x/parent/pom.xml
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 Wed Sep 30 04:04:47 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,818744,818747,819475,819483
+/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,818747,819475,819483,819956
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-msv/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-msv/pom.xml?rev=820169&r1=820168&r2=820169&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-msv/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-msv/pom.xml Wed Sep 30 04:04:47 2009
@@ -33,6 +33,7 @@
<description>Camel MSV support</description>
<properties>
+ <camel.osgi.import.pkg>org.apache.camel,*</camel.osgi.import.pkg>
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
</properties>
Modified: camel/branches/camel-1.x/components/camel-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-restlet/pom.xml?rev=820169&r1=820168&r2=820169&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-restlet/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-restlet/pom.xml Wed Sep 30 04:04:47 2009
@@ -23,7 +23,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Camel :: Restlet</name>
<description>Camel REST (Restlet based) Component</description>
@@ -32,6 +32,12 @@
<artifactId>camel-parent</artifactId>
<version>1.6.2-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.restlet.*
+ </camel.osgi.export.pkg>
+ </properties>
<dependencies>
<dependency>
@@ -42,7 +48,6 @@
<dependency>
<groupId>org.restlet</groupId>
<artifactId>org.restlet</artifactId>
- <version>1.1.1</version>
</dependency>
<!-- test artifacts -->
Modified: camel/branches/camel-1.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=820169&r1=820168&r2=820169&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Wed Sep 30 04:04:47 2009
@@ -82,6 +82,7 @@
<stringtemplate-version>3.0</stringtemplate-version>
<junit-version>3.8.2</junit-version>
<ognl-version>2.7.3_1</ognl-version>
+ <restlet-version>1.1.5</restlet-version>
<saxon-version>9.1.0.1</saxon-version>
<scala-version>2.7.3</scala-version>
<scala-plugin-version>2.9.1</scala-plugin-version>
@@ -760,6 +761,13 @@
<artifactId>jetty-client</artifactId>
<version>${jetty-version}</version>
</dependency>
+
+ <!-- optional restlet support -->
+ <dependency>
+ <groupId>org.restlet</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
<!-- optional jakarta http core support -->
<dependency>
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=820169&r1=820168&r2=820169&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Wed Sep 30 04:04:47 2009
@@ -36,7 +36,7 @@
<properties>
<abdera-bundle-version>0.4.0-incubating_2-SNAPSHOT</abdera-bundle-version>
<ant-bundle-version>1.7.0_2-SNAPSHOT</ant-bundle-version>
- <antlr-bundle-version>3.0.1_2-SNAPSHOT</antlr-bundle-version>
+ <antlr-bundle-version>2.7.7_1-SNAPSHOT</antlr-bundle-version>
<aopalliance-bundle-version>1.0_2-SNAPSHOT</aopalliance-bundle-version>
<asm-bundle-version>2.2.3_2-SNAPSHOT</asm-bundle-version>
<bcel-bundle-version>5.2_1-SNAPSHOT</bcel-bundle-version>
@@ -71,7 +71,7 @@
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jcr-bundle-version>1.0_1</jcr-bundle-version>
<jdom-bundle-version>1.1_1</jdom-bundle-version>
- <jettison-bundle-version>1.0.1_1</jettison-bundle-version>
+ <jettison-bundle-version>1.1</jettison-bundle-version>
<jetty-bundle-version>6.1.14_1</jetty-bundle-version>
<jetty-cometd-bundle-version>6.1.11_2-SNAPSHOT</jetty-cometd-bundle-version>
<jing-bundle-version>20030619_1</jing-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=820169&r1=820168&r2=820169&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 Wed Sep 30 04:04:47 2009
@@ -36,7 +36,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<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.jettison/${jettison-bundle-version}</bundle>
+ <bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
@@ -272,8 +272,8 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
- <feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
+ <feature version='${pom.version}'>camel-spring</feature>
</feature>
<feature name='camel-mvel' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
@@ -300,6 +300,8 @@
</feature>
<feature name='camel-restlet' version='${pom.version}'>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
+ <bundle>mvn:org.restlet/org.restlet/${restlet-version}</bundle>
+ <feature version='${pom.version}'>camel-http</feature>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
@@ -357,6 +359,10 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <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.ant/${ant-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
@@ -375,7 +381,7 @@
<bundle>mvn:org.apache.camel/camel-xmpp/${pom.version}</bundle>
</feature>
<feature name='camel-xstream' version='${pom.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}</bundle>
+ <bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>