Author: dkulp
Date: Fri Apr 8 18:12:29 2011
New Revision: 1090380
URL: http://svn.apache.org/viewvc?rev=1090380&view=rev
Log:
Change to using the smx bundle for opensaml. That bundle actually works
in OSGi
Modified:
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.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=1090380&r1=1090379&r2=1090380&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
(original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Fri
Apr 8 18:12:29 2011
@@ -78,9 +78,7 @@
<feature name="wss4j" version="${cxf.wss4j.version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
<bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
-
<bundle>wrap:mvn:org.opensaml/xmltooling/${cxf.opensaml.xmltooling.version}</bundle>
- <bundle>wrap:mvn:org.opensaml/openws/${cxf.opensamlws.version}</bundle>
- <bundle>wrap:mvn:org.opensaml/opensaml/${cxf.opensaml.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1090380&r1=1090379&r2=1090380&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Apr 8 18:12:29 2011
@@ -93,6 +93,7 @@
<cxf.joda.time.version>1.6.2</cxf.joda.time.version>
<cxf.opensaml.version>2.4.1</cxf.opensaml.version>
<cxf.opensamlws.version>1.4.1</cxf.opensamlws.version>
+ <cxf.opensaml.osgi.version>2.4.1_1-SNAPSHOT</cxf.opensaml.osgi.version>
<cxf.opensaml.xmltooling.version>1.3.1</cxf.opensaml.xmltooling.version>
<cxf.neethi.version>3.0.0</cxf.neethi.version>
