You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/09/17 23:35:15 UTC
svn commit: r998339 - in /cxf/trunk/distribution: bundle/all/pom.xml
bundle/jaxrs/pom.xml bundle/minimal/pom.xml manifest/pom.xml pom.xml
Author: dkulp
Date: Fri Sep 17 21:35:14 2010
New Revision: 998339
URL: http://svn.apache.org/viewvc?rev=998339&view=rev
Log:
Add SDO stuff into bundle, update manifests for jetty change
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/manifest/pom.xml
cxf/trunk/distribution/pom.xml
Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=998339&r1=998338&r2=998339&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Fri Sep 17 21:35:14 2010
@@ -83,6 +83,22 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-sdo</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
<version>${project.version}</version>
</dependency>
@@ -265,18 +281,20 @@
org.apache.commons.logging.*,
org.slf4j.*,
org.slf4j.impl.*,
- org.mortbay.management
+ org.eclipse.jetty.jmx,
+ org.eclipse.jetty.jmx.*
</DynamicImport-Package>
<Import-Package>
!org.apache.cxf.*,
+ repackage;resolution:=optional,
!META-INF.cxf,
!META-INF.cxf.osgi,
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
com.ctc.wstx.msv*;resolution:=optional,
+ commonj.sdo*;resolution:=optional,
javax.ws.rs*;resolution:=optional,
- repackage;resolution:=optional,
javax.resource*;resolution:=optional,
javax.xml.soap,
junit.framework*;resolution:=optional,
@@ -287,17 +305,20 @@
org.apache.commons.pool*;resolution:=optional,
org.apache.log4j*;resolution:=optional,
org.apache.mina*;resolution:=optional,
+ org.apache.tuscany.sdo*;resolution:=optional,
org.apache.velocity*;resolution:=optional,
org.apache.xmlbeans*;resolution:=optional,
org.apache.xml.security*;resolution:=optional,
org.apache.ws.security*;resolution:=optional,
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
+ org.eclipse.emf*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional,
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
- org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
+ org.objectweb.asm*;version="[2.0,4)",
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=998339&r1=998338&r2=998339&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Fri Sep 17 21:35:14 2010
@@ -121,7 +121,8 @@
org.apache.commons.logging.*,
org.slf4j.*,
org.slf4j.impl.*,
- org.mortbay.management
+ org.eclipse.jetty.jmx,
+ org.eclipse.jetty.jmx.*
</DynamicImport-Package>
<Import-Package>
!org.apache.cxf.*,
@@ -148,7 +149,7 @@
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
- org.mortbay*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=998339&r1=998338&r2=998339&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Fri Sep 17 21:35:14 2010
@@ -165,7 +165,8 @@
org.apache.commons.logging.*,
org.slf4j.*,
org.slf4j.impl.*,
- org.mortbay.management
+ org.eclipse.jetty.jmx,
+ org.eclipse.jetty.jmx.*
</DynamicImport-Package>
<Import-Package>
!org.apache.cxf.*,
@@ -198,7 +199,7 @@
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
- org.mortbay*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=998339&r1=998338&r2=998339&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Fri Sep 17 21:35:14 2010
@@ -214,6 +214,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-sdo</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=998339&r1=998338&r2=998339&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Fri Sep 17 21:35:14 2010
@@ -222,6 +222,22 @@
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-sdo</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>