Author: ningjiang
Date: Thu Dec 22 13:20:39 2011
New Revision: 1222218
URL: http://svn.apache.org/viewvc?rev=1222218&view=rev
Log:
Merged revisions 1222139 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1222139 | ningjiang | 2011-12-22 18:00:23 +0800 (Thu, 22 Dec 2011) | 1 line
CAMEL-4812 fixed the issue that camel-servlet feature doesn't work
........
Modified:
camel/branches/camel-2.8.x/ (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 Thu Dec 22 13:20:39 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482,1220711,1221129,1221566,1221737,1222006,1222066
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482,1220711,1221129,1221566,1221737,1222006,1222066,1222139
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1222218&r1=1222217&r2=1222218&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
Thu Dec 22 13:20:39 2011
@@ -111,6 +111,8 @@
<bundle>mvn:org.apache.camel/camel-jetty/${project.version}</bundle>
</feature>
<feature name='camel-servlet' version='${project.version}' resolver='(obr)'
start-level='50'>
+ <!-- camel-servlet need to access the http OSGi services -->
+ <feature>http</feature>
<feature version='${project.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
</feature>
