cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1300630 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml rt/bindings/soap/pom.xml rt/rs/security/oauth-parent/pom.xml rt/ws/security/pom.xml
Date Wed, 14 Mar 2012 16:42:27 GMT
Author: dkulp
Date: Wed Mar 14 16:42:27 2012
New Revision: 1300630

URL: http://svn.apache.org/viewvc?rev=1300630&view=rev
Log:
Bunch of OSGi manifest and feature updates

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/rt/bindings/soap/pom.xml
    cxf/trunk/rt/rs/security/oauth-parent/pom.xml
    cxf/trunk/rt/ws/security/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=1300630&r1=1300629&r2=1300630&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Wed Mar 14 16:42:27 2012
@@ -110,11 +110,13 @@
     </feature>
     <feature name="cxf-ws-addr" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-ws-policy</feature>
+        <feature version="${project.version}">cxf-bindings-soap</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
     </feature>
     <feature name="cxf-ws-rm" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-ws-policy</feature>
         <feature version="${project.version}">cxf-ws-addr</feature>
+        <feature version="${project.version}">cxf-databinding-jaxb</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-rm/${project.version}</bundle>
     </feature>
     <feature name="cxf-ws-mex" version="${project.version}" resolver='(obr)'>
@@ -126,6 +128,7 @@
         <feature version="${project.version}">cxf-ws-policy</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
         <feature version="${project.version}">cxf-ws-addr</feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
     </feature>
     <feature name="http-whiteboard" version="2.2.5" resolver='(obr)'>
@@ -162,6 +165,16 @@
         <bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
 
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
+
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-cors/${project.version}</bundle>
+        <!-- requires net.oauth.core
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth/${project.version}</bundle>
+        -->
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
+
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
     </feature>
 
@@ -180,6 +193,10 @@
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${cxf.xmlbeans.bundle.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-xmlbeans/${project.version}</bundle>
     </feature>
+    <feature name="cxf-features-clustering" version="${project.version}" resolver='(obr)'>
+        <feature version="${project.version}">cxf-core</feature>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-features-clustering/${project.version}</bundle>
+    </feature>
 
     <feature name="cxf-bindings-corba" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
@@ -191,7 +208,7 @@
     </feature>
     <feature name="cxf-bindings-object" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
-        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-object/${project.version}</bundle>
     </feature>
 
     <feature name="cxf-transports-local" version="${project.version}" resolver='(obr)'>
@@ -259,21 +276,20 @@
         <feature version="${project.version}">cxf-transports-local</feature>
         <feature version="${project.version}">cxf-transports-jms</feature>
 
+        <!-- tools really aren't needed in OSGi by default
         <feature version="${project.version}">cxf-tools</feature>
+        -->
 
         <feature version="${project.version}">cxf-ws-security</feature>
         <feature version="${project.version}">cxf-ws-rm</feature>
         <feature version="${project.version}">cxf-ws-mex</feature>
         <feature version="${project.version}">cxf-javascript</feature>
         <feature version="${project.version}">cxf-frontend-javascript</feature>
-
-        <bundle>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
+        <feature version="${project.version}">cxf-features-clustering</feature>
 
         <!-- Compatibility bundle for the Require-Bundle use cases -->
         <bundle>mvn:org.apache.cxf/cxf-bundle-compatible/${project.version}</bundle>
 
-        <!-- needs jra
-        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-http/${project.version}</bundle-->
         <!-- need msv
         <bundle>mvn:org.apache.cxf/cxf-wstx-msv-validation/${project.version}</bundle-->
         <!-- need sdo deps
@@ -285,11 +301,12 @@
     </feature>
 
     <feature name="cxf-sts" version="${project.version}" resolver='(obr)'>
-        <feature version="${project.version}">cxf</feature>
-
         <bundle dependency="true">mvn:com.hazelcast/hazelcast/${cxf.hazelcast.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
 
+        <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-rt-ws-security</feature>
+
         <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>
     </feature>
 

Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1300630&r1=1300629&r2=1300630&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Wed Mar 14 16:42:27 2012
@@ -85,6 +85,7 @@
             <artifactId>mina-core</artifactId>
             <version>2.0.0-M6</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: cxf/trunk/rt/rs/security/oauth-parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/pom.xml?rev=1300630&r1=1300629&r2=1300630&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/pom.xml Wed Mar 14 16:42:27 2012
@@ -35,6 +35,9 @@
     </parent>
     <properties>
         <oauth.version>20100527</oauth.version>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+        </cxf.osgi.import>
     </properties> 
 
 

Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1300630&r1=1300629&r2=1300630&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Wed Mar 14 16:42:27 2012
@@ -31,7 +31,11 @@
         <version>2.6.0-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
-
+    <properties>
+        <cxf.osgi.import>
+            net.sf.ehcache*;resolution:=optional,
+        </cxf.osgi.import>
+    </properties>
 
     <dependencies>
         <dependency>



Mime
View raw message