You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/01/31 10:58:04 UTC
svn commit: r617082 - in /openejb/trunk/openejb3:
assembly/openejb-standalone/pom.xml container/openejb-core/pom.xml
deps/cxf-all/ deps/pom.xml server/openejb-cxf/pom.xml
server/openejb-hsql/pom.xml
Author: dblevins
Date: Thu Jan 31 01:58:03 2008
New Revision: 617082
URL: http://svn.apache.org/viewvc?rev=617082&view=rev
Log:
Upgrade to cxf 2.0.4 bundle. Add cxf to standalone
Removed:
openejb/trunk/openejb3/deps/cxf-all/
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/deps/pom.xml
openejb/trunk/openejb3/server/openejb-cxf/pom.xml
openejb/trunk/openejb3/server/openejb-hsql/pom.xml
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=617082&r1=617081&r2=617082&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Thu Jan 31 01:58:03 2008
@@ -125,6 +125,16 @@
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
<version>5.0-1</version>
</dependency>
@@ -151,6 +161,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-hsql</artifactId>
<version>${version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -161,16 +172,13 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-telnet</artifactId>
<version>${version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
+ <artifactId>openejb-cxf</artifactId>
<version>${version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=617082&r1=617081&r2=617082&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Thu Jan 31 01:58:03 2008
@@ -318,6 +318,11 @@
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
</dependency>
+ <!-- added temporarily till we get a fixed version of the dep report plugin -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<!-- webservices -->
<dependency>
<groupId>wsdl4j</groupId>
Modified: openejb/trunk/openejb3/deps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/pom.xml?rev=617082&r1=617081&r2=617082&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/pom.xml (original)
+++ openejb/trunk/openejb3/deps/pom.xml Thu Jan 31 01:58:03 2008
@@ -29,7 +29,6 @@
<name>OpenEJB :: Dependencies</name>
<modules>
- <module>cxf-all</module>
<module>commons-dbcp-all</module>
<module>javaee-api</module>
</modules>
Modified: openejb/trunk/openejb3/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/pom.xml?rev=617082&r1=617081&r2=617082&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/pom.xml Thu Jan 31 01:58:03 2008
@@ -78,10 +78,26 @@
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.0.3-incubator</version>
+ <artifactId>cxf-bundle</artifactId>
+ <version>2.0.4-incubator</version>
<exclusions>
<exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
@@ -90,6 +106,10 @@
<artifactId>jsr181-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</exclusion>
@@ -98,104 +118,116 @@
<artifactId>jaxws-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
+ <groupId>org.codehaus.jra</groupId>
+ <artifactId>jra</artifactId>
</exclusion>
<exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity-deps</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.0.3-incubator</version>
- <exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.0.3-incubator</version>
- <exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-dep</artifactId>
</exclusion>
<exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-deps</artifactId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: openejb/trunk/openejb3/server/openejb-hsql/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/pom.xml?rev=617082&r1=617081&r2=617082&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-hsql/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-hsql/pom.xml Thu Jan 31 01:58:03 2008
@@ -54,6 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>commons-dbcp-all</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>