svn commit: r1356046 - in /cxf/branches/2.6.x-fixes: ./ osgi/karaf/features/src/main/resources/features.xml

[ffang]

Author: ffang
Date: Sun Jul  1 23:03:44 2012
New Revision: 1356046

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

........
  r1356043 | ffang | 2012-07-02 06:57:22 +0800 (一, 02  7 2012) | 1 line
  
  [CXF-4402]remove http-whiteboard feature from cxf features.xml
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

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=1356046&r1=1356045&r2=1356046&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 
Sun Jul  1 23:03:44 2012
@@ -139,13 +139,9 @@
         <bundle start-level='40' 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
         <bundle 
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
     </feature>
-    <feature name="http-whiteboard" version="2.2.5" resolver='(obr)'>
-        <feature>http</feature>
-        <bundle 
start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.8</bundle>
-    </feature>
     <feature name="cxf-http" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
-        <feature version="[2,4)">http-whiteboard</feature>
+        <feature version="[2,4)">http</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)'>