Author: ffang
Date: Mon Jul 2 00:05:57 2012
New Revision: 1356051
URL: http://svn.apache.org/viewvc?rev=1356051&view=rev
Log:
Merged revisions 1356049 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1356049 | ffang | 2012-07-02 07:42:44 +0800 (δΈ€, 02 7 2012) | 1 line
[CXF-4402]remove http-whiteboard feature from cxf features.xml
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1356051&r1=1356050&r2=1356051&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 2 00:05:57 2012
@@ -68,14 +68,6 @@
<bundle
start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
</feature>
- <feature name="http-whiteboard" version="2.2.5" resolver='(obr)'>
- <!-- This is to work around an issue in Karaf 2.2.5 where the "war"
feature cannot be installed on Java 5 -->
- <!-- This gives us what we need and doesn't pull in the stuff that
doesn't work (the jsp bundle) -->
- <!-- Karaf >=2.2.6 has a newer version of this that will be picked up
instead -->
- <feature>http</feature>
- <bundle
start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.8</bundle>
- </feature>
-
<feature name="cxf" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
<bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
@@ -88,7 +80,6 @@
<feature version='${project.version}'>cxf-jaxb</feature>
<feature version="[2,3)">http</feature>
- <feature version="[2,4)">http-whiteboard</feature>
<feature version="[3,4)">spring</feature>
<feature version="[1.2,2)">spring-dm</feature>
<feature version="[3,4)">spring-jms</feature>
