Author: dkulp
Date: Mon Apr 11 23:07:32 2011
New Revision: 1091250
URL: http://svn.apache.org/viewvc?rev=1091250&view=rev
Log:
Pull opensaml dep out to own feature to make it easier to override it
later
Modified:
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1091250&r1=1091249&r2=1091250&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
(original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Mon
Apr 11 23:07:32 2011
@@ -75,10 +75,13 @@
<bundle>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
<feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
</feature>
- <feature name="wss4j" version="${cxf.wss4j.version}">
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
+ <feature name="opensaml" version="${cxf.opensaml.osgi.version}">
<bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
+ </feature>
+ <feature name="wss4j" version="${cxf.wss4j.version}">
+ <feature version='[2.4,3)'>opensaml</feature>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
