Author: richard.opalka(a)jboss.com Date: 2007-12-13 09:19:32 -0500 (Thu, 13 Dec 2007) New Revision: 5302 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.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/ReqResServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.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/reqres/RMAbstractReqResTest.java stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties Log: replacing endpoints emulator with real RM enabled endpoints Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -418,7 +418,8 @@ // R2714 For one-way operations, an INSTANCE MUST NOT return a HTTP response that contains a SOAP envelope. // Specifically, the HTTP response entity-body must be empty. - if (opMetaData.isOneWay()) + boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null; + if (opMetaData.isOneWay() && (false == isWsrmMessage)) { resMessage.getSOAPPart().setContent(null); return resMessage; Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -62,6 +62,8 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.ws.extensions.wsrm.RMConstant; +import org.jboss.ws.extensions.wsrm.server.RMInvocationHandler; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -255,7 +257,7 @@ msgContext.setMessageAbstraction(resMessage); } - if (oneway == false) + if ((oneway == false) || (msgContext.get(RMConstant.RESPONSE_CONTEXT) != null)) // RM hack { // call the response handler chain, removing the fault type entry will not call handleFault for that chain handlersPass = callResponseHandlerChain(sepMetaData, handlerType[2]); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -82,7 +82,7 @@ } } - public static RMServerSequence getServerSequence(String seqId, List<RMServerSequence> sequences) + public static RMServerSequence getServerSequenceByInboundId(String seqId, List<RMServerSequence> sequences) { for (RMServerSequence seq : sequences) { @@ -95,20 +95,17 @@ return null; } - public static AddressingProperties createAddressingProperties(AddressingProperties reqAddrProps, List<QName> rmMessages) + public static RMServerSequence getServerSequenceByOutboundId(String seqId, List<RMServerSequence> sequences) { - AddressingProperties retVal = null; - - if (rmMessages.contains(rmConstants.getCreateSequenceQName())) + for (RMServerSequence seq : sequences) { - String wsaTo = reqAddrProps.getReplyTo().getAddress().getURI().toString(); - retVal = AddressingClientUtil.createDefaultProps(RMConstant.CREATE_SEQUENCE_RESPONSE_WSA_ACTION, wsaTo); - retVal.setMessageID(null); - AddressingBuilder addrBuilder = AddressingBuilder.getAddressingBuilder(); - retVal.setRelatesTo(new Relationship[] {addrBuilder.newRelationship(addrBuilder.newURI(reqAddrProps.getMessageID().getURI()).getURI())}); + if (seq.getOutboundId().equals(seqId)) + { + return seq; + } } - return retVal; + return null; } public static boolean isCreateSequence(Map<String, Object> rmMsgContext) @@ -129,6 +126,18 @@ return protocolMessages.contains(rmConstants.getTerminateSequenceQName()); } + public static boolean isSequence(Map<String, Object> rmMsgContext) + { + List<QName> protocolMessages = (List<QName>)rmMsgContext.get(RMConstant.PROTOCOL_MESSAGES); + return protocolMessages.contains(rmConstants.getSequenceQName()); + } + + public static boolean isSequenceAcknowledgement(Map<String, Object> rmMsgContext) + { + List<QName> protocolMessages = (List<QName>)rmMsgContext.get(RMConstant.PROTOCOL_MESSAGES); + return protocolMessages.contains(rmConstants.getSequenceAcknowledgementQName()); + } + public static Duration stringToDuration(String s) { return factory.newDuration(s); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -228,16 +228,16 @@ // try to serialize SequenceAcknowledgement to message RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement(); sequenceAcknowledgement.setIdentifier(sequenceImpl.getInboundId()); - Iterator<Long> receivedInboudMessages = sequenceImpl.getReceivedInboundMessages().iterator(); - if (false == receivedInboudMessages.hasNext()) + Iterator<Long> receivedMessages = sequenceImpl.getReceivedInboundMessages().iterator(); + if (false == receivedMessages.hasNext()) { sequenceAcknowledgement.setNone(); } else { - while (receivedInboudMessages.hasNext()) + while (receivedMessages.hasNext()) { - long messageNo = receivedInboudMessages.next(); + long messageNo = receivedMessages.next(); RMSequenceAcknowledgement.RMAcknowledgementRange range = sequenceAcknowledgement.newAcknowledgementRange(); range.setLower(messageNo); range.setUpper(messageNo); @@ -249,7 +249,7 @@ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); } - if (data.size() == 0) + if ((outMsgs.size() != 0) && (data.size() == 0)) throw new RMException("RM handler did not serialize WS-RM message to the payload"); // TODO: implement SequenceFault serialization Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -21,26 +21,32 @@ */ package org.jboss.ws.extensions.wsrm.server; +import java.net.URISyntaxException; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.ws.addressing.AddressingBuilder; import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.Relationship; +import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.api.RMSequence; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequence; +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; import org.jboss.wsf.spi.deployment.Endpoint; @@ -102,11 +108,11 @@ Map<String, Object> rmReqProps = (Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT); if (rmReqProps == null) throw new RMException("WS-RM specific data not found in server request"); - Map<String, Object> rmResProps = new HashMap<String, Object>(); List<QName> protocolMessages = new LinkedList<QName>(); Map<String, Object> rmResponseContext = new HashMap<String, Object>(); - AddressingProperties respAddrProps = null; List<RMServerSequence> sequences = (List<RMServerSequence>)ep.getAttachment(RMServerSequence.class); + rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); + msgContext.remove(RMConstant.RESPONSE_CONTEXT); RMServerSequence sequence = null; if (RMHelper.isCreateSequence(rmReqProps)) @@ -114,9 +120,7 @@ sequence = new RMServerSequence(); sequences.add(sequence); protocolMessages.add(rmConstants.getCreateSequenceResponseQName()); - rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); - msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); } if (RMHelper.isCloseSequence(rmReqProps)) @@ -124,40 +128,94 @@ Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); RMCloseSequence payload = (RMCloseSequence)data.get(rmConstants.getCloseSequenceQName()); String seqIdentifier = payload.getIdentifier(); - sequence = RMHelper.getServerSequence(seqIdentifier, sequences); + sequence = RMHelper.getServerSequenceByInboundId(seqIdentifier, sequences); if (sequence == null) { - throw new NotImplementedException("TODO: implement unknown sequence fault generation"); + throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier); } sequence.close(); protocolMessages.add(rmConstants.getCloseSequenceResponseQName()); protocolMessages.add(rmConstants.getSequenceAcknowledgementQName()); - rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); - msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); } + if (RMHelper.isSequenceAcknowledgement(rmReqProps)) + { + Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); + RMSequenceAcknowledgement payload = (RMSequenceAcknowledgement)data.get(rmConstants.getSequenceAcknowledgementQName()); + String seqIdentifier = payload.getIdentifier(); + sequence = RMHelper.getServerSequenceByOutboundId(seqIdentifier, sequences); + if (sequence == null) + { + throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier); + } + + for (RMSequenceAcknowledgement.RMAcknowledgementRange range : payload.getAcknowledgementRanges()) + { + for (long i = range.getLower(); i <= range.getUpper(); i++) + { + sequence.addReceivedOutboundMessage(i); + } + } + } + if (RMHelper.isTerminateSequence(rmReqProps)) { Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); RMTerminateSequence payload = (RMTerminateSequence)data.get(rmConstants.getTerminateSequenceQName()); String seqIdentifier = payload.getIdentifier(); - sequence = RMHelper.getServerSequence(seqIdentifier, sequences); + sequence = RMHelper.getServerSequenceByInboundId(seqIdentifier, sequences); if (sequence == null) { - throw new NotImplementedException("TODO: implement unknown sequence fault generation"); + throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier); } sequences.remove(sequence); protocolMessages.add(rmConstants.getTerminateSequenceResponseQName()); protocolMessages.add(rmConstants.getSequenceAcknowledgementQName()); - rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); - msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); } + + if (RMHelper.isSequence(rmReqProps)) + { + Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); + RMSequence payload = (RMSequence)data.get(rmConstants.getSequenceQName()); + String seqIdentifier = payload.getIdentifier(); + sequence = RMHelper.getServerSequenceByInboundId(seqIdentifier, sequences); + if (sequence == null) + { + throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier); + } + + sequence.addReceivedInboundMessage(payload.getMessageNumber()); + protocolMessages.add(rmConstants.getSequenceAcknowledgementQName()); + rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); - // TODO: implement + boolean retTypeIsVoid = inv.getJavaMethod().getReturnType().equals(Void.class) || inv.getJavaMethod().getReturnType().equals(Void.TYPE); + if (false == retTypeIsVoid) + { + protocolMessages.add(rmConstants.getSequenceQName()); + protocolMessages.add(rmConstants.getAckRequestedQName()); + } + else + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + AddressingProperties addressingProps = builder.newAddressingProperties(); + addressingProps.setTo(builder.newURI(addrProps.getReplyTo().getAddress().getURI())); + addressingProps.setRelatesTo(new Relationship[] {builder.newRelationship(addrProps.getMessageID().getURI())}); + try + { + addressingProps.setAction(builder.newURI(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION)); + } + catch (URISyntaxException ignore) + { + } + msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps); + } + } + + msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); } /** 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-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -23,7 +23,10 @@ import java.util.Set; import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; +import org.jboss.logging.Logger; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.wsrm.RMSequenceIface; @@ -36,24 +39,22 @@ */ public class RMServerSequence implements RMSequenceIface { + private static final Logger logger = Logger.getLogger(RMServerSequence.class); private final String inboundId = AddressingClientUtil.generateMessageID().toString(); private final String outboundId = AddressingClientUtil.generateMessageID().toString(); private final long duration = 10 * 60 * 1000L; // 10 minutes duration - private final Set receivedInboundMessages = new TreeSet<Long>(); + private final Set<Long> acknowledgedOutboundMessages = new TreeSet<Long>(); + private final Set<Long> receivedInboundMessages = new TreeSet<Long>(); private boolean closed; + private AtomicBoolean inboundMessageAckRequested = new AtomicBoolean(); + private AtomicLong messageNumber = new AtomicLong(); public String getInboundId() { return this.inboundId; } - public long getLastMessageNumber() - { - // TODO Auto-generated method stub - return 0; - } - public long getDuration() { return this.duration; @@ -64,17 +65,46 @@ return this.outboundId; } - public Set<Long> getReceivedInboundMessages() + public final void addReceivedInboundMessage(long messageId) { - return this.receivedInboundMessages; + this.receivedInboundMessages.add(messageId); + logger.debug("Inbound Sequence: " + this.inboundId + ", received message no. " + messageId); } - public long newMessageNumber() + public final void addReceivedOutboundMessage(long messageId) { - // TODO Auto-generated method stub - return 0; + this.acknowledgedOutboundMessages.add(messageId); + logger.debug("Outbound Sequence: " + this.outboundId + ", message no. " + messageId + " acknowledged by server"); } + public final void ackRequested(boolean requested) + { + this.inboundMessageAckRequested.set(requested); + logger.debug("Inbound Sequence: " + this.inboundId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages); + } + + public final long newMessageNumber() + { + // no need for synchronization + return this.messageNumber.incrementAndGet(); + } + + public final long getLastMessageNumber() + { + // no need for synchronization + return this.messageNumber.get(); + } + + public final boolean isAckRequested() + { + return this.inboundMessageAckRequested.get(); + } + + public Set<Long> getReceivedInboundMessages() + { + return this.receivedInboundMessages; + } + public void close() { this.closed = true; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -6,8 +6,6 @@ import javax.jws.WebParam; import javax.jws.WebResult; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; import javax.xml.ws.addressing.Action; import javax.xml.ws.AsyncHandler; @@ -16,7 +14,6 @@ import org.jboss.ws.annotation.EndpointConfig; @WebService(name = "ReqRes", targetNamespace = "http://org.jboss.ws/jaxws/wsrm") -@SOAPBinding(style = Style.RPC) @EndpointConfig ( configName = "Standard WSRM Client", Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -4,8 +4,6 @@ import javax.jws.WebParam; import javax.jws.WebResult; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; import javax.xml.ws.addressing.Action; import org.jboss.logging.Logger; @@ -20,10 +18,6 @@ serviceName = "ReqResService", targetNamespace = "http://org.jboss.ws/jaxws/wsrm" ) -@SOAPBinding -( - style = Style.RPC -) @PolicyAttachment ( @Policy 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-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -46,7 +46,6 @@ public abstract class RMAbstractOneWayTest extends JBossWSTest { private static final Properties props = new Properties(); - private final boolean emulatorOn = Boolean.parseBoolean((String)props.get("emulator")); private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path"); private String targetNS = "http://wsrm.jaxws.ws.test.jboss.org/"; @@ -82,23 +81,14 @@ public void testOneWayMethods() throws Exception { - if (true) return; // disable WS-RM tests - they cause regression in hudson - - RMSequence sequence = null; - if (emulatorOn) - { - sequence = ((RMProvider)proxy).createSequence(isClientAddressable()); - } + RMSequence sequence = ((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"}); - if (emulatorOn) - { - sequence.close(); - } + sequence.close(); } 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-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-13 14:19:32 UTC (rev 5302) @@ -57,7 +57,6 @@ private static final String TARGET_NS = "http://org.jboss.ws/jaxws/wsrm"; private static final Properties props = new Properties(); private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path"); - private final boolean emulatorOn = Boolean.parseBoolean((String)props.get("emulator")); private Exception handlerException; private boolean asyncHandlerCalled; private ReqResServiceIface proxy; @@ -173,23 +172,14 @@ private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception { - if (true) return; // disable WS-RM tests - they cause regression in hudson - - RMSequence sequence = null; - if (emulatorOn) - { - sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable()); - } + RMSequence sequence = ((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); - if (emulatorOn) - { - sequence.close(); - } + sequence.close(); } public static String getClasspath() Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties 2007-12-13 14:19:32 UTC (rev 5302) @@ -1,7 +1,5 @@ port=8080 -#path=/jaxws-wsrm/OneWayService -path=/jaxws-wsrm-one-way-emulator/OneWayService -#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar -archives=jaxws-wsrm-one-way-emulator.war, jaxws-wsrm-client.jar -emulator=true - +path=/jaxws-wsrm/OneWayService +#path=/jaxws-wsrm-one-way-emulator/OneWayService +archives=jaxws-wsrm.war, jaxws-wsrm-client.jar +#archives=jaxws-wsrm-one-way-emulator.war, jaxws-wsrm-client.jar Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties 2007-12-13 14:12:51 UTC (rev 5301) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties 2007-12-13 14:19:32 UTC (rev 5302) @@ -1,7 +1,5 @@ port=8080 -#path=/jaxws-wsrm/ReqResService -path=/jaxws-wsrm-req-res-emulator/ReqResService -#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar -archives=jaxws-wsrm-req-res-emulator.war, jaxws-wsrm-client.jar -emulator=true - +path=/jaxws-wsrm/ReqResService +#path=/jaxws-wsrm-req-res-emulator/ReqResService +archives=jaxws-wsrm.war, jaxws-wsrm-client.jar +#archives=jaxws-wsrm-req-res-emulator.war, jaxws-wsrm-client.jar