Author: dkulp
Date: Mon Jul 15 18:03:36 2013
New Revision: 1503370
URL: http://svn.apache.org/r1503370
Log:
Merged revisions 1485617 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1485617 | cschneider | 2013-05-23 04:54:39 -0400 (Thu, 23 May 2013) | 2 lines
CXF-5030 Move xmlsec and change start level to make sure it is loaded first
........
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=1503370&r1=1503369&r2=1503370&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
Mon Jul 15 18:03:36 2013
@@ -85,13 +85,13 @@
<feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
<bundle start-level='25'
dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
+ <bundle start-level='25'
dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
<bundle start-level='25'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
<bundle
start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
<bundle
start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
<bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
<bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
<bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
- <bundle start-level='30'
dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
<bundle
start-level='30'>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
