cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1231213 - in /cxf/trunk: common/common/ osgi/karaf/features/src/main/resources/ parent/ rt/databinding/jaxb/ rt/databinding/xmlbeans/ rt/frontend/jaxrs/ rt/frontend/jaxws/ rt/transports/http-jetty/ rt/transports/http/ rt/transports/jms/
Date Fri, 13 Jan 2012 18:03:46 GMT
Author: dkulp
Date: Fri Jan 13 18:03:46 2012
New Revision: 1231213

URL: http://svn.apache.org/viewvc?rev=1231213&view=rev
Log:
Updates to get all the bundles loading in karaf (no idea if they work
but they at least load :)  )

Modified:
    cxf/trunk/common/common/pom.xml
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/databinding/jaxb/pom.xml
    cxf/trunk/rt/databinding/xmlbeans/pom.xml
    cxf/trunk/rt/frontend/jaxrs/pom.xml
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/rt/transports/http-jetty/pom.xml
    cxf/trunk/rt/transports/http/pom.xml
    cxf/trunk/rt/transports/jms/pom.xml

Modified: cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/common/common/pom.xml (original)
+++ cxf/trunk/common/common/pom.xml Fri Jan 13 18:03:46 2012
@@ -45,6 +45,16 @@
             org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}",
             org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
         </cxf.osgi.import>
+        <cxf.osgi.dynamic.import>
+            com.sun.xml.bind.api,
+            com.sun.xml.bind.api.*,
+            com.sun.xml.internal.bind.api,
+            com.sun.xml.internal.bind.api.*,
+            com.ctc.wstx.*,
+            org.apache.commons.logging.*,
+            org.slf4j.*,
+            org.slf4j.impl.*,
+        </cxf.osgi.dynamic.import>
     </properties>
 
     <dependencies>

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=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Fri Jan 13 18:03:46 2012
@@ -149,10 +149,68 @@
     </feature>
     <feature name="cxf-core" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-alldeps</feature>
+        <bundle>mvn:org.apache.cxf/cxf-common-utilities/${project.version}</bundle>
 
-        <bundle start-level='30'>mvn:org.apache.cxf/cxf-common-utilities/${project.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.cxf/cxf-api/${project.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.cxf/cxf-rt-core/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-api/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-core/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle>

+
+        <bundle>mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-databinding-jaxb/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-databinding-aegis/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-databinding-xmlbeans/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-transports-common/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-transports-local/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-soap/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}</bundle>
+
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-corba/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-object/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-frontend-simple/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-frontend-js/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-javascript/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-ws-mex/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-ws-rm/${project.version}</bundle>
+
+        <bundle>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
+
+
+        <bundle>mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-misctools/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-validator/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-wadlto-jaxrs/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-core/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-databinding-jaxb/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-javascript/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-jaxws/${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
+        <bundle>mvn:org.apache.cxf/cxf-rt-databinding-sdo/${project.version}</bundle-->
+        <!-- need jibx deps
+        <bundle>mvn:org.apache.cxf/cxf-rt-databinding-jibx/${project.version}</bundle-->
+        <!-- need antlr
+        <bundle>mvn:org.apache.cxf/cxf-tools-corba/${project.version}</bundle-->
     </feature>
 
     <feature name="cxf-sts" version="${project.version}" resolver='(obr)'>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Jan 13 18:03:46 2012
@@ -60,6 +60,7 @@
         <cxf.osgi.export>
             org.apache.cxf.*;-split-package:=first,
         </cxf.osgi.export>
+        <cxf.osgi.dynamic.import />
         <cxf.osgi.spring.version>[2.5,4)</cxf.osgi.spring.version>
         <cxf.osgi.asm.version>[2.0,4)</cxf.osgi.asm.version>
         <cxf.osgi.commons.lang.version>[2.4,3)</cxf.osgi.commons.lang.version>
@@ -69,7 +70,7 @@
         <cxf.osgi.javax.stream.version>[0.0,2)</cxf.osgi.javax.stream.version>
         <cxf.osgi.javax.activation.version>[0.0,2)</cxf.osgi.javax.activation.version>
         <cxf.osgi.javax.mail.version>[0.0,2)</cxf.osgi.javax.mail.version>
-
+        <cxf.osgi.javax.servlet.version>[0.0,4)</cxf.osgi.javax.servlet.version>
 
         <!-- please maintain alphabetical order here -->
         <cxf.abdera.version>1.1.2</cxf.abdera.version>
@@ -497,15 +498,7 @@
                                     *
                                 </Import-Package>
                                 <DynamicImport-Package>
-                                    com.sun.xml.bind.api,
-                                    com.sun.xml.bind.api.*,
-                                    com.sun.xml.internal.bind.api,
-                                    com.sun.xml.internal.bind.api.*,
-                                    com.ctc.wstx.*,
-                                    org.apache.commons.logging.*,
-                                    org.slf4j.*,
-                                    org.slf4j.impl.*,
-                                    org.eclipse.jetty.jmx
+                                    ${cxf.osgi.dynamic.import}
                                 </DynamicImport-Package>
                             </instructions>
                         </configuration>

Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Fri Jan 13 18:03:46 2012
@@ -37,6 +37,12 @@
             javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
             org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
         </cxf.osgi.import>
+        <cxf.osgi.dynamic.import>
+            com.sun.xml.bind.api,
+            com.sun.xml.bind.api.*,
+            com.sun.xml.internal.bind.api,
+            com.sun.xml.internal.bind.api.*,
+        </cxf.osgi.dynamic.import>
     </properties>
     <build>
         <plugins>

Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Fri Jan 13 18:03:46 2012
@@ -31,7 +31,12 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-
+    <properties>
+        <cxf.spi-dir>spi-2.1</cxf.spi-dir>
+        <cxf.osgi.import>
+            !repackage
+        </cxf.osgi.import>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -63,6 +68,7 @@
             <artifactId>cxf-tools-wsdlto-core</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
 

Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Fri Jan 13 18:03:46 2012
@@ -33,6 +33,12 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+        </cxf.osgi.import>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
@@ -120,6 +126,7 @@
             <groupId>${cxf.servlet-api.group}</groupId>
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri Jan 13 18:03:46 2012
@@ -35,6 +35,9 @@
 
     <properties>
         <cxf.spi-dir>spi-2.1</cxf.spi-dir>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+        </cxf.osgi.import>
     </properties>
     <dependencies>
         <dependency>
@@ -157,7 +160,7 @@
             <groupId>${cxf.servlet-api.group}</groupId>
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
-	    <optional>true</optional>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Fri Jan 13 18:03:46 2012
@@ -32,7 +32,14 @@
         <version>2.6.0-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
-
+    <properties>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+        </cxf.osgi.import>
+        <cxf.osgi.dynamic.import>
+            org.eclipse.jetty.jmx
+        </cxf.osgi.dynamic.import>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Fri Jan 13 18:03:46 2012
@@ -32,6 +32,11 @@
         <version>2.6.0-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
+    <properties>
+        <cxf.osgi.import>
+            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+        </cxf.osgi.import>
+    </properties>
 
     <dependencies>
         <dependency>

Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1231213&r1=1231212&r2=1231213&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Fri Jan 13 18:03:46 2012
@@ -33,6 +33,10 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <cxf.spi-dir>spi-2.1</cxf.spi-dir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -131,6 +135,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>        
     </dependencies>
 



Mime
View raw message