You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/08/14 03:34:01 UTC
svn commit: r685741 - in /geronimo/server/trunk: ./
framework/configs/jee-specs/
plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/
plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/
plugins/cxf/geronimo-cxf...
Author: gawor
Date: Wed Aug 13 18:34:00 2008
New Revision: 685741
URL: http://svn.apache.org/viewvc?rev=685741&view=rev
Log:
upgrade to jax-ws api 2.1 (GERONIMO-4242)
Modified:
geronimo/server/trunk/framework/configs/jee-specs/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContext.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Wed Aug 13 18:34:00 2008
@@ -162,9 +162,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
@@ -323,8 +324,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContext.java?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContext.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContext.java Wed Aug 13 18:34:00 2008
@@ -20,9 +20,12 @@
import java.security.Principal;
import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
+import org.w3c.dom.Element;
+
/**
* Implementation of WebServiceContext for POJO WS to ensure that getUserPrincipal()
* and isUserInRole() are properly handled.
@@ -63,4 +66,13 @@
context.set(null);
}
+ public EndpointReference getEndpointReference(Element... referenceParameters) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
+ Element... referenceParameters) {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java Wed Aug 13 18:34:00 2008
@@ -23,6 +23,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
@@ -42,6 +43,8 @@
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.openejb.DeploymentInfo;
+import org.w3c.dom.Element;
+
public class EJBEndpoint extends CXFEndpoint {
public EJBEndpoint(Bus bus,
@@ -140,5 +143,14 @@
// shutdown server
super.stop();
}
+
+ public EndpointReference getEndpointReference(Element... referenceParameters) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
+ Element... referenceParameters) {
+ throw new UnsupportedOperationException();
+ }
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java Wed Aug 13 18:34:00 2008
@@ -21,6 +21,7 @@
import java.net.URL;
import javax.naming.Context;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
import org.slf4j.Logger;
@@ -36,6 +37,8 @@
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.geronimo.jaxws.annotations.AnnotationHolder;
+import org.w3c.dom.Element;
+
public class POJOEndpoint extends CXFEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(POJOEndpoint.class);
@@ -112,4 +115,14 @@
// shutdown server
super.stop();
}
+
+ public EndpointReference getEndpointReference(Element... referenceParameters) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
+ Element... referenceParameters) {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Wed Aug 13 18:34:00 2008
@@ -72,8 +72,8 @@
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Wed Aug 13 18:34:00 2008
@@ -40,7 +40,7 @@
private final static String [][] LIBS =
{
- { "org.apache.axis2", "axis2-jaxws-api" },
+ { "org.apache.geronimo.specs", "geronimo-jaxws_2.1_spec" },
{ "org.apache.geronimo.specs", "geronimo-saaj_1.3_spec" },
{ "javax.xml.bind", "jaxb-api" },
{ "com.sun.xml.bind", "jaxb-impl" },
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Wed Aug 13 18:34:00 2008
@@ -72,8 +72,8 @@
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Aug 13 18:34:00 2008
@@ -1176,6 +1176,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
@@ -1290,12 +1296,6 @@
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
- <version>${axis2Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
<version>${axis2Version}</version>
</dependency>
Modified: geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml Wed Aug 13 18:34:00 2008
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml Wed Aug 13 18:34:00 2008
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -58,6 +58,12 @@
<artifactId>wsdl4j</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Wed Aug 13 18:34:00 2008
@@ -68,12 +68,6 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml Wed Aug 13 18:34:00 2008
@@ -33,6 +33,14 @@
<name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS REST WAR</name>
<packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<!--
FIXME: Why?
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml?rev=685741&r1=685740&r2=685741&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml Wed Aug 13 18:34:00 2008
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -54,12 +54,24 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<modules>