Author: janstey
Date: Fri Jan 6 15:25:19 2012
New Revision: 1228229
URL: http://svn.apache.org/viewvc?rev=1228229&view=rev
Log:
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.9.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
- copied unchanged from r1228223,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 15:25:19 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015,1228027
+/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 6 15:25:19 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 15:25:19 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027
+/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223
Modified:
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1228229&r1=1228228&r2=1228229&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Fri Jan 6 15:25:19 2012
@@ -56,6 +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>