Author: richard.opalka(a)jboss.com Date: 2007-12-19 06:16:02 -0500 (Wed, 19 Dec 2007) New Revision: 5356 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.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/RMException.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/jaxws/RMClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.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/reqres/RMAbstractReqResTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java Log: reviewed client API and removed useless RMSequence class 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-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -506,7 +506,7 @@ // WS-RM support // /////////////////// @SuppressWarnings("unchecked") - public org.jboss.ws.extensions.wsrm.api.RMSequence createSequence(boolean addressableClient) throws RMException + public void createSequence(boolean addressableClient) throws RMException { if (this.wsrmSequence != null) throw new IllegalStateException("Sequence already registered with proxy instance"); @@ -547,12 +547,23 @@ candidateSequence.setOutboundId(outboundId); candidateSequence.setBehavior(createSequenceResponse.getIncompleteSequenceBehavior()); candidateSequence.setDuration(RMHelper.durationToLong(createSequenceResponse.getExpires())); - return this.wsrmSequence = candidateSequence; + this.wsrmSequence = candidateSequence; } catch (Exception e) { throw new RMException("Unable to create WSRM sequence", e); } } - + + public void closeSequence() + { + try + { + this.wsrmSequence.close(); + } + finally + { + this.wsrmSequence = null; + } + } } 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 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -60,7 +60,7 @@ * @since Oct 25, 2007 */ @SuppressWarnings("unchecked") -public final class RMClientSequence implements RMSequenceExt, RMUnassignedMessageListener +public final class RMClientSequence implements RMSequence, RMUnassignedMessageListener { private static final Logger logger = Logger.getLogger(RMClientSequence.class); private static final String PATH_PREFIX = "/temporary_listen_address/"; Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -0,0 +1,42 @@ +/* + * 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; + +import java.util.Set; + +/** + * An extension of the standard RM sequence + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 12, 2007 + */ +public interface RMSequence +{ + String getOutboundId(); + String getInboundId(); + long newMessageNumber(); + long getLastMessageNumber(); + long getDuration(); + String getAcksTo(); + Set<Long> getReceivedInboundMessages(); +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -1,44 +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; - -import java.util.Set; - -import org.jboss.ws.extensions.wsrm.api.RMSequence; - -/** - * An extension of the standard RM sequence - * - * @author richard.opalka(a)jboss.com - * - * @since Dec 12, 2007 - */ -public interface RMSequenceExt extends RMSequence -{ - String getOutboundId(); - String getInboundId(); - long newMessageNumber(); - long getLastMessageNumber(); - long getDuration(); - String getAcksTo(); - Set<Long> getReceivedInboundMessages(); -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -30,7 +30,6 @@ * * @since Oct 22, 2007 * @see org.jboss.ws.extensions.wsrm.api.RMProvider - * @see org.jboss.ws.extensions.wsrm.api.RMSequence */ public class RMException extends WebServiceException { 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 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -27,27 +27,30 @@ * <p><blockquote><pre> * boolean addressableClient = true; * SEI sei = (SEI)service.getPort(SEI.class) - * RMSequence sequence = ((RMProvider)sei).createSequence(addressableClient); + * ((RMProvider)sei).createSequence(addressableClient); * ... * sei.callMethod1(); * sei.callMethod2(); * ... - * sequence.close(); + * ((RMProvider)sei).closeSequence(); * </pre></blockquote></p> * * @author richard.opalka(a)jboss.com * * @since Oct 22, 2007 - * @see org.jboss.ws.extensions.wsrm.api.RMSequence - * @see org.jboss.ws.extensions.wsrm.api.RMException */ public interface RMProvider { /** - * Creates new WS-RM sequence + * Creates new WS-RM sequence and associates it with service proxy * @param addressableClient - * @return created sequence - * @throws unchecked RMException if sequence creation error occurs + * @throws RMException if something went wrong */ - RMSequence createSequence(boolean addressableClient); + void createSequence(boolean addressableClient); + + /** + * Close the sequence associated with service proxy + * @throws RMException if something went wrong + */ + void closeSequence(); } Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -1,43 +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.api; - -/** - * WS-RM sequence. User can only create sequence using <b>RMProvider</b> - * interface and close sequence using <b>RMSequence</b> interface - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 22, 2007 - * @see org.jboss.ws.extensions.wsrm.api.RMProvider - * @see org.jboss.ws.extensions.wsrm.api.RMException - */ -public interface RMSequence -{ - - /** - * Close the sequence - * @throws unchecked RMException if sequence termination failed - */ - void close(); - -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -36,7 +36,7 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMSequenceExt; +import org.jboss.ws.extensions.wsrm.RMSequence; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMProvider; @@ -67,7 +67,7 @@ rmOutboundContext.put(RMConstant.WSA_MESSAGE_ID, optionalMessageId); rmOutboundContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data); SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage(); - RMSequenceExt sequenceImpl = (RMSequenceExt)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE); + RMSequence sequenceImpl = (RMSequence)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE); // try to serialize CreateSequence to message serialize(rmConstants.getCreateSequenceQName(), outMsgs, data, soapMessage, sequenceImpl); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMSequenceExt; +import org.jboss.ws.extensions.wsrm.RMSequence; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable; @@ -51,7 +51,7 @@ return RMConstant.PROTOCOL_OPERATION_QNAMES; } - protected final void serialize(QName msgQN, List<QName> outMsgs, Map<QName, RMSerializable> data, SOAPMessage soapMessage, RMSequenceExt seq) + protected final void serialize(QName msgQN, List<QName> outMsgs, Map<QName, RMSerializable> data, SOAPMessage soapMessage, RMSequence seq) { RMSerializable msg = RMHandlerHelper.prepareData(msgQN, outMsgs, seq); if (msg != null) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; -import org.jboss.ws.extensions.wsrm.RMSequenceExt; +import org.jboss.ws.extensions.wsrm.RMSequence; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMMessageFactory; @@ -36,7 +36,6 @@ import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequenceResponse; import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequence; import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequenceResponse; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement; import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable; import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequence; @@ -97,7 +96,7 @@ throw new IllegalArgumentException(); } - public static RMSerializable prepareData(QName msgQN, List<QName> outMsgs, RMSequenceExt seq) + public static RMSerializable prepareData(QName msgQN, List<QName> outMsgs, RMSequence seq) { if (outMsgs.contains(msgQN)) { @@ -144,14 +143,14 @@ return null; } - private static RMSerializable newCreateSequence(RMSequenceExt seq) + private static RMSerializable newCreateSequence(RMSequence seq) { RMCreateSequence createSequence = rmFactory.newCreateSequence(); createSequence.setAcksTo(seq.getAcksTo()); return createSequence; } - private static RMSerializable newCreateSequenceResponse(RMSequenceExt seq) + private static RMSerializable newCreateSequenceResponse(RMSequence seq) { RMCreateSequenceResponse createSequenceResponse = rmFactory.newCreateSequenceResponse(); createSequenceResponse.setIdentifier(seq.getInboundId()); @@ -159,7 +158,7 @@ return createSequenceResponse; } - private static RMSerializable newCloseSequenceResponse(RMSequenceExt seq) + private static RMSerializable newCloseSequenceResponse(RMSequence seq) { // construct CloseSequenceResponse object RMCloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse(); @@ -167,7 +166,7 @@ return closeSequenceResponse; } - private static RMSerializable newCloseSequence(RMSequenceExt seq) + private static RMSerializable newCloseSequence(RMSequence seq) { // construct CloseSequenceResponse object RMCloseSequence closeSequence = rmFactory.newCloseSequence(); @@ -179,7 +178,7 @@ return closeSequence; } - private static RMSerializable newTerminateSequence(RMSequenceExt seq) + private static RMSerializable newTerminateSequence(RMSequence seq) { // construct CloseSequenceResponse object RMTerminateSequence terminateSequence = rmFactory.newTerminateSequence(); @@ -191,7 +190,7 @@ return terminateSequence; } - private static RMSerializable newTerminateSequenceResponse(RMSequenceExt seq) + private static RMSerializable newTerminateSequenceResponse(RMSequence seq) { // construct TerminateSequenceResponse object RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse(); @@ -199,7 +198,7 @@ return terminateSequenceResponse; } - private static RMSerializable newSequenceAcknowledgement(RMSequenceExt seq) + private static RMSerializable newSequenceAcknowledgement(RMSequence seq) { // construct SequenceAcknowledgement object RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement(); @@ -224,7 +223,7 @@ return sequenceAcknowledgement; } - private static RMSerializable newAckRequested(RMSequenceExt seq) + private static RMSerializable newAckRequested(RMSequence seq) { // construct AckRequested object RMAckRequested wsrmMsg = rmFactory.newAckRequested(); @@ -233,10 +232,10 @@ return wsrmMsg; } - private static RMSerializable newSequence(RMSequenceExt seq) + private static RMSerializable newSequence(RMSequence seq) { // construct Sequence object - RMSequence sequence = rmFactory.newSequence(); + org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence sequence = rmFactory.newSequence(); sequence.setIdentifier(seq.getOutboundId()); sequence.setMessageNumber(seq.newMessageNumber()); return sequence; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -36,7 +36,7 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMSequenceExt; +import org.jboss.ws.extensions.wsrm.RMSequence; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMProvider; @@ -67,7 +67,7 @@ rmOutboundContext.put(RMConstant.WSA_MESSAGE_ID, optionalMessageId); rmOutboundContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data); SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage(); - RMSequenceExt sequenceImpl = (RMSequenceExt)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE); + RMSequence sequenceImpl = (RMSequence)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE); // try to serialize CreateSequenceResponse to message serialize(rmConstants.getCreateSequenceResponseQName(), outMsgs, data, soapMessage, sequenceImpl); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.addressing.AddressingClientUtil; -import org.jboss.ws.extensions.wsrm.RMSequenceExt; +import org.jboss.ws.extensions.wsrm.RMSequence; /** * Server side implementation of the RM sequence @@ -37,7 +37,7 @@ * * @since Dec 12, 2007 */ -public class RMServerSequence implements RMSequenceExt +public class RMServerSequence implements RMSequence { private static final Logger logger = Logger.getLogger(RMServerSequence.class); 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 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -29,7 +29,6 @@ import javax.xml.ws.Service; import org.jboss.ws.extensions.wsrm.api.RMProvider; -import org.jboss.ws.extensions.wsrm.api.RMSequence; import org.jboss.wsf.test.JBossWSTest; import org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface; @@ -58,14 +57,14 @@ public void testOneWayMethods() throws Exception { - RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable()); + ((RMProvider)proxy).createSequence(isClientAddressable()); setAddrProps(proxy, "http://useless/action1", serviceURL); proxy.method1(); setAddrProps(proxy, "http://useless/action2", serviceURL); proxy.method2("Hello World"); setAddrProps(proxy, "http://useless/action3", serviceURL); proxy.method3(new String[] {"Hello","World"}); - sequence.close(); + ((RMProvider)proxy).closeSequence(); } public static String getClasspath() 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 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -30,7 +30,6 @@ import org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface; import org.jboss.ws.extensions.wsrm.api.RMProvider; -import org.jboss.ws.extensions.wsrm.api.RMSequence; import org.jboss.wsf.test.JBossWSTest; /** @@ -58,14 +57,14 @@ public void testOneWayMethods() throws Exception { - RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable()); + ((RMProvider)proxy).createSequence(isClientAddressable()); setAddrProps(proxy, "http://useless/action1", serviceURL); proxy.method1(); setAddrProps(proxy, "http://useless/action2", serviceURL); proxy.method2("Hello World"); setAddrProps(proxy, "http://useless/action3", serviceURL); proxy.method3(new String[] {"Hello","World"}); - sequence.close(); + ((RMProvider)proxy).closeSequence(); } public static String getClasspath() 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 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -39,7 +39,6 @@ import org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface; import org.jboss.ws.extensions.wsrm.api.RMProvider; -import org.jboss.ws.extensions.wsrm.api.RMSequence; /** * Reliable JBoss WebService client invoking req/res methods @@ -150,14 +149,14 @@ private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception { - RMSequence sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable()); + ((RMProvider)proxyObject).createSequence(isClientAddressable()); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); - sequence.close(); + ((RMProvider)proxyObject).closeSequence(); } public static String getClasspath() 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 2007-12-18 17:57:50 UTC (rev 5355) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2007-12-19 11:16:02 UTC (rev 5356) @@ -37,7 +37,6 @@ import org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface; import org.jboss.ws.extensions.wsrm.api.RMProvider; -import org.jboss.ws.extensions.wsrm.api.RMSequence; import org.jboss.wsf.test.JBossWSTest; /** @@ -149,14 +148,14 @@ private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception { - RMSequence sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable()); + ((RMProvider)proxyObject).createSequence(isClientAddressable()); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); setAddrProps(proxy, "http://useless/action", serviceURL); invokeWebServiceMethod(invocationType); - sequence.close(); + ((RMProvider)proxyObject).closeSequence(); } public static String getClasspath()