camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r1228375 - in /camel/branches/camel-2.8.x: ./ components/camel-http/ platforms/karaf/features/src/main/resources/features.xml tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
Date Fri, 06 Jan 2012 19:52:52 GMT
Author: janstey
Date: Fri Jan  6 19:52:51 2012
New Revision: 1228375

URL: http://svn.apache.org/viewvc?rev=1228375&view=rev
Log:
Merged revisions 1228229 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

................
  r1228229 | janstey | 2012-01-06 11:55:19 -0330 (Fri, 06 Jan 2012) | 9 lines
  
  Merged revisions 1228223 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1228223 | janstey | 2012-01-06 11:37:21 -0330 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4868 - add Karaf feature for camel-context component
  ........
................

Added:
    camel/branches/camel-2.8.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
      - copied unchanged from r1228229, camel/branches/camel-2.9.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-http/   (props changed)
    camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 19:52:51 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549
-/camel/trunk:1227540
+/camel/branches/camel-2.9.x:1227549,1228229
+/camel/trunk:1227540,1228223

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
    svn:mergeinfo = /camel/trunk/components/camel-http:1228223

Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1228375&r1=1228374&r2=1228375&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Fri
Jan  6 19:52:51 2012
@@ -56,7 +56,10 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
   </feature>
-
+  <feature name='camel-context' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-context/${project.version}</bundle>
+  </feature>
   <feature name='camel-cxf' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-spring</feature>
     <feature>jetty</feature>



Mime
View raw message