svn commit: r769374 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r769374 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml

gertv-2
Author: gertv
Date: Tue Apr 28 12:33:53 2009
New Revision: 769374

URL: http://svn.apache.org/viewvc?rev=769374&view=rev
Log:
Merged revisions 769368 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk

........
  r769368 | gertv | 2009-04-28 14:29:17 +0200 (Tue, 28 Apr 2009) | 1 line
 
  CAMEL-1526: Adding a few Spring JARs to allow using the features.xml for testing in other containers
........

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 Apr 28 12:33:53 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
+/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

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=769374&r1=769373&r2=769374&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Apr 28 12:33:53 2009
@@ -37,6 +37,7 @@
       <abdera-bundle-version>0.4.0-incubating_1</abdera-bundle-version>
       <ant-bundle-version>1.7.0_1</ant-bundle-version>
       <antlr-bundle-version>3.0.1_1</antlr-bundle-version>
+      <aopalliance-bundle-version>1.0_1</aopalliance-bundle-version>
       <asm-bundle-version>2.2.3_1</asm-bundle-version>
       <dom4j-bundle-version>1.6_1</dom4j-bundle-version>
       <commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-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=769374&r1=769373&r2=769374&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 Apr 28 12:33:53 2009
@@ -9,6 +9,11 @@
   </feature>
   <feature name='camel-spring' version='${pom.version}'>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
+    <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
+    <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
+    <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+    <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
     <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>