Author: ffang
Date: Wed Sep 7 11:18:12 2011
New Revision: 1166117
URL: http://svn.apache.org/viewvc?rev=1166117&view=rev
Log:
Merged revisions 1166113 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1166113 | ffang | 2011-09-07 19:08:45 +0800 (δΈ‰, 07 9 2011) | 1 line
[CXF-3794]use geronimo-jaxws_2.2_spec 1.1 bundle
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/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/distribution/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml?rev=1166117&r1=1166116&r2=1166117&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
Wed Sep 7 11:18:12 2011
@@ -32,7 +32,7 @@
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
- <bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
+ <bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/${cxf.specs.jaxws.api.version}</bundle>
<bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${cxf.servicemix.specs.version}</bundle>
</feature>
