cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1309860 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Date Thu, 05 Apr 2012 13:46:06 GMT
Author: sergeyb
Date: Thu Apr  5 13:46:06 2012
New Revision: 1309860

URL: http://svn.apache.org/viewvc?rev=1309860&view=rev
Log:
Enabling OAuth 10 feature, thanks to JB

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.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=1309860&r1=1309859&r2=1309860&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Thu Apr  5 13:46:06 2012
@@ -187,12 +187,13 @@
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-cors/${project.version}</bundle>
     </feature>
 
-    <!-- requires net.oauth.core
+    
     <feature name="cxf-rs-security-oauth" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-jaxrs</feature>
+        <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauthprovider/${cxf.oauth.bundle.version}</bundle>

         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth/${project.version}</bundle>
     </feature>
-    -->
+    
 
     <feature name="cxf-rs-security-oauth2" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-jaxrs</feature>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1309860&r1=1309859&r2=1309860&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Apr  5 13:46:06 2012
@@ -121,6 +121,7 @@
         <cxf.xmlschema.version>2.0.2-SNAPSHOT</cxf.xmlschema.version>
         <cxf.jibx.version>1.2.3</cxf.jibx.version>
         <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
+        <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
         <cxf.axiom.version>1.2.10</cxf.axiom.version>
         <cxf.jettison.version>1.3.1</cxf.jettison.version>
         <cxf.wss4j.version>1.6.5</cxf.wss4j.version>



Mime
View raw message