You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/07/20 22:26:39 UTC
svn commit: r1363941 -
/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Author: dkulp
Date: Fri Jul 20 20:26:39 2012
New Revision: 1363941
URL: http://svn.apache.org/viewvc?rev=1363941&view=rev
Log:
Merged revisions 1363939 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1363939 | dkulp | 2012-07-20 16:25:24 -0400 (Fri, 20 Jul 2012) | 2 lines
CXF actually requires http-whiteboard, not http
........
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Modified: cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1363941&r1=1363940&r2=1363941&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml Fri Jul 20 20:26:39 2012
@@ -141,7 +141,7 @@
</feature>
<feature name="cxf-http" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-core</feature>
- <feature version="[2,4)">http</feature>
+ <feature version="[2,4)">http-whiteboard</feature>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
</feature>
<feature name="cxf-http-jetty" version="${project.version}" resolver='(obr)'>