cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1364732 - /cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Date Mon, 23 Jul 2012 17:53:49 GMT
Author: dkulp
Date: Mon Jul 23 17:53:49 2012
New Revision: 1364732

URL: http://svn.apache.org/viewvc?rev=1364732&view=rev
Log:
Merged revisions 1363946 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1363946 | dkulp | 2012-07-20 16:29:11 -0400 (Fri, 20 Jul 2012) | 2 lines

    CXF actually requires http-whiteboard, not http

........

Modified:
    cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml

Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1364732&r1=1364731&r2=1364732&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml Mon Jul 23
17:53:49 2012
@@ -79,7 +79,7 @@
         <bundle start-level='20' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
 
         <feature version='${project.version}'>cxf-jaxb</feature>
-        <feature version="[2,3)">http</feature>
+        <feature version="[2,3)">http-whiteboard</feature>
         <feature version="[3,4)">spring</feature>
         <feature version="[1.2,2)">spring-dm</feature>
         <feature version="[3,4)">spring-jms</feature>



Mime
View raw message