Author: thomas.diesler(a)jboss.com Date: 2008-04-30 14:37:34 -0400 (Wed, 30 Apr 2008) New Revision: 6817 Modified: stack/native/branches/tdiesler/trunk/.classpath stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml stack/native/branches/tdiesler/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java stack/native/branches/tdiesler/trunk/modules/jaxws/src/main/java/javax/xml/ws/Service.java stack/native/branches/tdiesler/trunk/pom.xml Log: Modified: stack/native/branches/tdiesler/trunk/.classpath =================================================================== --- stack/native/branches/tdiesler/trunk/.classpath 2008-04-30 18:01:24 UTC (rev 6816) +++ stack/native/branches/tdiesler/trunk/.classpath 2008-04-30 18:37:34 UTC (rev 6817) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="modules/jaxws-impl/src/main/java"/> - <classpathentry kind="src" path="modules/saaj-impl/src/main/java"/> - <classpathentry kind="src" path="modules/jaxrpc-impl/src/main/java"/> + <classpathentry kind="src" path="modules/jaxrpc/src/main/java"/> + <classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/> + <classpathentry kind="src" path="modules/jaxws/src/main/java"/> + <classpathentry kind="src" path="modules/saaj/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/eclipse-classes"/> Modified: stack/native/branches/tdiesler/trunk/modules/jaxws/src/main/java/javax/xml/ws/Service.java =================================================================== --- stack/native/branches/tdiesler/trunk/modules/jaxws/src/main/java/javax/xml/ws/Service.java 2008-04-30 18:01:24 UTC (rev 6816) +++ stack/native/branches/tdiesler/trunk/modules/jaxws/src/main/java/javax/xml/ws/Service.java 2008-04-30 18:37:34 UTC (rev 6817) @@ -30,7 +30,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.spi.Provider; -import javax.xml.ws.spi.ServiceDelegate21; +import javax.xml.ws.spi.ServiceDelegate; /** * <code>Service</code> objects provide the client view of a Web service. @@ -64,7 +64,7 @@ **/ public class Service { - ServiceDelegate21 delegate; + ServiceDelegate delegate; /** * The orientation of a dynamic client or service. MESSAGE provides @@ -78,7 +78,7 @@ protected Service(java.net.URL wsdlDocumentLocation, QName serviceName) { - delegate = (ServiceDelegate21)Provider.provider().createServiceDelegate(wsdlDocumentLocation, serviceName, this.getClass()); + delegate = Provider.provider().createServiceDelegate(wsdlDocumentLocation, serviceName, this.getClass()); } /** Modified: stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml 2008-04-30 18:01:24 UTC (rev 6816) +++ stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml 2008-04-30 18:37:34 UTC (rev 6817) @@ -17,13 +17,9 @@ <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-native-saaj</artifactId> + <artifactId>jbossws-native-jaxws</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> </dependencies> </project> Modified: stack/native/branches/tdiesler/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java =================================================================== --- stack/native/branches/tdiesler/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java 2008-04-30 18:01:24 UTC (rev 6816) +++ stack/native/branches/tdiesler/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java 2008-04-30 18:37:34 UTC (rev 6817) @@ -24,6 +24,7 @@ // $Id$ import javax.xml.namespace.QName; +import javax.xml.ws.spi.ServiceDelegate21; import javax.xml.bind.JAXBContext; import java.net.URL; @@ -144,7 +145,7 @@ **/ public <T> Dispatch<T> createDispatch(EndpointReference endpointReference, Class<T> type, Service.Mode mode, WebServiceFeature... features) { - return delegate.createDispatch(endpointReference, type, mode, features); + return ((ServiceDelegate21)delegate).createDispatch(endpointReference, type, mode, features); } /** @@ -221,7 +222,7 @@ **/ public Dispatch<Object> createDispatch(EndpointReference endpointReference, JAXBContext context, Service.Mode mode, WebServiceFeature... features) { - return delegate.createDispatch(endpointReference, context, mode, features); + return ((ServiceDelegate21)delegate).createDispatch(endpointReference, context, mode, features); } /** @@ -256,7 +257,7 @@ **/ public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Service.Mode mode, WebServiceFeature... features) { - return delegate.createDispatch(portName, type, mode, features); + return ((ServiceDelegate21)delegate).createDispatch(portName, type, mode, features); } /** @@ -288,7 +289,7 @@ **/ public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Service.Mode mode, WebServiceFeature... features) { - return delegate.createDispatch(portName, context, mode, features); + return ((ServiceDelegate21)delegate).createDispatch(portName, context, mode, features); } @@ -326,7 +327,7 @@ **/ public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) { - return delegate.getPort(serviceEndpointInterface, features); + return ((ServiceDelegate21)delegate).getPort(serviceEndpointInterface, features); } /** @@ -411,7 +412,7 @@ **/ public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features) { - return delegate.getPort(endpointReference, serviceEndpointInterface, features); + return ((ServiceDelegate21)delegate).getPort(endpointReference, serviceEndpointInterface, features); } /** @@ -452,6 +453,6 @@ **/ public <T> T getPort(QName portName, Class<T> serviceEndpointInterface, WebServiceFeature... features) { - return delegate.getPort(portName, serviceEndpointInterface, features); + return ((ServiceDelegate21)delegate).getPort(portName, serviceEndpointInterface, features); } } Modified: stack/native/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 18:01:24 UTC (rev 6816) +++ stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 18:37:34 UTC (rev 6817) @@ -29,12 +29,13 @@ <version>1.0-SNAPSHOT</version> </parent> - <!-- Modules - -> + <!-- Modules --> <modules> - <module>modules/management</module> - <module>modules/server</module> - <module>modules/client</module> - </modules--> + <module>modules/saaj</module> + <module>modules/jaxrpc</module> + <module>modules/jaxws</module> + <module>modules/jaxws-ext</module> + </modules> <!-- Properties --> <properties>