You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ga...@apache.org on 2008/05/23 06:34:13 UTC
svn commit: r659419 - in /cxf/trunk: ./ common/common/ parent/
rt/bindings/coloc/ rt/databinding/jaxb/ rt/frontend/jaxws/ rt/frontend/js/
rt/frontend/simple/ rt/testsupport/ rt/ws/addr/ rt/ws/policy/ rt/ws/rm/
testutils/ testutils/src/main/java/org/apa...
Author: gawor
Date: Thu May 22 21:34:12 2008
New Revision: 659419
URL: http://svn.apache.org/viewvc?rev=659419&view=rev
Log:
switch to jaxws 2.1 api from Geronimo
Modified:
cxf/trunk/common/common/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/pom.xml
cxf/trunk/rt/bindings/coloc/pom.xml
cxf/trunk/rt/databinding/jaxb/pom.xml
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/rt/frontend/js/pom.xml
cxf/trunk/rt/frontend/simple/pom.xml
cxf/trunk/rt/testsupport/pom.xml
cxf/trunk/rt/ws/addr/pom.xml
cxf/trunk/rt/ws/policy/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
cxf/trunk/testutils/pom.xml
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
cxf/trunk/tools/common/pom.xml
cxf/trunk/tools/javato/ws/pom.xml
cxf/trunk/tools/wsdlto/core/pom.xml
Modified: cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/common/common/pom.xml (original)
+++ cxf/trunk/common/common/pom.xml Thu May 22 21:34:12 2008
@@ -78,8 +78,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu May 22 21:34:12 2008
@@ -46,7 +46,6 @@
<jaxb.version>2.1</jaxb.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
<jaxb.xjc.version>2.1.6</jaxb.xjc.version>
- <jaxws.version>2.1-1</jaxws.version>
<jetty.version>6.1.9</jetty.version>
<saaj.version>1.3</saaj.version>
<saaj.impl.version>1.3</saaj.impl.version>
@@ -733,41 +732,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>2.2.2</version>
@@ -854,6 +818,11 @@
<version>1.1.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${activemq.version}</version>
Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Thu May 22 21:34:12 2008
@@ -152,6 +152,20 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
</repositories>
Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Thu May 22 21:34:12 2008
@@ -33,9 +33,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Thu May 22 21:34:12 2008
@@ -152,9 +152,9 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Thu May 22 21:34:12 2008
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/pom.xml (original)
+++ cxf/trunk/rt/frontend/js/pom.xml Thu May 22 21:34:12 2008
@@ -55,8 +55,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/pom.xml (original)
+++ cxf/trunk/rt/frontend/simple/pom.xml Thu May 22 21:34:12 2008
@@ -58,8 +58,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/rt/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/testsupport/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/testsupport/pom.xml (original)
+++ cxf/trunk/rt/testsupport/pom.xml Thu May 22 21:34:12 2008
@@ -60,8 +60,8 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified: cxf/trunk/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Thu May 22 21:34:12 2008
@@ -49,8 +49,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Thu May 22 21:34:12 2008
@@ -32,9 +32,9 @@
<dependencies>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Thu May 22 21:34:12 2008
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Thu May 22 21:34:12 2008
@@ -48,8 +48,8 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Thu May 22 21:34:12 2008
@@ -333,7 +333,7 @@
}
cmd.add("-ea");
- cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.bus.jaxws.spi.ProviderImpl");
+ cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.jaxws.spi.ProviderImpl");
String portClose = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort");
if (portClose != null) {
cmd.add("-Dorg.apache.cxf.transports.http_jetty.DontClosePort=" + portClose);
Modified: cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Thu May 22 21:34:12 2008
@@ -95,8 +95,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/pom.xml (original)
+++ cxf/trunk/tools/javato/ws/pom.xml Thu May 22 21:34:12 2008
@@ -160,8 +160,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=659419&r1=659418&r2=659419&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Thu May 22 21:34:12 2008
@@ -95,8 +95,8 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>