cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1087434 - in /cxf/trunk: distribution/bundle/all/ distribution/bundle/jaxrs/ distribution/bundle/minimal/ distribution/karaf/features/ distribution/karaf/features/src/main/resources/ parent/ rt/ws/security/
Date Thu, 31 Mar 2011 20:59:26 GMT
Author: dkulp
Date: Thu Mar 31 20:59:25 2011
New Revision: 1087434

URL: http://svn.apache.org/viewvc?rev=1087434&view=rev
Log:
Get the features file somewhat closer to actually being usable

Modified:
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml
    cxf/trunk/distribution/karaf/features/pom.xml
    cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/ws/security/pom.xml

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Thu Mar 31 20:59:25 2011
@@ -332,6 +332,7 @@
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
                             org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.aries*;resolution:=optional;version="[0.2,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Thu Mar 31 20:59:25 2011
@@ -139,6 +139,7 @@
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
                             org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.aries*;resolution:=optional;version="[0.2,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Thu Mar 31 20:59:25 2011
@@ -186,6 +186,7 @@
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
                             org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.aries*;resolution:=optional;version="[0.2,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,

Modified: cxf/trunk/distribution/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/pom.xml?rev=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/pom.xml (original)
+++ cxf/trunk/distribution/karaf/features/pom.xml Thu Mar 31 20:59:25 2011
@@ -31,66 +31,6 @@
     <artifactId>apache-cxf</artifactId>
     <packaging>pom</packaging>
     <name>CXF :: Apache Karaf :: Features</name>
-
-    <!-- some of the bundles is located at: http://repo1.maven.org/maven2/org/apache/servicemix/bundles/
-->
-    <properties>
-      <abdera-bundle-version>0.4.0-incubating_3</abdera-bundle-version>
-      <ant-bundle-version>1.7.0_3</ant-bundle-version>
-      <antlr-bundle-version>2.7.7_2</antlr-bundle-version>
-      <aopalliance-bundle-version>1.0_3</aopalliance-bundle-version>
-      <asm-bundle-version>2.2.3_3</asm-bundle-version>
-      <bcel-bundle-version>5.2_2</bcel-bundle-version>
-      <cglib-version>2.1_3_6</cglib-version>
-      <commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
-      <commons-csv-version>1.0-r706899_3</commons-csv-version>
-      <commons-codec-version>1.4</commons-codec-version>
-      <commons-collections-version>3.2.1</commons-collections-version>
-      <commons-io-bundle-version>1.3.2_3</commons-io-bundle-version>
-      <commons-jxpath-version>1.3</commons-jxpath-version>
-      <commons-lang-version>2.4</commons-lang-version>
-      <commons-net-version>2.0</commons-net-version>
-      <commons-management-version>1.0</commons-management-version>
-      <commons-pool-bundle-version>1.5.4_1</commons-pool-bundle-version>
-      <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
-      <el-api-1.0-version>1.0.1</el-api-1.0-version>
-      <fastinfoset-version>1.2.7_2</fastinfoset-version>
-      <features.file>features.xml</features.file>
-      <felix.configadmin.version>1.2.4</felix.configadmin.version>
-      <felix.framework.version>2.0.5</felix.framework.version>
-      <geronimo-el-version>1.0.1</geronimo-el-version>
-      <geronimo-jsp-version>1.0.1</geronimo-jsp-version>
-      <geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
-      <gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
-      <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
-      <javax-mail-version>1.4.3</javax-mail-version>
-      <jdom-bundle-version>1.1_2</jdom-bundle-version>
-      <jettison-bundle-version>1.2</jettison-bundle-version>
-      <jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
-      <neethi-bundle-version>2.0.4_2</neethi-bundle-version>
-      <opensaml-version>1.1_3</opensaml-version>
-      <oro-bundle-version>2.0.8_3</oro-bundle-version>
-      <oscache-bundle-version>2.4_3</oscache-bundle-version>
-      <osgi.compendium.version>4.2.0</osgi.compendium.version>
-      <pax.web.version>0.7.2</pax.web.version>
-      <pax-logging-version>1.6.0</pax-logging-version>
-      <quartz-bundle-version>1.8.3_2</quartz-bundle-version>
-      <jaxws.api.version>2.2</jaxws.api.version>
-      <servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
-      <servicemix-specs-version>1.7.0</servicemix-specs-version>
-      <velocity-bundle-version>1.7_1</velocity-bundle-version>
-      <xalan-bundle-version>2.7.1_2</xalan-bundle-version>
-      <xerces-bundle-version>2.9.1_3</xerces-bundle-version>
-      <xmlbeans-bundle-version>2.5.0_1</xmlbeans-bundle-version>
-      <xmlschema-version>1.4.5</xmlschema-version>
-      <xmlsec-bundle-version>1.4.4_1</xmlsec-bundle-version>
-      <xmlresolver-bundle-version>1.2_2</xmlresolver-bundle-version>
-      <xstream-bundle-version>1.3_3</xstream-bundle-version>
-      <woodstox-core-bundle-version>4.0.8</woodstox-core-bundle-version>
-      <stax2-api-bundle-version>3.0.1</stax2-api-bundle-version>
-      <saaj-impl-version>1.3.2_1</saaj-impl-version>
-      <wsdl4j-bundle-version>1.6.2_2</wsdl4j-bundle-version>
-      <wss4j-version>1.6-SNAPSHOT</wss4j-version>
-    </properties>
     
     <!-- The validate plugin will export these provided dependencies bundles' export packages
first -->  
     <dependencies>
@@ -103,25 +43,25 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>${pax-logging-version}</version>
+            <version>${cxf.pax.logging.version}</version>
             <scope>provided</scope>
         </dependency>        
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
-            <version>${pax-logging-version}</version>
+            <version>${cxf.pax.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.framework.version}</version>
+            <version>${cxf.felix.framework.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>${felix.configadmin.version}</version>
+            <version>${cxf.felix.configadmin.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -182,7 +122,7 @@
                    <artifactId>features-maven-plugin</artifactId>
                    <version>${karaf-version}</version>
                    <configuration>
-                       <file>${project.build.directory}/classes/${features.file}</file>
+                       <file>${project.build.directory}/classes/features.xml</file>
                        <karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
                    </configuration>
                    <executions>

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=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Thu Mar 31 20:59:25
2011
@@ -17,84 +17,120 @@
       limitations under the License.
 -->
 <features>
-  <feature name='spring' version='${cxf.spring.version}'>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
-    <bundle>mvn:org.springframework/spring-asm/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.springframework/spring-aop/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.springframework/spring-core/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.springframework/spring-beans/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.springframework/spring-context/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.springframework/spring-context-support/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.springframework/spring-expression/${cxf.spring.version}</bundle>
-  </feature>
-  <feature name='jetty7' version='${cxf.jetty.version}'>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-util/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-io/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-http/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-continuation/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-server/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-security/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-servlet/${cxf.jetty.version}</bundle>
-    <bundle>mvn:org.eclipse.jetty/jetty-xml/${cxf.jetty.version}</bundle>
-  </feature>
-  <feature name='jaxb' version='${jaxb-bundle-version}'>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
-<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
-<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
-<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
-  </feature>
-  <!-- Current the abdera bundle is not working as we expect -->
-  <feature name='abdera' version='${cxf.abdera.version}'>
-    <bundle>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
-    <!--bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle-->
-    <bundle>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
-    <bundle>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
-    <bundle>mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
-    <bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
-    <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>

-    <feature version='${jaxb-bundle-version}'>jaxb</feature>
-  </feature>
-  <feature name='cxf-all' version='${pom.version}'>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-    <bundle>mvn:org.springframework/spring-jms/${cxf.spring.version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset-version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-    <bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
-    <bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
-    <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-core-bundle-version}</bundle>
-    <bundle>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
-    <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema-version}</bundle>
-    <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-    <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
-    <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
-    <bundle>mvn:org.apache.ws.security/wss4j/${wss4j-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix-specs-version}</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
-    <bundle>mvn:org.apache.cxf/cxf-bundle/${pom.version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
-    <feature version='${cxf.spring.version}'>spring</feature>
-    <feature version='${cxf.jetty.version}'>jetty7</feature>
-    <feature version='${jaxb-bundle-version}'>jaxb</feature>
-  </feature>
+    <repository>mvn:org.apache.karaf/apache-karaf/${cxf.karaf.version}/xml/features</repository>
+
+
+    <feature name="cxf-specs" version="${project.version}">
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
+        <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${cxf.javax.mail.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${cxf.servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${cxf.geronimo.servlet.version}</bundle>
+    </feature>
+
+    <feature name='jaxb' version='${cxf.jaxb.bundle.version}'>
+        <feature version="${project.verion}">cxf-specs</feature>
+        <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
+        <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" version="${cxf.spring.version}">
+        <feature version="${cxf.spring.version}">spring</feature>
+        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
+        <bundle>mvn:org.springframework/spring-jms/${cxf.spring.version}</bundle>
+        <bundle>mvn:org.springframework/spring-tx/${cxf.spring.version}</bundle>
+        <bundle>mvn:org.springframework/spring-web/${cxf.spring.version}</bundle>
+    </feature>
+    <feature name="spring-dm" version="${cxf.spring.osgi.version}">
+        <feature version="${cxf.spring.version}">spring</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cxf.cglib.bundle.version}</bundle>
+        <bundle>mvn:org.springframework.osgi/spring-osgi-io/${cxf.spring.osgi.version}</bundle>
+        <bundle>mvn:org.springframework.osgi/spring-osgi-core/${cxf.spring.osgi.version}</bundle>
+        <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${cxf.spring.osgi.version}</bundle>
+        <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${cxf.spring.osgi.version}</bundle>
+        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${cxf.karaf.version}</bundle>
+    </feature>
+    <feature name='jetty7' version='${cxf.jetty.version}'>
+        <bundle>mvn:org.eclipse.jetty/jetty-util/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-io/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-http/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-continuation/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-server/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-security/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-servlet/${cxf.jetty.version}</bundle>
+        <bundle>mvn:org.eclipse.jetty/jetty-xml/${cxf.jetty.version}</bundle>
+    </feature>
+    <!-- Current the abdera bundle is not working as we expect -->
+    <feature name='abdera' version='${cxf.abdera.version}'>
+        <bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
+        <bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${cxf.axiom.version}</bundle>
+        <bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${cxf.axiom.version}</bundle>
+
+        <bundle>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
+        <!--bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle-->
+        <bundle>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
+        <bundle>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
+        <bundle>mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
+
+        <!--bundle>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
+        <bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>
+        <bundle>mvn:org.apache.abdera/abdera-client/${cxf.abdera.version}</bundle>
+        <bundle>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
+        <feature version='${cxf.jaxb.bundle.version}'>jaxb</feature>
+    </feature>
+    <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.ws.security/wss4j/${cxf.wss4j.version}</bundle>
+    </feature>
+
+    <feature name="cxf" version="${project.version}">
+        <feature version="${project.version}">cxf-specs</feature>
+        <bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
+        <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
+
+        <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
+        <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
+        <bundle start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
+        <bundle start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
+
+        <feature version="${cxf.spring.osgi.version}">spring-dm</feature>
+        <feature version="${cxf.karaf.version}">http</feature>
+        <feature version="${cxf.karaf.version}">war</feature>
+        <feature version="${cxf.spring.version}">spring</feature>
+        <feature version="${cxf.spring.version}">spring-jms</feature>
+        <feature version="${cxf.wss4j.version}">wss4j</feature>
+        <feature version="${cxf.jetty.version}">jetty7</feature>
+        <feature version='${cxf.jaxb.bundle.version}'>jaxb</feature>
+        <feature version='${cxf.abdera.version}'>abdera</feature>
+
+        <bundle>mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
+        <bundle>mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
+
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${cxf.asm.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
+        <bundle>mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${cxf.xmlbeans.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${cxf.rhino.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${cxf.velocity.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-bundle/${project.version}</bundle>
+    </feature>
+
+
 </features>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Mar 31 20:59:25 2011
@@ -76,18 +76,63 @@
         <cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.artifact>
         <cxf.servlet-api.version>1.0</cxf.servlet-api.version>
         <cxf.spring.version>3.0.5.RELEASE</cxf.spring.version>
+        <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
         <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
         <cxf.woodstox.core.version>4.1.1</cxf.woodstox.core.version>
         <cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version>
+        <cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.2</cxf.wsdl4j.version>
         <cxf.xmlbeans.version>2.4.0</cxf.xmlbeans.version>
         <cxf.xmlschema.version>2.0</cxf.xmlschema.version>
         <cxf.jibx.version>1.2.3</cxf.jibx.version>
         <cxf.axiom.version>1.2.10</cxf.axiom.version>
+        <cxf.jettison.version>1.2</cxf.jettison.version>
+        <cxf.wss4j.version>1.6-SNAPSHOT</cxf.wss4j.version>
+        <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.xmltooling.version>1.3.1</cxf.opensaml.xmltooling.version>
+        <cxf.neethi.version>3.0.0-SNAPSHOT</cxf.neethi.version>
+
+        <cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
+        <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
+        <cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
+        <cxf.geronimo.ws.metadata.version>1.1.3</cxf.geronimo.ws.metadata.version>
+        <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
+
+        <cxf.commons-codec.version>1.4</cxf.commons-codec.version>
+        <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
+        <cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
+
+        <cxf.cglib.bundle.version>2.2_1</cxf.cglib.bundle.version>
+        <cxf.fastinfoset.bundle.version>1.2.7_3</cxf.fastinfoset.bundle.version>
+
+        <!-- various OSGi related versions -->
         <cxf.aries.version>0.3</cxf.aries.version>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
+        <cxf.karaf.version>2.1.4</cxf.karaf.version>
+        <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
+        <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
+        <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
+        <cxf.xmlbeans.bundle.version>2.4.0_4</cxf.xmlbeans.bundle.version>
+        <cxf.servicemix.specs.version>1.7.0</cxf.servicemix.specs.version>
+        <cxf.javax.mail.version>1.4.3</cxf.javax.mail.version>
+        <cxf.jaxb.bundle.version>2.2.1.1_1</cxf.jaxb.bundle.version>
+        <cxf.saaj-impl.bundle.version>1.3.2_2</cxf.saaj-impl.bundle.version>
+        <cxf.asm.bundle.version>3.3_1</cxf.asm.bundle.version>
+        <cxf.wsdl4j.bundle.version>1.6.2_3</cxf.wsdl4j.bundle.version>
+        <cxf.xmlsec.bundle.version>1.4.4_1</cxf.xmlsec.bundle.version>
+        <cxf.rhino.bundle.version>1.7R2_1</cxf.rhino.bundle.version>
+        <cxf.xmlresolver.bundle.version>1.2_3</cxf.xmlresolver.bundle.version>
+        <cxf.xerces.bundle.version>2.9.1_4</cxf.xerces.bundle.version>
+        <cxf.bcel.bundle.version>5.2_3</cxf.bcel.bundle.version>
+        <cxf.xalan.bundle.version>2.7.1_3</cxf.xalan.bundle.version>
+        <cxf.oro.bundle.version>2.0.8_4</cxf.oro.bundle.version>
+        <cxf.velocity.bundle.version>1.6.2_4</cxf.velocity.bundle.version>
+        <cxf.jdom.bundle.version>1.1_3</cxf.jdom.bundle.version>
+
         <cxf.checkstyle.extension />
 
         <cxf.spring.validation.mode>VALIDATION_AUTO</cxf.spring.validation.mode>
@@ -380,7 +425,7 @@
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
-                <version>2.1_3</version>
+                <version>2.2</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.fastinfoset</groupId>
@@ -502,7 +547,7 @@
             <dependency>
                 <groupId>org.apache.neethi</groupId>
                 <artifactId>neethi</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
+                <version>${cxf.neethi.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -546,7 +591,7 @@
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
-                <version>1.2</version>
+                <version>${cxf.jettison.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>stax</groupId>
@@ -952,7 +997,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.4</version>
+                <version>${cxf.commons-codec.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
@@ -1025,7 +1070,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.1.1</version>
+                <version>${cxf.geronimo.annotation.version}</version>
             </dependency>
             <dependency>
                 <groupId>${cxf.servlet-api.group}</groupId>
@@ -1050,7 +1095,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>1.1.1</version>
+                <version>${cxf.geronimo.jms.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -1065,7 +1110,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                <version>1.1.3</version>
+                <version>${cxf.geronimo.ws.metadata.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -1127,7 +1172,7 @@
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
+                <version>${cxf.commons-lang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>

Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1087434&r1=1087433&r2=1087434&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Thu Mar 31 20:59:25 2011
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>${cxf.wss4j.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>xerces</groupId>



Mime
View raw message