[jbossws-commits] JBossWS SVN: r5551 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/wsrm and 12 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-01-30 14:01:45 -0500 (Wed, 30 Jan 2008) New Revision: 5551 Removed: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMProviderConfig.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM10PolicyAssertionDeployer.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM11PolicyAssertionDeployer.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml Log: [JBWS-1977] almost fixed 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 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -23,6 +23,7 @@ // $Id$ +import java.net.URI; import java.rmi.RemoteException; import java.util.HashMap; import java.util.HashSet; @@ -506,7 +507,7 @@ // WS-RM support // /////////////////// @SuppressWarnings("unchecked") - public void createSequence(boolean addressableClient) throws RMException + public void createSequence() throws RMException { if (this.wsrmSequence != null) throw new IllegalStateException("Sequence already registered with proxy instance"); @@ -514,14 +515,15 @@ try { // set up addressing data - RMClientSequence candidateSequence = new RMClientSequence(addressableClient, getEndpointMetaData().getConfig().getRMMetaData()); + RMClientSequence candidateSequence = new RMClientSequence(getEndpointMetaData().getConfig().getRMMetaData()); String address = getEndpointMetaData().getEndpointAddress(); String action = RMAddressingConstants.CREATE_SEQUENCE_WSA_ACTION; AddressingProperties addressingProps = null; - if (addressableClient) + URI backPort = candidateSequence.getBackPort(); + if (backPort != null) { addressingProps = AddressingClientUtil.createDefaultProps(action, address); - addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(candidateSequence.getBackPort())); + addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(backPort)); } else { Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -83,38 +83,39 @@ private AtomicInteger countOfUnassignedMessagesAvailable = new AtomicInteger(); private static final String ANONYMOUS_URI = AddressingBuilder.getAddressingBuilder().newAddressingConstants().getAnonymousURI(); - public RMClientSequence(boolean addrType, RMConfig wsrmConfig) + public RMClientSequence(RMConfig wsrmConfig) { super(); if (wsrmConfig == null) throw new RMException("WS-RM configuration missing"); - if (wsrmConfig.getBackPortsServer() == null) - throw new RMException("WS-RM backports server configuration missing"); - this.addressableClient = addrType; this.wsrmConfig = wsrmConfig; - try + this.addressableClient = wsrmConfig.getBackPortsServer() != null; + if (this.addressableClient) { - String host = wsrmConfig.getBackPortsServer().getHost(); - if (host == null) + try { - host = InetAddress.getLocalHost().getCanonicalHostName(); - logger.debug("Backports server configuration omits host configuration - using autodetected " + host); - } - String port = wsrmConfig.getBackPortsServer().getPort(); - String path = PATH_PREFIX + UUIDGenerator.generateRandomUUIDString(); - this.backPort = new URI("http://" + host + ":" + port + path); + String host = wsrmConfig.getBackPortsServer().getHost(); + if (host == null) + { + host = InetAddress.getLocalHost().getCanonicalHostName(); + logger.debug("Backports server configuration omits host configuration - using autodetected " + host); + } + String port = wsrmConfig.getBackPortsServer().getPort(); + String path = PATH_PREFIX + UUIDGenerator.generateRandomUUIDString(); + this.backPort = new URI("http://" + host + ":" + port + path); + } + catch (URISyntaxException use) + { + logger.warn(use); + throw new RMException(use.getMessage(), use); + } + catch (UnknownHostException uhe) + { + logger.warn(uhe); + throw new RMException(uhe.getMessage(), uhe); + } } - catch (URISyntaxException use) - { - logger.warn(use); - throw new RMException(use.getMessage(), use); - } - catch (UnknownHostException uhe) - { - logger.warn(uhe); - throw new RMException(uhe.getMessage(), uhe); - } } public void unassignedMessageReceived() Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -27,8 +27,11 @@ * <p><blockquote><pre> * boolean addressableClient = true; * SEI sei = (SEI)service.getPort(SEI.class) - * ((RMProvider)sei).createSequence(addressableClient); + * sei.callMethod1(); + * sei.callMethod2(); * ... + * ((RMProvider)sei).closeSequence(); + * ((RMProvider)sei).createSequence(); * sei.callMethod1(); * sei.callMethod2(); * ... @@ -43,10 +46,9 @@ { /** * Creates new WS-RM sequence and associates it with service proxy - * @param addressableClient * @throws RMException if something went wrong */ - void createSequence(boolean addressableClient); + void createSequence(); /** * Close the sequence associated with service proxy Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -24,8 +24,6 @@ import java.util.List; import java.util.LinkedList; -import org.jboss.ws.extensions.wsrm.spi.RMProvider; - /** * Reliable messaging configuration metadata * @@ -35,7 +33,6 @@ { private RMDeliveryAssuranceConfig deliveryAssurance; - private RMProviderConfig provider; private RMBackPortsServerConfig backportsServer; private RMMessageRetransmissionConfig messageRetransmission; private List<RMPortConfig> ports = new LinkedList<RMPortConfig>(); @@ -70,23 +67,6 @@ return this.backportsServer; } - public final void setProvider(RMProviderConfig provider) - { - if (provider.getSpecVersion().equals(RMProvider.get().getNamespaceURI())) - { - this.provider = provider; - } - else - { - throw new IllegalArgumentException("RM provider namespace mismatch"); - } - } - - public final RMProviderConfig getProvider() - { - return this.provider; - } - public final List<RMPortConfig> getPorts() { return this.ports; Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMProviderConfig.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMProviderConfig.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMProviderConfig.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -1,47 +0,0 @@ -/* - * 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 org.jboss.ws.extensions.wsrm.config; - -/** - * Reliable messaging provider metadata - * - * @author richard.opalka(a)jboss.com - */ -public final class RMProviderConfig -{ - - private String specVersion; - - public final void setSpecVersion(String specVersion) - { - if (specVersion == null) - throw new IllegalArgumentException(); - - this.specVersion = specVersion; - } - - public final String getSpecVersion() - { - return this.specVersion; - } - -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM10PolicyAssertionDeployer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM10PolicyAssertionDeployer.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM10PolicyAssertionDeployer.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -27,16 +27,14 @@ import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; -import org.jboss.ws.extensions.wsrm.config.RMProviderConfig; +import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; /** - * TODO: Add comment + * Reliable messaging 1.1 policy deployer * * @author richard.opalka(a)jboss.com - * - * @since Jan 29, 2008 */ public final class RM10PolicyAssertionDeployer implements AssertionDeployer { @@ -91,9 +89,10 @@ // set up port WSRMP metadata rmMD.getPorts().add(portMD); - RMProviderConfig providerMD = new RMProviderConfig(); - providerMD.setSpecVersion(WSRM_NS); - rmMD.setProvider(providerMD); + if (!WSRM_NS.equals(RMProvider.get().getNamespaceURI())) + { + throw new IllegalArgumentException("RM provider namespace mismatch"); + } } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM11PolicyAssertionDeployer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM11PolicyAssertionDeployer.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/RM11PolicyAssertionDeployer.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -35,12 +35,12 @@ import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; -import org.jboss.ws.extensions.wsrm.config.RMProviderConfig; +import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; /** - * Reliable messaging policy deployer + * Reliable messaging 1.1 policy deployer * * @author richard.opalka(a)jboss.com */ @@ -103,9 +103,10 @@ // set up port WSRMP metadata rmMD.getPorts().add(portMD); - RMProviderConfig providerMD = new RMProviderConfig(); - providerMD.setSpecVersion(WSRM_NS); - rmMD.setProvider(providerMD); + if (!WSRM_NS.equals(RMProvider.get().getNamespaceURI())) + { + throw new IllegalArgumentException("RM provider namespace mismatch"); + } } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -41,7 +41,6 @@ import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; -import org.jboss.ws.extensions.wsrm.config.RMProviderConfig; /** * ObjectModelFactory for JAXRPC configurations. @@ -189,22 +188,6 @@ wsrmConfig.setBackPortsServer(backportsServer); return backportsServer; } - if (localName.equals("provider")) - { - String specVersion = null; - for (int i = 0; i < countOfAttributes; i++) - { - if (attrs.getLocalName(i).equals("specVersion")) - { - specVersion = attrs.getValue(i); - break; - } - } - RMProviderConfig provider = new RMProviderConfig(); - provider.setSpecVersion(specVersion); - wsrmConfig.setProvider(provider); - return provider; - } if (localName.equals("port")) { String portName = null; Modified: stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd =================================================================== --- stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2008-01-30 19:01:45 UTC (rev 5551) @@ -75,7 +75,7 @@ <xsd:annotation> <xsd:documentation> Backports server configuration to be used for addressable clients. - Users must always configure backports server on client machines. + If element is not present in client configuration then client is anonymous. </xsd:documentation> </xsd:annotation> </xsd:element> @@ -86,13 +86,6 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="provider" type="tns:providerType" minOccurs="0"> - <xsd:annotation> - <xsd:documentation> - WS-RM specification version to be used for reliable messaging. - </xsd:documentation> - </xsd:annotation> - </xsd:element> <xsd:element name="port" type="tns:portType" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:documentation> @@ -165,21 +158,6 @@ </xsd:annotation> </xsd:attribute> </xsd:complexType> - <xsd:complexType name="providerType"> - <xsd:attribute name="specVersion" use="required"> - <xsd:annotation> - <xsd:documentation> - WS-RM spec. version to be used for reliable messaging. - </xsd:documentation> - </xsd:annotation> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="http://docs.oasis-open.org/ws-rx/wsrm/200702"/> - <xsd:enumeration value="http://schemas.xmlsoap.org/ws/2005/02/rm"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> <xsd:complexType name="portType"> <xsd:sequence> <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType"> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -31,7 +31,6 @@ import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; -import org.jboss.ws.extensions.wsrm.config.RMProviderConfig; import org.jboss.ws.metadata.config.EndpointProperty; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; @@ -140,8 +139,6 @@ RMDeliveryAssuranceConfig deliveryAssurance = wsrmConfig.getDeliveryAssurance(); assertEquals(deliveryAssurance.getInOrder(), "true"); assertEquals(deliveryAssurance.getQuality(), "AtLeastOnce"); - RMProviderConfig provider = wsrmConfig.getProvider(); - assertEquals(provider.getSpecVersion(), "http://docs.oasis-open.org/ws-rx/wsrm/200702"); List<RMPortConfig> ports = wsrmConfig.getPorts(); RMPortConfig port1 = ports.get(0); assertEquals(port1.getPortName(), new QName("http://custom/namespace/", "Port1")); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -22,9 +22,12 @@ package org.jboss.test.ws.jaxws.jbws1733; import javax.jws.WebService; +import javax.jws.Oneway; @WebService public interface JBWS1733 { int getCounter(); + @Oneway + void pingCounter(); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.jws.WebService; +import javax.jws.Oneway; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.xml.ws.WebServiceContext; @@ -55,5 +56,10 @@ session.setAttribute("counter", counter); return counter; } + @Oneway + public void pingCounter() + { + getCounter(); + } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -63,6 +63,7 @@ public void testIssue() throws Exception { ((BindingProvider)proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); + proxy.pingCounter(); for (int i = 1; i <= 10; i++) { assertTrue(proxy.getCounter() == i); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -28,6 +28,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.wsrm.api.RMProvider; import org.jboss.wsf.test.JBossWSTest; import org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface; @@ -48,16 +49,17 @@ protected void setUp() throws Exception { super.setUp(); - + QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "OneWayService"); URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); proxy = (OneWayServiceIface)service.getPort(OneWayServiceIface.class); + ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"); } public void testOneWayMethods() throws Exception { - ((RMProvider)proxy).createSequence(isClientAddressable()); + ((RMProvider)proxy).createSequence(); setAddrProps(proxy, "http://useless/action1", serviceURL); proxy.method1(); setAddrProps(proxy, "http://useless/action2", serviceURL); @@ -72,5 +74,6 @@ return "jaxws-wsrm.war, jaxws-wsrm-client.jar"; } - protected abstract boolean isClientAddressable(); + protected abstract String getConfigName(); + } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -29,6 +29,7 @@ import javax.xml.ws.Service; import org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.wsrm.api.RMProvider; import org.jboss.wsf.test.JBossWSTest; @@ -48,16 +49,17 @@ protected void setUp() throws Exception { super.setUp(); - + QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "SecuredOneWayService"); URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); proxy = (SecuredOneWayServiceIface)service.getPort(SecuredOneWayServiceIface.class); + ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"); } public void testOneWayMethods() throws Exception { - ((RMProvider)proxy).createSequence(isClientAddressable()); + ((RMProvider)proxy).createSequence(); setAddrProps(proxy, "http://useless/action1", serviceURL); proxy.method1(); setAddrProps(proxy, "http://useless/action2", serviceURL); @@ -72,5 +74,6 @@ return "jaxws-secured-wsrm.war, jaxws-secured-wsrm-client.jar"; } - protected abstract boolean isClientAddressable(); + protected abstract String getConfigName(); + } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMAddressableOneWayTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return true; + return "Standard Addressable WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMAnonymousOneWayTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return false; + return "Standard Anonymous WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMSecuredAddressableOneWayTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return true; + return "Secured Addressable WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMSecuredAnonymousOneWayTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return false; + return "Secured Anonymous WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -38,6 +38,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.wsrm.api.RMProvider; /** @@ -77,6 +78,7 @@ Service service = Service.create(wsdlURL, serviceName); service.setExecutor(testExecutor); proxy = (ReqResServiceIface)service.getPort(ReqResServiceIface.class); + ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"); } } @@ -149,7 +151,7 @@ private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception { - ((RMProvider)proxyObject).createSequence(isClientAddressable()); + ((RMProvider)proxyObject).createSequence(); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); setAddrProps(proxy, "http://useless/action", serviceURL); @@ -164,5 +166,6 @@ return "jaxws-wsrm.war, jaxws-wsrm-client.jar"; } - protected abstract boolean isClientAddressable(); + protected abstract String getConfigName(); + } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -36,6 +36,7 @@ import javax.xml.ws.Service; import org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.wsrm.api.RMProvider; import org.jboss.wsf.test.JBossWSTest; @@ -76,6 +77,7 @@ Service service = Service.create(wsdlURL, serviceName); service.setExecutor(testExecutor); proxy = (SecuredReqResServiceIface)service.getPort(SecuredReqResServiceIface.class); + ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"); } } @@ -148,7 +150,7 @@ private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception { - ((RMProvider)proxyObject).createSequence(isClientAddressable()); + ((RMProvider)proxyObject).createSequence(); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); setAddrProps(proxy, "http://useless/action", serviceURL); @@ -163,5 +165,6 @@ return "jaxws-secured-wsrm.war, jaxws-secured-wsrm-client.jar"; } - protected abstract boolean isClientAddressable(); + protected abstract String getConfigName(); + } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMAddressableReqResTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return true; + return "Standard Addressable WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMAnonymousReqResTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return false; + return "Standard Anonymous WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMSecuredAddressableReqResTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return true; + return "Secured Addressable WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -39,8 +39,8 @@ return new JBossWSTestSetup(RMSecuredAnonymousReqResTestCase.class, getClasspath()); } - public final boolean isClientAddressable() + public final String getConfigName() { - return false; + return "Secured Anonymous WSRM Client"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -3,14 +3,7 @@ import javax.jws.Oneway; import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; - @WebService -@EndpointConfig -( - configName = "Standard WSRM Client", - configFile = "META-INF/wsrm-jaxws-client-config.xml" -) public interface OneWayServiceIface { @Oneway Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -8,14 +8,7 @@ import javax.xml.ws.AsyncHandler; import javax.xml.ws.Response; -import org.jboss.ws.annotation.EndpointConfig; - @WebService -@EndpointConfig -( - configName = "Standard WSRM Client", - configFile = "META-INF/wsrm-jaxws-client-config.xml" -) public interface ReqResServiceIface { @WebMethod(operationName = "echo") Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -24,14 +24,7 @@ import javax.jws.Oneway; import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; - @WebService -@EndpointConfig -( - configName = "Secured WSRM Client", - configFile = "META-INF/wsrm-jaxws-client-config.xml" -) public interface SecuredOneWayServiceIface { @Oneway Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-01-30 19:01:45 UTC (rev 5551) @@ -28,14 +28,7 @@ import javax.xml.ws.AsyncHandler; import javax.xml.ws.Response; -import org.jboss.ws.annotation.EndpointConfig; - @WebService -@EndpointConfig -( - configName = "Secured WSRM Client", - configFile = "META-INF/wsrm-jaxws-client-config.xml" -) public interface SecuredReqResServiceIface { @WebMethod(operationName = "echo") Modified: stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml 2008-01-30 19:01:45 UTC (rev 5551) @@ -48,7 +48,6 @@ <delivery-assurance inOrder="true" quality="AtLeastOnce"/> <backports-server host="realhostname.realdomain" port="9999"/> <message-retransmission attempts="50" interval="10" timeout="3"/> - <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/> <port name="{http://custom/namespace/}Port1"> <delivery-assurance inOrder="false" quality="AtMostOnce"/> </port> Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2008-01-30 15:19:54 UTC (rev 5550) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2008-01-30 19:01:45 UTC (rev 5551) @@ -7,8 +7,28 @@ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> <client-config> - <config-name>Standard WSRM Client</config-name> + <config-name>Standard Anonymous WSRM Client</config-name> <reliable-messaging> + <message-retransmission attempts="50" interval="10" timeout="3"/> + </reliable-messaging> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>WSRM Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard Addressable WSRM Client</config-name> + <reliable-messaging> <backports-server port="7777"/> <message-retransmission attempts="50" interval="10" timeout="3"/> </reliable-messaging> @@ -28,8 +48,32 @@ </client-config> <client-config> - <config-name>Secured WSRM Client</config-name> + <config-name>Secured Anonymous WSRM Client</config-name> <reliable-messaging> + <message-retransmission attempts="50" interval="10" timeout="3"/> + </reliable-messaging> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>WSRM Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMClientHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Secured Addressable WSRM Client</config-name> + <reliable-messaging> <backports-server port="7777"/> <message-retransmission attempts="50" interval="10" timeout="3"/> </reliable-messaging>