You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/03/22 15:16:02 UTC
svn commit: r1303794 -
/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
Author: sergeyb
Date: Thu Mar 22 14:16:02 2012
New Revision: 1303794
URL: http://svn.apache.org/viewvc?rev=1303794&view=rev
Log:
Moving security-related bundles from cxf-jaxrs to separate features
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1303794&r1=1303793&r2=1303794&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Thu Mar 22 14:16:02 2012
@@ -166,17 +166,31 @@
<bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
+ <bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-rs-security-xml" version="${project.version}" resolver='(obr)' start-level='40'>
+ <feature version="${project.version}">cxf-jaxrs</feature>
+ <bundle>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-rs-security-cors" version="${project.version}" resolver='(obr)' start-level='40'>
+ <feature version="${project.version}">cxf-jaxrs</feature>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-security-cors/${project.version}</bundle>
- <!-- requires net.oauth.core
+ </feature>
+
+ <!-- requires net.oauth.core
+ <feature name="cxf-rs-security-oauth" version="${project.version}" resolver='(obr)' start-level='40'>
+ <feature version="${project.version}">cxf-jaxrs</feature>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth/${project.version}</bundle>
- -->
- <bundle>mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle>
- <bundle>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
+ </feature>
+ -->
- <bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
+ <feature name="cxf-rs-security-oauth2" version="${project.version}" resolver='(obr)' start-level='40'>
+ <feature version="${project.version}">cxf-jaxrs</feature>
+ <bundle>mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle>
</feature>
<feature name="cxf-databinding-aegis" version="${project.version}" resolver='(obr)' start-level='40'>