Author: dkulp Date: Mon Jul 15 18:50:06 2013 New Revision: 1503411 URL: http://svn.apache.org/r1503411 Log: Merged revisions 1503370 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1503370 | dkulp | 2013-07-15 14:03:36 -0400 (Mon, 15 Jul 2013) | 10 lines 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.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml Modified: cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1503411&r1=1503410&r2=1503411&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original) +++ cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml Mon Jul 15 18:50:06 2013 @@ -82,8 +82,8 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle> </feature> <feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'> + <bundle start-level='25' dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle> <feature version='[2.4,3)'>opensaml</feature> - <bundle dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle> <bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle> </feature>
