Author: heiko.braun(a)jboss.com Date: 2007-09-26 06:14:18 -0400 (Wed, 26 Sep 2007) New Revision: 4630 Added: stack/native/trunk/src/main/java/javax/xml/ws/Binding21.java stack/native/trunk/src/main/java/javax/xml/ws/Endpoint21.java stack/native/trunk/src/main/java/javax/xml/ws/Service21.java stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext21.java stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-release.xml stack/native/trunk/build.xml stack/native/trunk/src/main/java/javax/xml/ws/Binding.java stack/native/trunk/src/main/java/javax/xml/ws/BindingProvider.java stack/native/trunk/src/main/java/javax/xml/ws/Endpoint.java stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java stack/native/trunk/src/main/java/javax/xml/ws/Service.java stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext.java stack/native/trunk/src/main/java/javax/xml/ws/http/HTTPBinding.java stack/native/trunk/src/main/java/javax/xml/ws/soap/SOAPBinding.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventingService.java Log: TCK signature tests: Remove JAX-WS 2.1 aditions from jboss-jaxws.jar. Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2007-09-26 10:14:18 UTC (rev 4630) @@ -97,8 +97,8 @@ </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jbossws-core-scripts.zip"/> Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/ant-import/build-release.xml 2007-09-26 10:14:18 UTC (rev 4630) @@ -47,7 +47,7 @@ <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-core-src.zip"/> <include name="jbossws-core-scripts.zip"/> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-09-26 10:14:18 UTC (rev 4630) @@ -31,8 +31,8 @@ <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> </path> @@ -81,7 +81,7 @@ <classpath refid="tests.client.classpath"/> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true" fork="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/build.xml 2007-09-26 10:14:18 UTC (rev 4630) @@ -127,23 +127,61 @@ </jar> <!-- Build jboss-jaxws.jar --> - <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.classes.dir}"> - <include name="javax/annotation/**"/> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - </fileset> + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="javax/annotation/**"/> + <include name="javax/jws/**"/> + <include name="javax/xml/ws/**"/> + <exclude name="javax/xml/ws/**/*21.class"/> + <exclude name="javax/xml/ws/Action.class"/> + <exclude name="javax/xml/ws/EndpointReference.class"/> + <exclude name="javax/xml/ws/FaultAction.class"/> + <exclude name="javax/xml/ws/RespectBinding.class"/> + <exclude name="javax/xml/ws/RespectBindingFeature.class"/> + <exclude name="javax/xml/ws/WebServiceFeature.class"/> + <exclude name="javax/xml/ws/addressing/**"/> + <exclude name="javax/xml/ws/wsaddressing/**"/> + </fileset> <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/> - </jar> + </jar> - <!-- Build jbossws-core.jar --> + <!-- Build jboss-jaxws-ext.jar --> + <!--mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-jaxws-ext.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="javax/xml/ws/**/*21.class"/> + <include name="javax/xml/ws/Action.class"/> + <include name="javax/xml/ws/EndpointReference.class"/> + <include name="javax/xml/ws/FaultAction.class"/> + <include name="javax/xml/ws/RespectBinding.class"/> + <include name="javax/xml/ws/RespectBindingFeature.class"/> + <include name="javax/xml/ws/WebServiceFeature.class"/> + <include name="javax/xml/ws/addressing/**"/> + <include name="javax/xml/ws/wsaddressing/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jboss-jaxws-ext.jar/META-INF"/> + </jar--> + + <!-- Build jbossws-core.jar --> <mkdir dir="${core.output.lib.dir}"/> <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> - </fileset> + + <!-- JAX-WS 2.1 extensions --> + <include name="javax/xml/ws/**/*21.class"/> + <include name="javax/xml/ws/Action.class"/> + <include name="javax/xml/ws/EndpointReference.class"/> + <include name="javax/xml/ws/FaultAction.class"/> + <include name="javax/xml/ws/RespectBinding.class"/> + <include name="javax/xml/ws/RespectBindingFeature.class"/> + <include name="javax/xml/ws/WebServiceFeature.class"/> + <include name="javax/xml/ws/addressing/**"/> + <include name="javax/xml/ws/wsaddressing/**"/> + + </fileset> <fileset dir="${core.resources.dir}"> <include name="schema/**"/> <include name="dtd/**"/> @@ -156,7 +194,19 @@ <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> - </fileset> + + <!-- JAX-WS 2.1 extensions --> + <include name="javax/xml/ws/**/*21.class"/> + <include name="javax/xml/ws/Action.class"/> + <include name="javax/xml/ws/EndpointReference.class"/> + <include name="javax/xml/ws/FaultAction.class"/> + <include name="javax/xml/ws/RespectBinding.class"/> + <include name="javax/xml/ws/RespectBindingFeature.class"/> + <include name="javax/xml/ws/WebServiceFeature.class"/> + <include name="javax/xml/ws/addressing/**"/> + <include name="javax/xml/ws/wsaddressing/**"/> + + </fileset> <fileset dir="${core.resources.dir}"> <include name="schema/**"/> <include name="dtd/**"/> Modified: stack/native/trunk/src/main/java/javax/xml/ws/Binding.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Binding.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/Binding.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -53,14 +53,4 @@ * chain. */ public void setHandlerChain(java.util.List<javax.xml.ws.handler.Handler> chain); - - /** - * Get the URI for this binding instance. - * - * @return String The binding identifier for the port. - * Never returns <code>null</code> - * - * @since JAX-WS 2.1 - */ - String getBindingID(); } Added: stack/native/trunk/src/main/java/javax/xml/ws/Binding21.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Binding21.java (rev 0) +++ stack/native/trunk/src/main/java/javax/xml/ws/Binding21.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.xml.ws; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public interface Binding21 extends Binding +{ + /** + * Get the URI for this binding instance. + * + * @return String The binding identifier for the port. + * Never returns <code>null</code> + * + * @since JAX-WS 2.1 + */ + String getBindingID(); +} Property changes on: stack/native/trunk/src/main/java/javax/xml/ws/Binding21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/javax/xml/ws/BindingProvider.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/BindingProvider.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/BindingProvider.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -25,8 +25,6 @@ import java.util.Map; -import javax.xml.ws.wsaddressing.W3CEndpointReference; - /** The <code>BindingProvider</code> interface provides access to the * protocol binding and associated context objects for request and * response message processing. @@ -108,68 +106,4 @@ * @return The Binding for this binding provider. **/ Binding getBinding(); - - /** - * Returns the <code>EndpointReference</code> associated with - * this <code>BindingProvider</code> instance. - * <p> - * If the Binding for this <code>bindingProvider</code> is - * either SOAP1.1/HTTP or SOAP1.2/HTTP, then a - * <code>W3CEndpointReference</code> MUST be returned. - * If the returned <code>EndpointReference</code> is a - * <code>W3CEndpointReference</code> it MUST contain - * the <code>wsaw:ServiceName</code> element and the - * <code>wsaw:EndpointName</code> attribute on the - * <code>wsaw:ServiceName</code>. It SHOULD contain - * the embedded WSDL in the <code>wsa:Metadata</code> element - * if there is an associated WSDL. The - * <code>wsaw:InterfaceName</code> MAY also be present. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> - * WS-Addressing - WSDL 1.0</a>. - * - * @return EndpointReference of the target endpoint associated with this - * <code>BindingProvider</code> instance. - * - * @throws java.lang.UnsupportedOperationException If this - * <code>BindingProvider</code> uses the XML/HTTP binding. - * - * @see W3CEndpointReference - * - * @since JAX-WS 2.1 - */ - public EndpointReference getEndpointReference(); - - /** - * Returns the <code>EndpointReference</code> associated with - * this <code>BindingProvider</code> instance. The instance - * returned will be of type <code>clazz</code>. - * <p> - * If the returned <code>EndpointReference</code> is a - * <code>W3CEndpointReference</code> it MUST contain - * the <code>wsaw:ServiceName</code> element and the - * <code>wsaw:EndpointName</code> attribute on the - * <code>wsaw:ServiceName</code>. It SHOULD contain - * the embedded WSDL in the <code>wsa:Metadata</code> element - * if there is an associated WSDL. The - * <code>wsaw:InterfaceName</code> MAY also be present. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> - * WS-Addressing - WSDL 1.0</a>. - * - * @param clazz Specifies the type of <code>EndpointReference</code> - * that MUST be returned. - - * @return EndpointReference of the target endpoint associated with this - * <code>BindingProvider</code> instance. MUST be of type - * <code>clazz</code>. - - * @throws WebServiceException If the Class <code>clazz</code> - * is not supported by this implementation. - * @throws java.lang.UnsupportedOperationException If this - * <code>BindingProvider</code> uses the XML/HTTP binding. - * - * @since JAX-WS 2.1 - */ - public <T extends EndpointReference> T getEndpointReference(Class<T> clazz); } Modified: stack/native/trunk/src/main/java/javax/xml/ws/Endpoint.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Endpoint.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/Endpoint.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -23,15 +23,11 @@ // $Id$ +import javax.xml.ws.soap.SOAPBinding; +import javax.xml.ws.spi.Provider; import java.util.List; import java.util.Map; -import javax.xml.ws.soap.SOAPBinding; -import javax.xml.ws.spi.Provider; -import javax.xml.ws.wsaddressing.W3CEndpointReference; - -import org.w3c.dom.Element; - /** * A Web service endpoint. * @@ -298,77 +294,4 @@ **/ public abstract void setProperties(Map<String, Object> properties); - /** - * Returns the <code>EndpointReference</code> associated with - * this <code>Endpoint</code> instance. - * <p> - * If the Binding for this <code>bindingProvider</code> is - * either SOAP1.1/HTTP or SOAP1.2/HTTP, then a - * <code>W3CEndpointReference</code> MUST be returned. - * If the returned <code>EndpointReference</code> is a - * <code>W3CEndpointReference</code> it MUST contain - * the <code>wsaw:ServiceName</code> element and the - * <code>wsaw:EndpointName</code> attribute on the - * <code>wsaw:ServiceName</code>. It SHOULD contain - * the embedded WSDL in the <code>wsa:Metadata</code> element - * if there is an associated WSDL. The - * <code>wsaw:InterfaceName</code> MAY also be present. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> - * WS-Addressing - WSDL 1.0</a>. - * - * @param referenceParameters Reference parameters to be associated with the - * returned <code>EndpointReference</code> instance. - * @return EndpointReference of this <code>Endpoint</code> instance. - * If the returned <code>EndpointReference</code> is of type - * <code>W3CEndpointReference</code> then it MUST contain the - * the specified <code>referenceParameters</code>. - - * @throws WebServiceException If any error in the creation of - * the <code>EndpointReference</code> or if the <code>Endpoint</code> is - * not in the published state. - * @throws UnsupportedOperationException If this <code>BindingProvider</code> - * uses the XML/HTTP binding. - * - * @see W3CEndpointReference - * - * @since JAX-WS 2.1 - **/ - public abstract EndpointReference getEndpointReference(Element... referenceParameters); - - /** - * Returns the <code>EndpointReference</code> associated with - * this <code>Endpoint</code> instance. - * <p> - * If the returned <code>EndpointReference</code> is a - * <code>W3CEndpointReference</code> it MUST contain - * the <code>wsaw:ServiceName</code> element and the - * <code>wsaw:EndpointName</code> attribute on the - * <code>wsaw:ServiceName</code>. It SHOULD contain - * the embedded WSDL in the <code>wsa:Metadata</code> element - * if there is an associated WSDL. The - * <code>wsaw:InterfaceName</code> MAY also be present. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> - * WS-Addressing - WSDL 1.0</a>. - * - * @param referenceParameters Reference parameters to be associated with the - * returned <code>EndpointReference</code> instance. - * @return EndpointReference of type <code>clazz</code> of this - * <code>Endpoint<code> instance. - * If the returned <code>EndpointReference</code> is of type - * <code>W3CEndpointReference</code> then it MUST contain the - * the specified <code>referenceParameters</code>. - - * @throws WebServiceException If any error in the creation of - * the <code>EndpointReference</code> or if the <code>Endpoint</code> is - * not in the published state or if the <code>clazz</code> is not a supported - * <code>EndpointReference</code> type. - * @throws UnsupportedOperationException If this <code>BindingProvider</code> - * uses the XML/HTTP binding. - * - * - * @since JAX-WS 2.1 - **/ - public abstract <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters); } Added: stack/native/trunk/src/main/java/javax/xml/ws/Endpoint21.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Endpoint21.java (rev 0) +++ stack/native/trunk/src/main/java/javax/xml/ws/Endpoint21.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.xml.ws; + +import org.w3c.dom.Element; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class Endpoint21 extends Endpoint +{ + /** + * Returns the <code>EndpointReference</code> associated with + * this <code>Endpoint</code> instance. + * <p> + * If the Binding for this <code>bindingProvider</code> is + * either SOAP1.1/HTTP or SOAP1.2/HTTP, then a + * <code>W3CEndpointReference</code> MUST be returned. + * If the returned <code>EndpointReference</code> is a + * <code>W3CEndpointReference</code> it MUST contain + * the <code>wsaw:ServiceName</code> element and the + * <code>wsaw:EndpointName</code> attribute on the + * <code>wsaw:ServiceName</code>. It SHOULD contain + * the embedded WSDL in the <code>wsa:Metadata</code> element + * if there is an associated WSDL. The + * <code>wsaw:InterfaceName</code> MAY also be present. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> + * WS-Addressing - WSDL 1.0</a>. + * + * @param referenceParameters Reference parameters to be associated with the + * returned <code>EndpointReference</code> instance. + * @return EndpointReference of this <code>Endpoint</code> instance. + * If the returned <code>EndpointReference</code> is of type + * <code>W3CEndpointReference</code> then it MUST contain the + * the specified <code>referenceParameters</code>. + + * @throws WebServiceException If any error in the creation of + * the <code>EndpointReference</code> or if the <code>Endpoint</code> is + * not in the published state. + * @throws UnsupportedOperationException If this <code>BindingProvider</code> + * uses the XML/HTTP binding. + * + * @see javax.xml.ws.wsaddressing.W3CEndpointReference + * + * @since JAX-WS 2.1 + **/ + public abstract EndpointReference getEndpointReference(Element... referenceParameters); + + /** + * Returns the <code>EndpointReference</code> associated with + * this <code>Endpoint</code> instance. + * <p> + * If the returned <code>EndpointReference</code> is a + * <code>W3CEndpointReference</code> it MUST contain + * the <code>wsaw:ServiceName</code> element and the + * <code>wsaw:EndpointName</code> attribute on the + * <code>wsaw:ServiceName</code>. It SHOULD contain + * the embedded WSDL in the <code>wsa:Metadata</code> element + * if there is an associated WSDL. The + * <code>wsaw:InterfaceName</code> MAY also be present. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> + * WS-Addressing - WSDL 1.0</a>. + * + * @param referenceParameters Reference parameters to be associated with the + * returned <code>EndpointReference</code> instance. + * @return EndpointReference of type <code>clazz</code> of this + * <code>Endpoint<code> instance. + * If the returned <code>EndpointReference</code> is of type + * <code>W3CEndpointReference</code> then it MUST contain the + * the specified <code>referenceParameters</code>. + + * @throws WebServiceException If any error in the creation of + * the <code>EndpointReference</code> or if the <code>Endpoint</code> is + * not in the published state or if the <code>clazz</code> is not a supported + * <code>EndpointReference</code> type. + * @throws UnsupportedOperationException If this <code>BindingProvider</code> + * uses the XML/HTTP binding. + * + * + * @since JAX-WS 2.1 + **/ + public abstract <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters); +} Property changes on: stack/native/trunk/src/main/java/javax/xml/ws/Endpoint21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -57,7 +57,7 @@ * <li>{@link Service#getPort(EndpointReference,Class,WebServiceFeature...)} * <li>{@link Service#createDispatch(QName,Class, * Service.Mode mode,WebServiceFeature...)} - * <li>{@link Service#createDispatch(EndpointReference, + * <li>{@link Service21#createDispatch(EndpointReference, * Class,Service.Mode, * WebServiceFeature...)} * <li>{@link Service#createDispatch(QName, Modified: stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -52,7 +52,7 @@ * <li>{@link Service#getPort(EndpointReference,Class,WebServiceFeature...)} * <li>{@link Service#createDispatch(QName,Class, * Service.Mode mode,WebServiceFeature...)} - * <li>{@link Service#createDispatch(EndpointReference, + * <li>{@link Service21#createDispatch(EndpointReference, * Class,Service.Mode, * WebServiceFeature...)} * <li>{@link Service#createDispatch(QName, Modified: stack/native/trunk/src/main/java/javax/xml/ws/Service.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Service.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/Service.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -23,16 +23,13 @@ // $Id$ -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.net.URL; -import java.util.Iterator; - import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.spi.Provider; import javax.xml.ws.spi.ServiceDelegate; +import java.net.URL; +import java.util.Iterator; /** * <code>Service</code> objects provide the client view of a Web service. @@ -117,47 +114,6 @@ } /** - * The getPort method returns a proxy. A service client - * uses this proxy to invoke operations on the target - * service endpoint. The <code>serviceEndpointInterface</code> - * specifies the service endpoint interface that is supported by - * the created dynamic proxy instance. - * - * @param portName Qualified name of the service endpoint in - * the WSDL service description. - * @param serviceEndpointInterface Service endpoint interface - * supported by the dynamic proxy instance. - * @param features A list of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * @return Object Proxy instance that - * supports the specified service endpoint - * interface. - * @throws WebServiceException This exception is thrown in the - * following cases: - * <UL> - * <LI>If there is an error in creation of - * the proxy. - * <LI>If there is any missing WSDL metadata - * as required by this method. - * <LI>If an illegal - * <code>serviceEndpointInterface</code> - * or <code>portName</code> is specified. - * <LI>If a feature is enabled that is not compatible - * with this port or is unsupported. - * </UL> - * @see java.lang.reflect.Proxy - * @see java.lang.reflect.InvocationHandler - * @see WebServiceFeature - * - * @since JAX-WS 2.1 - **/ - public <T> T getPort(QName portName, Class<T> serviceEndpointInterface, WebServiceFeature... features) - { - return delegate.getPort(portName, serviceEndpointInterface, features); - } - - /** * The getPort method returns a proxy. The parameter * <code>serviceEndpointInterface</code> specifies the service * endpoint interface that is supported by the returned proxy. @@ -185,129 +141,7 @@ return delegate.getPort(serviceEndpointInterface); } - /** - * The getPort method returns a proxy. The parameter - * <code>serviceEndpointInterface</code> specifies the service - * endpoint interface that is supported by the returned proxy. - * In the implementation of this method, the JAX-WS - * runtime system takes the responsibility of selecting a protocol - * binding (and a port) and configuring the proxy accordingly. - * The returned proxy should not be reconfigured by the client. - * - * @param serviceEndpointInterface Service endpoint interface. - * @param features A list of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * @return Object instance that supports the - * specified service endpoint interface. - * @throws WebServiceException - * <UL> - * <LI>If there is an error during creation - * of the proxy. - * <LI>If there is any missing WSDL metadata - * as required by this method. - * <LI>If an illegal - * <code>serviceEndpointInterface</code> - * is specified. - * <LI>If a feature is enabled that is not compatible - * with this port or is unsupported. - * </UL> - * - * @see WebServiceFeature - * - * @since JAX-WS 2.1 - **/ - public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) - { - return delegate.getPort(serviceEndpointInterface, features); - } - /** - * The getPort method returns a proxy. - * The parameter <code>endpointReference</code> specifies the - * endpoint that will be invoked by the returned proxy. If there - * are any reference parameters in the - * <code>endpointReference</code>, then those reference - * parameters MUST appear as SOAP headers, indicating them to be - * reference parameters, on all messages sent to the endpoint. - * The <code>endpointReference's</code> address MUST be used - * for invocations on the endpoint. - * The parameter <code>serviceEndpointInterface</code> specifies - * the service endpoint interface that is supported by the - * returned proxy. - * In the implementation of this method, the JAX-WS - * runtime system takes the responsibility of selecting a protocol - * binding (and a port) and configuring the proxy accordingly from - * the WSDL associated with this <code>Service</code> instance or - * from the WSDL Metadata from the <code>endpointReference</code>. - * If this <code>Service</code> instance has a WSDL and - * the <code>endpointReference</code> - * also has a WSDL, then the WSDL from this instance will be used. - * If this <code>Service</code> instance does not have a WSDL and - * the <code>endpointReference</code> does have a WSDL, then the - * WSDL from the <code>endpointReference</code> will be used. - * The returned proxy should not be reconfigured by the client. - * If this <code>Service</code> instance has a known proxy - * port that matches the information contained in - * the WSDL, - * then that proxy is returned, otherwise a WebServiceException - * is thrown. - * <p> - * Calling this method has the same behavior as the following - * <pre> - * port = service.getPort(portName, serviceEndpointInterface); - * </pre> - * where the <code>portName</code> is retrieved from the - * <code>wsaw:EndpontName</code> attribute of the - * <code>wsaw:ServiceName</code> element in the - * metadata of the <code>endpointReference</code> or from the - * <code>serviceEndpointInterface</code> and the WSDL - * associated with this <code>Service</code> instance. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/">W... - WSDL 1.0 - * </a>. - * - * @param endpointReference The <code>EndpointReference</code> - * for the target service endpoint that will be invoked by the - * returned proxy. - * @param serviceEndpointInterface Service endpoint interface. - * @param features An array of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * @return Object Proxy instance that supports the - * specified service endpoint interface. - * @throws WebServiceException - * <UL> - * <LI>If there is an error during creation - * of the proxy. - * <LI>If there is any missing WSDL metadata - * as required by this method. - * <LI>If the <code>wsaw:EndpointName</code> is - * missing from the <code>endpointReference</code> - * or does not match a wsdl:Port - * in the WSDL metadata. - * <LI>If the <code>wsaw:ServiceName</code> in the - * <code>endpointReference</code> metadata does not - * match the <code>serviceName</code> of this - * <code>Service</code> instance. - * <LI>If an invalid - * <code>endpointReference</code> - * is specified. - * <LI>If an invalid - * <code>serviceEndpointInterface</code> - * is specified. - * <LI>If a feature is enabled that is not compatible - * with this port or is unsupported. - * </UL> - * - * @since JAX-WS 2.1 - **/ - public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features) - { - return delegate.getPort(endpointReference, serviceEndpointInterface, features); - } - - /** * Creates a new port for the service. Ports created in this way contain * no WSDL port type information and can only be used for creating * <code>Dispatch</code>instances. @@ -357,120 +191,6 @@ } /** - * Creates a <code>Dispatch</code> instance for use with objects of - * the users choosing. - * - * @param portName Qualified name for the target service endpoint - * @param type The class of object used for messages or message - * payloads. Implementations are required to support - * javax.xml.transform.Source and javax.xml.soap.SOAPMessage. - * @param mode Controls whether the created dispatch instance is message - * or payload oriented, i.e. whether the user will work with complete - * protocol messages or message payloads. E.g. when using the SOAP - * protocol, this parameter controls whether the user will work with - * SOAP messages or the contents of a SOAP body. Mode MUST be MESSAGE - * when type is SOAPMessage. - * @param features A list of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * - * @return Dispatch instance. - * @throws WebServiceException If any error in the creation of - * the <code>Dispatch</code> object or if a - * feature is enabled that is not compatible with - * this port or is unsupported. - * - * @see javax.xml.transform.Source - * @see javax.xml.soap.SOAPMessage - * @see WebServiceFeature - * - * @since JAX-WS 2.1 - **/ - public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Service.Mode mode, WebServiceFeature... features) - { - return delegate.createDispatch(portName, type, mode, features); - } - - /** - * Creates a <code>Dispatch</code> instance for use with objects of - * the users choosing. If there - * are any reference parameters in the - * <code>endpointReference</code>, then those reference - * parameters MUST appear as SOAP headers, indicating them to be - * reference parameters, on all messages sent to the endpoint. - * The <code>endpointReference's</code> address MUST be used - * for invocations on the endpoint. - * In the implementation of this method, the JAX-WS - * runtime system takes the responsibility of selecting a protocol - * binding (and a port) and configuring the dispatch accordingly from - * the WSDL associated with this <code>Service</code> instance or - * from the WSDL Metadata from the <code>endpointReference</code>. - * If this <code>Service</code> instance has a WSDL and - * the <code>endpointReference</code> - * also has a WSDL, then the WSDL from this instance will be used. - * If this <code>Service</code> instance does not have a WSDL and - * the <code>endpointReference</code> does have a WSDL, then the - * WSDL from the <code>endpointReference</code> will be used. - * <p> - * This method behaves the same as calling - * <pre> - * dispatch = service.createDispatch(portName, type, mode, features); - * </pre> - * where the <code>portName</code> is retrieved from the - * <code>wsaw:EndpointName</code> attribute of the <code>wsaw:ServiceName</code> - * element in the - * metadata of the <code>endpointReference</code>. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/">W... - WSDL 1.0 - * </a>. - * - * @param endpointReference The <code>EndpointReference</code> - * for the target service endpoint that will be invoked by the - * returned <code>Dispatch</code> object. - * @param type The class of object used to messages or message - * payloads. Implementations are required to support - * javax.xml.transform.Source and javax.xml.soap.SOAPMessage. - * @param mode Controls whether the created dispatch instance is message - * or payload oriented, i.e. whether the user will work with complete - * protocol messages or message payloads. E.g. when using the SOAP - * protocol, this parameter controls whether the user will work with - * SOAP messages or the contents of a SOAP body. Mode MUST be MESSAGE - * when type is SOAPMessage. - * @param features An array of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * - * @return Dispatch instance - * @throws WebServiceException - * <UL> - * <LI>If there is any missing WSDL metadata - * as required by this method. - * <li>If the <code>wsaw:ServiceName</code> element - * or the <code>wsaw:EndpointName</code> attribute - * is missing in the metdata of the - * <code>endpointReference</code>. - * <li>If the <code>wsaw:ServiceName</code> does not - * match the <code>serviceName</code> of this instance. - * <li>If the <code>wsaw:EndpointName</code> does not - * match a valid wsdl:Port in the WSDL metadata. - * <li>If any error in the creation of - * the <code>Dispatch</code> object. - * <li>if a feature is enabled that is not - * compatible with this port or is unsupported. - * </UL> - * - * @see javax.xml.transform.Source - * @see javax.xml.soap.SOAPMessage - * @see WebServiceFeature; - * - * @since JAX-WS 2.1 - **/ - public <T> Dispatch<T> createDispatch(EndpointReference endpointReference, Class<T> type, Service.Mode mode, WebServiceFeature... features) - { - return delegate.createDispatch(endpointReference, type, mode, features); - } - - /** * Creates a <code>Dispatch</code> instance for use with JAXB * generated objects. * @@ -495,115 +215,6 @@ } /** - * Creates a <code>Dispatch</code> instance for use with JAXB - * generated objects. - * - * @param portName Qualified name for the target service endpoint - * @param context The JAXB context used to marshall and unmarshall - * messages or message payloads. - * @param mode Controls whether the created dispatch instance is message - * or payload oriented, i.e. whether the user will work with complete - * protocol messages or message payloads. E.g. when using the SOAP - * protocol, this parameter controls whether the user will work with - * SOAP messages or the contents of a SOAP body. - * @param features A list of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * - * @return Dispatch instance. - * @throws WebServiceException If any error in the creation of - * the <code>Dispatch</code> object or if a - * feature is enabled that is not compatible with - * this port or is unsupported. - * - * @see javax.xml.bind.JAXBContext - * @see WebServiceFeature - * - * @since JAX-WS 2.1 - **/ - public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Service.Mode mode, WebServiceFeature... features) - { - return delegate.createDispatch(portName, context, mode, features); - } - - /** - * Creates a <code>Dispatch</code> instance for use with JAXB - * generated objects. If there - * are any reference parameters in the - * <code>endpointReference</code>, then those reference - * parameters MUST appear as SOAP headers, indicating them to be - * reference parameters, on all messages sent to the endpoint. - * The <code>endpointReference's</code> address MUST be used - * for invocations on the endpoint. - * In the implementation of this method, the JAX-WS - * runtime system takes the responsibility of selecting a protocol - * binding (and a port) and configuring the dispatch accordingly from - * the WSDL associated with this <code>Service</code> instance or - * from the WSDL Metadata from the <code>endpointReference</code>. - * If this <code>Service</code> instance has a WSDL and - * the <code>endpointReference</code> - * also has a WSDL, then the WSDL from this instance will be used. - * If this <code>Service</code> instance does not have a WSDL and - * the <code>endpointReference</code> does have a WSDL, then the - * WSDL from the <code>endpointReference</code> will be used. - * <p> - * This method behavies the same as calling - * <pre> - * dispatch = service.createDispatch(portName, context, mode, features); - * </pre> - * where the <code>portName</code> is retrieved from the - * <code>wsaw:EndpointName</code> attribute of the <code>wsaw:ServiceName</code> - * element in the - * metadata of the <code>endpointReference</code>. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/">W... - WSDL 1.0 - * </a>. - * - * @param endpointReference The <code>EndpointReference</code> - * for the target service endpoint that will be invoked by the - * returned <code>Dispatch</code> object. - * @param context The JAXB context used to marshall and unmarshall - * messages or message payloads. - * @param mode Controls whether the created dispatch instance is message - * or payload oriented, i.e. whether the user will work with complete - * protocol messages or message payloads. E.g. when using the SOAP - * protocol, this parameter controls whether the user will work with - * SOAP messages or the contents of a SOAP body. - * @param features An array of WebServiceFeatures to configure on the - * proxy. Supported features not in the <code>features - * </code> parameter will have their default values. - * - * @return Dispatch instance - * @throws WebServiceException - * @throws WebServiceException - * <UL> - * <li>If there is any missing WSDL metadata - * as required by this method. - * <li>If the <code>wsaw:ServiceName</code> element - * or the <code>wsaw:EndpointName</code> attribute - * is missing in the metdata of the - * <code>endpointReference</code>. - * <li>If the <code>wsaw:ServiceName</code> does not - * match the <code>serviceName</code> of this instance. - * <li>If the <code>wsaw:EndpointName</code> does not - * match a valid wsdl:Port in the WSDL metadata. - * <li>If any error in the creation of - * the <code>Dispatch</code> object. - * <li>if a feature is enabled that is not - * compatible with this port or is unsupported. - * </UL> - * - * @see javax.xml.bind.JAXBContext - * @see WebServiceFeature - * - * @since JAX-WS 2.1 - **/ - public Dispatch<Object> createDispatch(EndpointReference endpointReference, JAXBContext context, Service.Mode mode, WebServiceFeature... features) - { - return delegate.createDispatch(endpointReference, context, mode, features); - } - - /** * Gets the name of this service. * @return Qualified name of this service **/ Added: stack/native/trunk/src/main/java/javax/xml/ws/Service21.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Service21.java (rev 0) +++ stack/native/trunk/src/main/java/javax/xml/ws/Service21.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -0,0 +1,426 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.xml.ws; + +import javax.xml.namespace.QName; +import javax.xml.bind.JAXBContext; +import java.net.URL; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class Service21 extends Service +{ + + protected Service21(URL wsdlDocumentLocation, QName serviceName) + { + super(wsdlDocumentLocation, serviceName); + } + + /** + * Creates a <code>Dispatch</code> instance for use with objects of + * the users choosing. If there + * are any reference parameters in the + * <code>endpointReference</code>, then those reference + * parameters MUST appear as SOAP headers, indicating them to be + * reference parameters, on all messages sent to the endpoint. + * The <code>endpointReference's</code> address MUST be used + * for invocations on the endpoint. + * In the implementation of this method, the JAX-WS + * runtime system takes the responsibility of selecting a protocol + * binding (and a port) and configuring the dispatch accordingly from + * the WSDL associated with this <code>Service</code> instance or + * from the WSDL Metadata from the <code>endpointReference</code>. + * If this <code>Service</code> instance has a WSDL and + * the <code>endpointReference</code> + * also has a WSDL, then the WSDL from this instance will be used. + * If this <code>Service</code> instance does not have a WSDL and + * the <code>endpointReference</code> does have a WSDL, then the + * WSDL from the <code>endpointReference</code> will be used. + * <p> + * This method behaves the same as calling + * <pre> + * dispatch = service.createDispatch(portName, type, mode, features); + * </pre> + * where the <code>portName</code> is retrieved from the + * <code>wsaw:EndpointName</code> attribute of the <code>wsaw:ServiceName</code> + * element in the + * metadata of the <code>endpointReference</code>. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/">W... - WSDL 1.0 + * </a>. + * + * @param endpointReference The <code>EndpointReference</code> + * for the target service endpoint that will be invoked by the + * returned <code>Dispatch</code> object. + * @param type The class of object used to messages or message + * payloads. Implementations are required to support + * javax.xml.transform.Source and javax.xml.soap.SOAPMessage. + * @param mode Controls whether the created dispatch instance is message + * or payload oriented, i.e. whether the user will work with complete + * protocol messages or message payloads. E.g. when using the SOAP + * protocol, this parameter controls whether the user will work with + * SOAP messages or the contents of a SOAP body. Mode MUST be MESSAGE + * when type is SOAPMessage. + * @param features An array of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * + * @return Dispatch instance + * @throws WebServiceException + * <UL> + * <LI>If there is any missing WSDL metadata + * as required by this method. + * <li>If the <code>wsaw:ServiceName</code> element + * or the <code>wsaw:EndpointName</code> attribute + * is missing in the metdata of the + * <code>endpointReference</code>. + * <li>If the <code>wsaw:ServiceName</code> does not + * match the <code>serviceName</code> of this instance. + * <li>If the <code>wsaw:EndpointName</code> does not + * match a valid wsdl:Port in the WSDL metadata. + * <li>If any error in the creation of + * the <code>Dispatch</code> object. + * <li>if a feature is enabled that is not + * compatible with this port or is unsupported. + * </UL> + * + * @see javax.xml.transform.Source + * @see javax.xml.soap.SOAPMessage + * @see WebServiceFeature; + * + * @since JAX-WS 2.1 + **/ + public <T> Dispatch<T> createDispatch(EndpointReference endpointReference, Class<T> type, Service.Mode mode, WebServiceFeature... features) + { + return delegate.createDispatch(endpointReference, type, mode, features); + } + + /** + * Creates a <code>Dispatch</code> instance for use with JAXB + * generated objects. If there + * are any reference parameters in the + * <code>endpointReference</code>, then those reference + * parameters MUST appear as SOAP headers, indicating them to be + * reference parameters, on all messages sent to the endpoint. + * The <code>endpointReference's</code> address MUST be used + * for invocations on the endpoint. + * In the implementation of this method, the JAX-WS + * runtime system takes the responsibility of selecting a protocol + * binding (and a port) and configuring the dispatch accordingly from + * the WSDL associated with this <code>Service</code> instance or + * from the WSDL Metadata from the <code>endpointReference</code>. + * If this <code>Service</code> instance has a WSDL and + * the <code>endpointReference</code> + * also has a WSDL, then the WSDL from this instance will be used. + * If this <code>Service</code> instance does not have a WSDL and + * the <code>endpointReference</code> does have a WSDL, then the + * WSDL from the <code>endpointReference</code> will be used. + * <p> + * This method behavies the same as calling + * <pre> + * dispatch = service.createDispatch(portName, context, mode, features); + * </pre> + * where the <code>portName</code> is retrieved from the + * <code>wsaw:EndpointName</code> attribute of the <code>wsaw:ServiceName</code> + * element in the + * metadata of the <code>endpointReference</code>. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/">W... - WSDL 1.0 + * </a>. + * + * @param endpointReference The <code>EndpointReference</code> + * for the target service endpoint that will be invoked by the + * returned <code>Dispatch</code> object. + * @param context The JAXB context used to marshall and unmarshall + * messages or message payloads. + * @param mode Controls whether the created dispatch instance is message + * or payload oriented, i.e. whether the user will work with complete + * protocol messages or message payloads. E.g. when using the SOAP + * protocol, this parameter controls whether the user will work with + * SOAP messages or the contents of a SOAP body. + * @param features An array of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * + * @return Dispatch instance + * @throws WebServiceException + * @throws WebServiceException + * <UL> + * <li>If there is any missing WSDL metadata + * as required by this method. + * <li>If the <code>wsaw:ServiceName</code> element + * or the <code>wsaw:EndpointName</code> attribute + * is missing in the metdata of the + * <code>endpointReference</code>. + * <li>If the <code>wsaw:ServiceName</code> does not + * match the <code>serviceName</code> of this instance. + * <li>If the <code>wsaw:EndpointName</code> does not + * match a valid wsdl:Port in the WSDL metadata. + * <li>If any error in the creation of + * the <code>Dispatch</code> object. + * <li>if a feature is enabled that is not + * compatible with this port or is unsupported. + * </UL> + * + * @see javax.xml.bind.JAXBContext + * @see WebServiceFeature + * + * @since JAX-WS 2.1 + **/ + public Dispatch<Object> createDispatch(EndpointReference endpointReference, JAXBContext context, Service.Mode mode, WebServiceFeature... features) + { + return delegate.createDispatch(endpointReference, context, mode, features); + } + + /** + * Creates a <code>Dispatch</code> instance for use with objects of + * the users choosing. + * + * @param portName Qualified name for the target service endpoint + * @param type The class of object used for messages or message + * payloads. Implementations are required to support + * javax.xml.transform.Source and javax.xml.soap.SOAPMessage. + * @param mode Controls whether the created dispatch instance is message + * or payload oriented, i.e. whether the user will work with complete + * protocol messages or message payloads. E.g. when using the SOAP + * protocol, this parameter controls whether the user will work with + * SOAP messages or the contents of a SOAP body. Mode MUST be MESSAGE + * when type is SOAPMessage. + * @param features A list of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * + * @return Dispatch instance. + * @throws WebServiceException If any error in the creation of + * the <code>Dispatch</code> object or if a + * feature is enabled that is not compatible with + * this port or is unsupported. + * + * @see javax.xml.transform.Source + * @see javax.xml.soap.SOAPMessage + * @see WebServiceFeature + * + * @since JAX-WS 2.1 + **/ + public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Service.Mode mode, WebServiceFeature... features) + { + return delegate.createDispatch(portName, type, mode, features); + } + + /** + * Creates a <code>Dispatch</code> instance for use with JAXB + * generated objects. + * + * @param portName Qualified name for the target service endpoint + * @param context The JAXB context used to marshall and unmarshall + * messages or message payloads. + * @param mode Controls whether the created dispatch instance is message + * or payload oriented, i.e. whether the user will work with complete + * protocol messages or message payloads. E.g. when using the SOAP + * protocol, this parameter controls whether the user will work with + * SOAP messages or the contents of a SOAP body. + * @param features A list of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * + * @return Dispatch instance. + * @throws WebServiceException If any error in the creation of + * the <code>Dispatch</code> object or if a + * feature is enabled that is not compatible with + * this port or is unsupported. + * + * @see javax.xml.bind.JAXBContext + * @see WebServiceFeature + * + * @since JAX-WS 2.1 + **/ + public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Service.Mode mode, WebServiceFeature... features) + { + return delegate.createDispatch(portName, context, mode, features); + } + + + /** + * The getPort method returns a proxy. The parameter + * <code>serviceEndpointInterface</code> specifies the service + * endpoint interface that is supported by the returned proxy. + * In the implementation of this method, the JAX-WS + * runtime system takes the responsibility of selecting a protocol + * binding (and a port) and configuring the proxy accordingly. + * The returned proxy should not be reconfigured by the client. + * + * @param serviceEndpointInterface Service endpoint interface. + * @param features A list of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * @return Object instance that supports the + * specified service endpoint interface. + * @throws WebServiceException + * <UL> + * <LI>If there is an error during creation + * of the proxy. + * <LI>If there is any missing WSDL metadata + * as required by this method. + * <LI>If an illegal + * <code>serviceEndpointInterface</code> + * is specified. + * <LI>If a feature is enabled that is not compatible + * with this port or is unsupported. + * </UL> + * + * @see WebServiceFeature + * + * @since JAX-WS 2.1 + **/ + public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) + { + return delegate.getPort(serviceEndpointInterface, features); + } + + /** + * The getPort method returns a proxy. + * The parameter <code>endpointReference</code> specifies the + * endpoint that will be invoked by the returned proxy. If there + * are any reference parameters in the + * <code>endpointReference</code>, then those reference + * parameters MUST appear as SOAP headers, indicating them to be + * reference parameters, on all messages sent to the endpoint. + * The <code>endpointReference's</code> address MUST be used + * for invocations on the endpoint. + * The parameter <code>serviceEndpointInterface</code> specifies + * the service endpoint interface that is supported by the + * returned proxy. + * In the implementation of this method, the JAX-WS + * runtime system takes the responsibility of selecting a protocol + * binding (and a port) and configuring the proxy accordingly from + * the WSDL associated with this <code>Service</code> instance or + * from the WSDL Metadata from the <code>endpointReference</code>. + * If this <code>Service</code> instance has a WSDL and + * the <code>endpointReference</code> + * also has a WSDL, then the WSDL from this instance will be used. + * If this <code>Service</code> instance does not have a WSDL and + * the <code>endpointReference</code> does have a WSDL, then the + * WSDL from the <code>endpointReference</code> will be used. + * The returned proxy should not be reconfigured by the client. + * If this <code>Service</code> instance has a known proxy + * port that matches the information contained in + * the WSDL, + * then that proxy is returned, otherwise a WebServiceException + * is thrown. + * <p> + * Calling this method has the same behavior as the following + * <pre> + * port = service.getPort(portName, serviceEndpointInterface); + * </pre> + * where the <code>portName</code> is retrieved from the + * <code>wsaw:EndpontName</code> attribute of the + * <code>wsaw:ServiceName</code> element in the + * metadata of the <code>endpointReference</code> or from the + * <code>serviceEndpointInterface</code> and the WSDL + * associated with this <code>Service</code> instance. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/">W... - WSDL 1.0 + * </a>. + * + * @param endpointReference The <code>EndpointReference</code> + * for the target service endpoint that will be invoked by the + * returned proxy. + * @param serviceEndpointInterface Service endpoint interface. + * @param features An array of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * @return Object Proxy instance that supports the + * specified service endpoint interface. + * @throws WebServiceException + * <UL> + * <LI>If there is an error during creation + * of the proxy. + * <LI>If there is any missing WSDL metadata + * as required by this method. + * <LI>If the <code>wsaw:EndpointName</code> is + * missing from the <code>endpointReference</code> + * or does not match a wsdl:Port + * in the WSDL metadata. + * <LI>If the <code>wsaw:ServiceName</code> in the + * <code>endpointReference</code> metadata does not + * match the <code>serviceName</code> of this + * <code>Service</code> instance. + * <LI>If an invalid + * <code>endpointReference</code> + * is specified. + * <LI>If an invalid + * <code>serviceEndpointInterface</code> + * is specified. + * <LI>If a feature is enabled that is not compatible + * with this port or is unsupported. + * </UL> + * + * @since JAX-WS 2.1 + **/ + public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features) + { + return delegate.getPort(endpointReference, serviceEndpointInterface, features); + } + + /** + * The getPort method returns a proxy. A service client + * uses this proxy to invoke operations on the target + * service endpoint. The <code>serviceEndpointInterface</code> + * specifies the service endpoint interface that is supported by + * the created dynamic proxy instance. + * + * @param portName Qualified name of the service endpoint in + * the WSDL service description. + * @param serviceEndpointInterface Service endpoint interface + * supported by the dynamic proxy instance. + * @param features A list of WebServiceFeatures to configure on the + * proxy. Supported features not in the <code>features + * </code> parameter will have their default values. + * @return Object Proxy instance that + * supports the specified service endpoint + * interface. + * @throws WebServiceException This exception is thrown in the + * following cases: + * <UL> + * <LI>If there is an error in creation of + * the proxy. + * <LI>If there is any missing WSDL metadata + * as required by this method. + * <LI>If an illegal + * <code>serviceEndpointInterface</code> + * or <code>portName</code> is specified. + * <LI>If a feature is enabled that is not compatible + * with this port or is unsupported. + * </UL> + * @see java.lang.reflect.Proxy + * @see java.lang.reflect.InvocationHandler + * @see WebServiceFeature + * + * @since JAX-WS 2.1 + **/ + public <T> T getPort(QName portName, Class<T> serviceEndpointInterface, WebServiceFeature... features) + { + return delegate.getPort(portName, serviceEndpointInterface, features); + } +} Property changes on: stack/native/trunk/src/main/java/javax/xml/ws/Service21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -23,13 +23,9 @@ // $Id$ +import javax.xml.ws.handler.MessageContext; import java.security.Principal; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.wsaddressing.W3CEndpointReference; - -import org.w3c.dom.Element; - /** * A <code>WebServiceContext</code> makes it possible for * a web service endpoint implementation class to access @@ -98,76 +94,4 @@ **/ public boolean isUserInRole(String role); - /** - * Returns the <code>WEndpointReference</code> for this - * endpoint. - * <p> - * If the Binding for this <code>bindingProvider</code> is - * either SOAP1.1/HTTP or SOAP1.2/HTTP, then a - * <code>W3CEndpointReference</code> MUST be returned. - * If the returned <code>EndpointReference</code> is a - * <code>W3CEndpointReference</code> it MUST contain - * the <code>wsaw:ServiceName</code> element and the - * <code>wsaw:EndpointName</code> attribute on the - * <code>wsaw:ServiceName</code>. It SHOULD contain - * the embedded WSDL in the <code>wsa:Metadata</code> element - * if there is an associated WSDL. The - * <code>wsaw:InterfaceName</code> MAY also be present. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> - * WS-Addressing - WSDL 1.0</a>. - * - * @param referenceParameters Reference parameters to be associated with the - * returned <code>EndpointReference</code> instance. - * @return EndpointReference of the endpoint associated with this - * <code>WebServiceContext</code>. - * If the returned <code>EndpointReference</code> is of type - * <code>W3CEndpointReference</code> then it MUST contain the - * the specified <code>referenceParameters</code>. - * - * @throws IllegalStateException This exception is thrown - * if the method is called while no request is - * being serviced. - * - * @see W3CEndpointReference - * - * @since JAX-WS 2.1 - */ - public EndpointReference getEndpointReference(Element... referenceParameters); - - /** - * Returns the <code>EndpointReference</code> associated with - * this endpoint. - * <p> - * If the returned <code>EndpointReference</code> is a - * <code>W3CEndpointReference</code> it MUST contain - * the <code>wsaw:ServiceName</code> element and the - * <code>wsaw:EndpointName</code> attribute on the - * <code>wsaw:ServiceName</code>. It SHOULD contain - * the embedded WSDL in the <code>wsa:Metadata</code> element - * if there is an associated WSDL. The - * <code>wsaw:InterfaceName</code> MAY also be present. - * <br> - * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> - * WS-Addressing - WSDL 1.0</a>. - * - * @param clazz The type of <code>EndpointReference</code> that - * MUST be returned. - * @param referenceParameters Reference parameters to be associated with the - * returned <code>EndpointReference</code> instance. - * @return EndpointReference of type <code>clazz</code> of the endpoint - * associated with this <code>WebServiceContext</code> instance. - * If the returned <code>EndpointReference</code> is of type - * <code>W3CEndpointReference</code> then it MUST contain the - * the specified <code>referenceParameters</code>. - * - * @throws IllegalStateException This exception is thrown - * if the method is called while no request is - * being serviced. - * @throws WebServiceException If the <code>clazz</code> type of - * <code>EndpointReference</code> is not supported. - * - * @since JAX-WS 2.1 - **/ - public abstract <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters); } Added: stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext21.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext21.java (rev 0) +++ stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext21.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.xml.ws; + +import org.w3c.dom.Element; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public interface WebServiceContext21 extends WebServiceContext +{ + /** + * Returns the <code>WEndpointReference</code> for this + * endpoint. + * <p> + * If the Binding for this <code>bindingProvider</code> is + * either SOAP1.1/HTTP or SOAP1.2/HTTP, then a + * <code>W3CEndpointReference</code> MUST be returned. + * If the returned <code>EndpointReference</code> is a + * <code>W3CEndpointReference</code> it MUST contain + * the <code>wsaw:ServiceName</code> element and the + * <code>wsaw:EndpointName</code> attribute on the + * <code>wsaw:ServiceName</code>. It SHOULD contain + * the embedded WSDL in the <code>wsa:Metadata</code> element + * if there is an associated WSDL. The + * <code>wsaw:InterfaceName</code> MAY also be present. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> + * WS-Addressing - WSDL 1.0</a>. + * + * @param referenceParameters Reference parameters to be associated with the + * returned <code>EndpointReference</code> instance. + * @return EndpointReference of the endpoint associated with this + * <code>WebServiceContext</code>. + * If the returned <code>EndpointReference</code> is of type + * <code>W3CEndpointReference</code> then it MUST contain the + * the specified <code>referenceParameters</code>. + * + * @throws IllegalStateException This exception is thrown + * if the method is called while no request is + * being serviced. + * + * @see javax.xml.ws.wsaddressing.W3CEndpointReference + * + * @since JAX-WS 2.1 + */ + public EndpointReference getEndpointReference(Element... referenceParameters); + + /** + * Returns the <code>EndpointReference</code> associated with + * this endpoint. + * <p> + * If the returned <code>EndpointReference</code> is a + * <code>W3CEndpointReference</code> it MUST contain + * the <code>wsaw:ServiceName</code> element and the + * <code>wsaw:EndpointName</code> attribute on the + * <code>wsaw:ServiceName</code>. It SHOULD contain + * the embedded WSDL in the <code>wsa:Metadata</code> element + * if there is an associated WSDL. The + * <code>wsaw:InterfaceName</code> MAY also be present. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> + * WS-Addressing - WSDL 1.0</a>. + * + * @param clazz The type of <code>EndpointReference</code> that + * MUST be returned. + * @param referenceParameters Reference parameters to be associated with the + * returned <code>EndpointReference</code> instance. + * @return EndpointReference of type <code>clazz</code> of the endpoint + * associated with this <code>WebServiceContext</code> instance. + * If the returned <code>EndpointReference</code> is of type + * <code>W3CEndpointReference</code> then it MUST contain the + * the specified <code>referenceParameters</code>. + * + * @throws IllegalStateException This exception is thrown + * if the method is called while no request is + * being serviced. + * @throws WebServiceException If the <code>clazz</code> type of + * <code>EndpointReference</code> is not supported. + * + * @since JAX-WS 2.1 + **/ + public abstract <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters); +} Property changes on: stack/native/trunk/src/main/java/javax/xml/ws/WebServiceContext21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/javax/xml/ws/http/HTTPBinding.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/http/HTTPBinding.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/http/HTTPBinding.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -24,13 +24,15 @@ // $Id$ import javax.xml.ws.Binding; +import javax.xml.ws.Binding21; /** The <code>HTTPBinding</code> interface is an * abstraction for the XML/HTTP binding. * * @since JAX-WS 2.0 **/ -public interface HTTPBinding extends Binding { +public interface HTTPBinding extends Binding21 +{ /** * A constant representing the identity of the XML/HTTP binding. Modified: stack/native/trunk/src/main/java/javax/xml/ws/soap/SOAPBinding.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/soap/SOAPBinding.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/javax/xml/ws/soap/SOAPBinding.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -29,13 +29,14 @@ import javax.xml.soap.SOAPFactory; import javax.xml.ws.Binding; import javax.xml.ws.WebServiceException; +import javax.xml.ws.Binding21; /** The <code>SOAPBinding</code> interface is an abstraction for * the SOAP binding. * * @since JAX-WS 2.0 **/ -public interface SOAPBinding extends Binding +public interface SOAPBinding extends Binding21 { /** * A constant representing the identity of the SOAP 1.1 over HTTP binding. Added: stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java (rev 0) +++ stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.xml.ws.wsaddressing; + +import javax.xml.ws.BindingProvider; +import javax.xml.ws.EndpointReference; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public interface BindingProvider21 extends BindingProvider +{ + /** + * Returns the <code>EndpointReference</code> associated with + * this <code>BindingProvider</code> instance. + * <p> + * If the Binding for this <code>bindingProvider</code> is + * either SOAP1.1/HTTP or SOAP1.2/HTTP, then a + * <code>W3CEndpointReference</code> MUST be returned. + * If the returned <code>EndpointReference</code> is a + * <code>W3CEndpointReference</code> it MUST contain + * the <code>wsaw:ServiceName</code> element and the + * <code>wsaw:EndpointName</code> attribute on the + * <code>wsaw:ServiceName</code>. It SHOULD contain + * the embedded WSDL in the <code>wsa:Metadata</code> element + * if there is an associated WSDL. The + * <code>wsaw:InterfaceName</code> MAY also be present. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> + * WS-Addressing - WSDL 1.0</a>. + * + * @return EndpointReference of the target endpoint associated with this + * <code>BindingProvider</code> instance. + * + * @throws java.lang.UnsupportedOperationException If this + * <code>BindingProvider</code> uses the XML/HTTP binding. + * + * @see W3CEndpointReference + * + * @since JAX-WS 2.1 + */ + public EndpointReference getEndpointReference(); + + /** + * Returns the <code>EndpointReference</code> associated with + * this <code>BindingProvider</code> instance. The instance + * returned will be of type <code>clazz</code>. + * <p> + * If the returned <code>EndpointReference</code> is a + * <code>W3CEndpointReference</code> it MUST contain + * the <code>wsaw:ServiceName</code> element and the + * <code>wsaw:EndpointName</code> attribute on the + * <code>wsaw:ServiceName</code>. It SHOULD contain + * the embedded WSDL in the <code>wsa:Metadata</code> element + * if there is an associated WSDL. The + * <code>wsaw:InterfaceName</code> MAY also be present. + * <br> + * See <a href="http://www.w3.org/TR/2006/CR-ws-addr-wsdl-20060529/"> + * WS-Addressing - WSDL 1.0</a>. + * + * @param clazz Specifies the type of <code>EndpointReference</code> + * that MUST be returned. + + * @return EndpointReference of the target endpoint associated with this + * <code>BindingProvider</code> instance. MUST be of type + * <code>clazz</code>. + + * @throws javax.xml.ws.WebServiceException If the Class <code>clazz</code> + * is not supported by this implementation. + * @throws java.lang.UnsupportedOperationException If this + * <code>BindingProvider</code> uses the XML/HTTP binding. + * + * @since JAX-WS 2.1 + */ + public <T extends EndpointReference> T getEndpointReference(Class<T> clazz); +} Property changes on: stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -24,6 +24,7 @@ import java.util.List; import javax.xml.ws.Binding; +import javax.xml.ws.Binding21; import javax.xml.ws.handler.Handler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -36,7 +37,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 04-Jul-2006 */ -public interface BindingExt extends Binding +public interface BindingExt extends Binding21 { List<Handler> getHandlerChain(HandlerType handlerType); Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -30,6 +30,7 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.EndpointReference; import javax.xml.ws.WebServiceException; +import javax.xml.ws.wsaddressing.BindingProvider21; import javax.xml.ws.Service.Mode; import javax.xml.ws.http.HTTPBinding; @@ -45,7 +46,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 04-Jul-2006 */ -public class BindingProviderImpl extends CommonBindingProvider implements BindingProvider +public class BindingProviderImpl extends CommonBindingProvider implements BindingProvider21 { private Map<String, Object> requestContext = new HashMap<String, Object>(); private Map<String, Object> responseContext = new HashMap<String, Object>(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -37,6 +37,7 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.EndpointReference; import javax.xml.ws.WebServiceException; +import javax.xml.ws.wsaddressing.BindingProvider21; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.handler.MessageContext; @@ -73,7 +74,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 04-Jul-2006 */ -public class ClientImpl extends CommonClient implements BindingProvider, Configurable +public class ClientImpl extends CommonClient implements BindingProvider21, Configurable { // provide logging private static Logger log = Logger.getLogger(ClientImpl.class); Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -39,6 +39,7 @@ import javax.xml.ws.EndpointReference; import javax.xml.ws.Response; import javax.xml.ws.WebServiceException; +import javax.xml.ws.Binding21; import javax.xml.ws.Service.Mode; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPFaultException; @@ -121,7 +122,7 @@ // with a quoted empty string value, if in the corresponding WSDL description, // the soapAction attribute of soapbind:operation is either not present, or // present with an empty string as its value. - String bindingID = bindingProvider.getBinding().getBindingID(); + String bindingID = ((Binding21)bindingProvider.getBinding()).getBindingID(); if (bindingID.indexOf("soap") > 0) { String soapAction = null; @@ -144,7 +145,7 @@ private RemotingConnection getRemotingConnection() { - String bindingID = bindingProvider.getBinding().getBindingID(); + String bindingID = ((Binding21)bindingProvider.getBinding()).getBindingID(); if (EndpointMetaData.SUPPORTED_BINDINGS.contains(bindingID) == false) throw new IllegalStateException("Unsupported binding: " + bindingID); @@ -252,7 +253,7 @@ if (obj == null) throw new SOAPFaultException("Request object cannot be null"); - String bindingID = bindingProvider.getBinding().getBindingID(); + String bindingID = ((Binding21)bindingProvider.getBinding()).getBindingID(); if (EndpointMetaData.SUPPORTED_BINDINGS.contains(bindingID) == false) throw new IllegalStateException("Unsupported binding: " + bindingID); @@ -274,7 +275,7 @@ private Object getReturnObject(MessageAbstraction resMsg) { - String bindingID = bindingProvider.getBinding().getBindingID(); + String bindingID = ((Binding21)bindingProvider.getBinding()).getBindingID(); if (EndpointMetaData.SUPPORTED_BINDINGS.contains(bindingID) == false) throw new IllegalStateException("Unsupported binding: " + bindingID); Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -23,40 +23,37 @@ // $Id$ -import java.net.URI; -import java.net.URISyntaxException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.concurrent.Executor; - -import javax.xml.transform.Source; -import javax.xml.ws.Binding; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Endpoint; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServicePermission; - import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.http.HttpContext; -import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer; import org.jboss.wsf.spi.http.HttpServerFactory; -import org.jboss.wsf.spi.management.ServerConfigFactory; import org.w3c.dom.Element; +import javax.xml.transform.Source; +import javax.xml.ws.Binding; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Endpoint21; +import javax.xml.ws.EndpointReference; +import javax.xml.ws.WebServicePermission; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.concurrent.Executor; + /** * A Web service endpoint implementation. * * @author Thomas.Diesler(a)jboss.com * @since 07-Jul-2006 */ -public class EndpointImpl extends Endpoint +public class EndpointImpl extends Endpoint21 { // provide logging private final Logger log = Logger.getLogger(EndpointImpl.class); @@ -101,7 +98,7 @@ * implementation using some default configuration. In order to get more control over the server configuration, * please use the javax.xml.ws.Endpoint#publish(Object) method instead. * - * @param URI specifying the address to use. The address must be compatible with the binding specified at the time the endpoint was created. + * @param address specifying the address to use. The address must be compatible with the binding specified at the time the endpoint was created. */ @Override public void publish(String address) @@ -139,7 +136,7 @@ * A server context encapsulates the server infrastructure and addressing information for a particular transport. * For a call to this method to succeed, the server context passed as an argument to it must be compatible with the endpoint's binding. * - * @param serverContext An object representing a server context to be used for publishing the endpoint. + * @param context An object representing a server context to be used for publishing the endpoint. */ @Override public void publish(Object context) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventingService.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventingService.java 2007-09-26 10:13:10 UTC (rev 4629) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventingService.java 2007-09-26 10:14:18 UTC (rev 4630) @@ -28,6 +28,7 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.Service21; /** @@ -38,7 +39,7 @@ */ @WebServiceClient(name = "EventingService", targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing", wsdlLocation = "wind.wsdl") public class EventingService - extends Service + extends Service21 { private final static URL WSDL_LOCATION;