Author: ningjiang
Date: Tue Jul 21 03:23:32 2009
New Revision: 796135
URL: http://svn.apache.org/viewvc?rev=796135&view=rev
Log:
Merged revisions 795790 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r795790 | ningjiang | 2009-07-20 20:11:43 +0800 (Mon, 20 Jul 2009) | 1 line
CAMEL-1840 fixed the camel-mail and camel-cxf features issue
........
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 Jul 21 03:23:32 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
+/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
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=796135&r1=796134&r2=796135&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Jul 21
03:23:32 2009
@@ -51,9 +51,11 @@
<commons-net-version>2.0</commons-net-version>
<flatpack-bundle-version>3.1.1_1</flatpack-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
- <geronimo-jaxws-spec-version>1.1.2</geronimo-jaxws-spec-version>
+ <geronimo-jaxws-spec-version>1.0</geronimo-jaxws-spec-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
+ <geronimo-javamail-1.4-version>1.6_1</geronimo-javamail-1.4-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
+ <gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
<hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
<ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
@@ -84,12 +86,13 @@
<stringtemplate-bundle-version>3.2_1</stringtemplate-bundle-version>
<velocity-bundle-version>1.6.2_1</velocity-bundle-version>
<xmlbeans-bundle-version>2.4.0_2</xmlbeans-bundle-version>
- <xmlschema-version>1.4.4</xmlschema-version>
+ <xmlschema-version>1.4.5</xmlschema-version>
<xmlsec-bundle-version>1.3.0_1</xmlsec-bundle-version>
<xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_1</xpp3-bundle-version>
<xstream-bundle-version>1.3_1</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_1</werken-xpath-bundle-version>
+ <woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
<wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
</properties>
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=796135&r1=796134&r2=796135&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 Jul 21 03:23:32 2009
@@ -32,12 +32,15 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}</bundle>
<bundle>mvn:org.mortbay.jetty/jetty/${jetty-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.junit/${junit-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.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${servicemix-specs-version}_1</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -51,6 +54,7 @@
<bundle>mvn:org.apache.neethi/neethi/${neethi-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
@@ -279,30 +283,10 @@
<bundle>mvn:org.apache.camel/camel-ldap/${pom.version}</bundle>
</feature>
<feature name='camel-mail' version='${pom.version}'>
- <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:org.springframework/spring-jdbc/${spring-version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
-
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
-
<bundle>mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version}}</bundle>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.6.1_1</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:commons-lang/commons-lang/${commons-lang-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.oro/${oro-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.velocity/${velocity-bundle-version}</bundle>
-
<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.dom4j/${dom4j-bundle-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.geronimo-javamail_1.4_provider/${geronimo-javamail-1.4-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
</feature>
