JBossWS SVN: r5186 - spi/branches/asoldano.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-05 04:14:23 -0500 (Wed, 05 Dec 2007)
New Revision: 5186
Added:
spi/branches/asoldano/trunk/
Log:
Creating user branch
Copied: spi/branches/asoldano/trunk (from rev 5185, spi/trunk)
16 years, 5 months
JBossWS SVN: r5185 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-05 04:10:26 -0500 (Wed, 05 Dec 2007)
New Revision: 5185
Added:
spi/branches/asoldano/
Log:
Preparing for user branch
16 years, 5 months
JBossWS SVN: r5184 - framework/branches/asoldano.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-04 19:04:10 -0500 (Tue, 04 Dec 2007)
New Revision: 5184
Added:
framework/branches/asoldano/trunk/
Log:
Creating user branch
Copied: framework/branches/asoldano/trunk (from rev 5183, framework/trunk)
16 years, 5 months
JBossWS SVN: r5181 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/wsrm and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-04 13:31:13 -0500 (Tue, 04 Dec 2007)
New Revision: 5181
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/RMSequenceImpl.java
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/common/RMHelper.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
Log:
removing synchronization - proxy instance can't be reused by multiple threads
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-04 16:53:09 UTC (rev 5180)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-04 18:31:13 UTC (rev 5181)
@@ -107,16 +107,9 @@
private Map<HandlerType, HandlerChainExecutor> executorMap = new HashMap<HandlerType, HandlerChainExecutor>();
private static HandlerType[] HANDLER_TYPES = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
- // WS-RM locking utility
- private final Lock wsrmLock = new ReentrantLock();
// WS-RM sequence associated with the proxy
private RMSequenceImpl wsrmSequence;
- public final Lock getWSRMLock()
- {
- return this.wsrmLock;
- }
-
public final void setWSRMSequence(RMSequenceImpl wsrmSequence)
{
this.wsrmSequence = wsrmSequence;
@@ -267,52 +260,43 @@
// Invoked by the proxy invokation handler
public Object invoke(QName opName, Object[] args, Map<String, Object> resContext) throws RemoteException
{
- this.wsrmLock.lock();
-
- try
- {
- // Associate a message context with the current thread
- CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
- MessageContextAssociation.pushMessageContext(msgContext);
+ // Associate a message context with the current thread
+ CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ MessageContextAssociation.pushMessageContext(msgContext);
- // The contents of the request context are used to initialize the message context (see section 9.4.1)
- // prior to invoking any handlers (see chapter 9) for the outbound message. Each property within the
- // request context is copied to the message context with a scope of HANDLER.
- Map<String, Object> reqContext = getBindingProvider().getRequestContext();
+ // The contents of the request context are used to initialize the message context (see section 9.4.1)
+ // prior to invoking any handlers (see chapter 9) for the outbound message. Each property within the
+ // request context is copied to the message context with a scope of HANDLER.
+ Map<String, Object> reqContext = getBindingProvider().getRequestContext();
- if (this.wsrmSequence != null)
+ if (this.wsrmSequence != null)
+ {
+ if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
{
- if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
+ if (this.wsrmSequence.getBackPort() != null)
{
- if (this.wsrmSequence.getBackPort() != null)
- {
- // rewrite ReplyTo to use client addressable back port
- Map<String, Object> requestContext = getBindingProvider().getRequestContext();
- AddressingProperties addressingProps = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.wsrmSequence.getBackPort()));
- }
- Map<String, Object> rmRequestContext = new HashMap<String, Object>();
- List<QName> outMsgs = new LinkedList<QName>();
- outMsgs.add(RMProvider.get().getConstants().getSequenceQName());
- outMsgs.add(RMProvider.get().getConstants().getAckRequestedQName());
- if (wsrmSequence.isAckRequested())
- {
- // piggy backing
- outMsgs.add(RMProvider.get().getConstants().getSequenceAcknowledgementQName());
- }
- rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
- rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, wsrmSequence);
- reqContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
+ // rewrite ReplyTo to use client addressable back port
+ Map<String, Object> requestContext = getBindingProvider().getRequestContext();
+ AddressingProperties addressingProps = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+ addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.wsrmSequence.getBackPort()));
}
+ Map<String, Object> rmRequestContext = new HashMap<String, Object>();
+ List<QName> outMsgs = new LinkedList<QName>();
+ outMsgs.add(RMProvider.get().getConstants().getSequenceQName());
+ outMsgs.add(RMProvider.get().getConstants().getAckRequestedQName());
+ if (wsrmSequence.isAckRequested())
+ {
+ // piggy backing
+ outMsgs.add(RMProvider.get().getConstants().getSequenceAcknowledgementQName());
+ }
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
+ rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, wsrmSequence);
+ reqContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
}
-
- msgContext.putAll(reqContext);
}
- finally
- {
- this.wsrmLock.unlock();
- }
+ msgContext.putAll(reqContext);
+
try
{
Object retObj = invoke(opName, args, false);
@@ -333,42 +317,34 @@
}
finally
{
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- this.wsrmLock.lock();
- try
+ msgContext = MessageContextAssociation.peekMessageContext();
+ if (this.wsrmSequence != null)
{
- if (this.wsrmSequence != null)
+ if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
{
- if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
+ Map<String, Object> wsrmResCtx = (Map<String, Object>) msgContext.get(RMConstant.RESPONSE_CONTEXT);
+ if (wsrmResCtx != null)
{
- Map<String, Object> wsrmResCtx = (Map<String, Object>) msgContext.get(RMConstant.RESPONSE_CONTEXT);
- if (wsrmResCtx != null)
+ RMConstants wsrmConstants = RMProvider.get().getConstants();
+ Map<QName, RMSerializable> mapping = (Map<QName, RMSerializable>)wsrmResCtx.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
+ QName seq = wsrmConstants.getSequenceQName();
+ if (mapping.keySet().contains(seq))
{
- RMConstants wsrmConstants = RMProvider.get().getConstants();
- Map<QName, RMSerializable> mapping = (Map<QName, RMSerializable>)wsrmResCtx.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
- QName seq = wsrmConstants.getSequenceQName();
- if (mapping.keySet().contains(seq))
- {
- RMHelper.handleSequenceHeader((RMSequence)mapping.get(seq), this.wsrmSequence);
- }
- QName seqAck = wsrmConstants.getSequenceAcknowledgementQName();
- if (mapping.keySet().contains(seqAck))
- {
- RMHelper.handleSequenceAcknowledgementHeader((RMSequenceAcknowledgement)mapping.get(seqAck), this.wsrmSequence);
- }
- QName ackReq = wsrmConstants.getAckRequestedQName();
- if (mapping.keySet().contains(ackReq))
- {
- RMHelper.handleAckRequestedHeader((RMAckRequested)mapping.get(ackReq), this.wsrmSequence);
- }
+ RMHelper.handleSequenceHeader((RMSequence)mapping.get(seq), this.wsrmSequence);
}
+ QName seqAck = wsrmConstants.getSequenceAcknowledgementQName();
+ if (mapping.keySet().contains(seqAck))
+ {
+ RMHelper.handleSequenceAcknowledgementHeader((RMSequenceAcknowledgement)mapping.get(seqAck), this.wsrmSequence);
+ }
+ QName ackReq = wsrmConstants.getAckRequestedQName();
+ if (mapping.keySet().contains(ackReq))
+ {
+ RMHelper.handleAckRequestedHeader((RMAckRequested)mapping.get(ackReq), this.wsrmSequence);
+ }
}
}
}
- finally
- {
- this.wsrmLock.unlock();
- }
// Copy the inbound msg properties to the binding's response context
for (String key : msgContext.keySet())
@@ -534,60 +510,52 @@
@SuppressWarnings("unchecked")
public org.jboss.ws.extensions.wsrm.api.RMSequence createSequence(RMAddressingType addrType) throws RMException
{
- this.getWSRMLock().lock();
+ if (this.wsrmSequence != null)
+ throw new IllegalStateException("Sequence already registered with proxy instance");
+ if (addrType == null)
+ throw new IllegalArgumentException("Addressing type cannot be null");
+
try
{
- if (this.wsrmSequence != null)
- throw new IllegalStateException("Sequence already registered with proxy instance");
- if (addrType == null)
- throw new IllegalArgumentException("Addressing type cannot be null");
-
- try
+ // set up addressing data
+ RMSequenceImpl candidateSequence = new RMSequenceImpl(addrType, getEndpointMetaData().getConfig().getRMMetaData());
+ String address = getEndpointMetaData().getEndpointAddress();
+ String action = RMConstant.CREATE_SEQUENCE_WSA_ACTION;
+ AddressingProperties addressingProps = null;
+ if (addrType == RMAddressingType.ADDRESSABLE)
{
- // set up addressing data
- RMSequenceImpl candidateSequence = new RMSequenceImpl(addrType, getEndpointMetaData().getConfig().getRMMetaData());
- String address = getEndpointMetaData().getEndpointAddress();
- String action = RMConstant.CREATE_SEQUENCE_WSA_ACTION;
- AddressingProperties addressingProps = null;
- if (addrType == RMAddressingType.ADDRESSABLE)
- {
- addressingProps = AddressingClientUtil.createDefaultProps(action, address);
- addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(candidateSequence.getBackPort()));
- }
- else
- {
- addressingProps = AddressingClientUtil.createAnonymousProps(action, address);
- }
- Map requestContext = getBindingProvider().getRequestContext();
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps);
- // set up wsrm request context
- QName createSequenceQN = RMProvider.get().getConstants().getCreateSequenceQName();
- Map rmRequestContext = new HashMap();
- List outMsgs = new LinkedList();
- outMsgs.add(createSequenceQN);
- rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
- rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, candidateSequence);
- requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
- // invoke stub method
- invoke(createSequenceQN, new Object[] {}, getBindingProvider().getResponseContext());
- // read WSRM sequence id from response context
- Map rmResponseContext = (Map)getBindingProvider().getResponseContext().get(RMConstant.RESPONSE_CONTEXT);
- RMCreateSequenceResponse createSequenceResponse = ((RMCreateSequenceResponse)((Map)rmResponseContext.get(RMConstant.PROTOCOL_MESSAGES_MAPPING)).get(RMProvider.get().getConstants().getCreateSequenceResponseQName()));
- String outboundId = createSequenceResponse.getIdentifier();
- candidateSequence.setClient(this);
- candidateSequence.setOutboundId(outboundId);
- candidateSequence.setBehavior(createSequenceResponse.getIncompleteSequenceBehavior());
- candidateSequence.setDuration(RMHelper.durationToLong(createSequenceResponse.getExpires()));
- return this.wsrmSequence = candidateSequence;
+ addressingProps = AddressingClientUtil.createDefaultProps(action, address);
+ addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(candidateSequence.getBackPort()));
}
- catch (Exception e)
+ else
{
- throw new RMException("Unable to create WSRM sequence", e);
+ addressingProps = AddressingClientUtil.createAnonymousProps(action, address);
}
+ Map requestContext = getBindingProvider().getRequestContext();
+ requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps);
+ // set up wsrm request context
+ QName createSequenceQN = RMProvider.get().getConstants().getCreateSequenceQName();
+ Map rmRequestContext = new HashMap();
+ List outMsgs = new LinkedList();
+ outMsgs.add(createSequenceQN);
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
+ rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, candidateSequence);
+ requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
+ // invoke stub method
+ invoke(createSequenceQN, new Object[] {}, getBindingProvider().getResponseContext());
+ // read WSRM sequence id from response context
+ Map rmResponseContext = (Map)getBindingProvider().getResponseContext().get(RMConstant.RESPONSE_CONTEXT);
+ RMCreateSequenceResponse createSequenceResponse = ((RMCreateSequenceResponse)((Map)rmResponseContext.get(RMConstant.PROTOCOL_MESSAGES_MAPPING)).get(RMProvider.get().getConstants().getCreateSequenceResponseQName()));
+ String outboundId = createSequenceResponse.getIdentifier();
+ candidateSequence.setClient(this);
+ candidateSequence.setOutboundId(outboundId);
+ candidateSequence.setBehavior(createSequenceResponse.getIncompleteSequenceBehavior());
+ candidateSequence.setDuration(RMHelper.durationToLong(createSequenceResponse.getExpires()));
+ return this.wsrmSequence = candidateSequence;
}
- finally
+ catch (Exception e)
{
- this.getWSRMLock().unlock();
+ throw new RMException("Unable to create WSRM sequence", e);
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-04 16:53:09 UTC (rev 5180)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-04 18:31:13 UTC (rev 5181)
@@ -30,7 +30,6 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -43,6 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.client.ClientImpl;
+import org.jboss.ws.core.utils.UUIDGenerator;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.wsrm.config.RMConfig;
import org.jboss.ws.extensions.wsrm.api.RMAddressingType;
@@ -78,13 +78,9 @@
private long creationTime;
private URI backPort;
private ClientImpl client;
- // object states variables
- private boolean terminated;
- private boolean discarded;
private boolean isFinal;
private AtomicBoolean inboundMessageAckRequested = new AtomicBoolean();
private AtomicLong messageNumber = new AtomicLong();
- private final Object lock = new Object();
private AtomicInteger countOfUnassignedMessagesAvailable = new AtomicInteger();
public void unassignedMessageReceived()
@@ -105,7 +101,7 @@
this.wsrmConfig = wsrmConfig;
try
{
- this.backPort = new URI("http://localhost:8888/temporary_listen_address/666"); // TODO: use generator;;
+ this.backPort = new URI("http://localhost:8888/temporary_listen_address/" + UUIDGenerator.generateRandomUUIDString());
}
catch (URISyntaxException use)
{
@@ -115,27 +111,18 @@
public final Set<Long> getReceivedInboundMessages()
{
- synchronized (lock)
- {
- return Collections.unmodifiableSet(this.receivedInboundMessages);
- }
+ return Collections.unmodifiableSet(this.receivedInboundMessages);
}
public final BindingProvider getBindingProvider()
{
- synchronized (lock)
- {
- return (BindingProvider)this.client;
- }
+ return (BindingProvider)this.client;
}
public final void setFinal()
{
- synchronized (lock)
- {
- this.isFinal = true;
- logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final");
- }
+ this.isFinal = true;
+ logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final");
}
public final void ackRequested(boolean requested)
@@ -151,64 +138,43 @@
public final void addReceivedInboundMessage(long messageId)
{
- synchronized (lock)
- {
- this.receivedInboundMessages.add(messageId);
- logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId);
- }
+ this.receivedInboundMessages.add(messageId);
+ logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId);
}
- public final void addReceivedMessage(long messageId)
+ public final void addReceivedOutboundMessage(long messageId)
{
- synchronized (lock)
- {
- this.acknowledgedOutboundMessages.add(messageId);
- logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server");
- }
+ this.acknowledgedOutboundMessages.add(messageId);
+ logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server");
}
public final void setOutboundId(String outboundId)
{
- synchronized (lock)
- {
- this.outgoingSequenceId = outboundId;
- }
+ this.outgoingSequenceId = outboundId;
}
public final void setInboundId(String inboundId)
{
- synchronized (lock)
- {
- this.incomingSequenceId = inboundId;
- }
+ this.incomingSequenceId = inboundId;
}
public final void setClient(ClientImpl client)
{
- synchronized (lock)
- {
- this.client = client;
- }
+ this.client = client;
}
public final void setDuration(long duration)
{
- synchronized (lock)
+ if (duration > 0)
{
- if (duration > 0)
- {
- this.creationTime = System.currentTimeMillis();
- this.duration = duration;
- }
+ this.creationTime = System.currentTimeMillis();
+ this.duration = duration;
}
}
public final long getDuration()
{
- synchronized (lock)
- {
- return this.duration;
- }
+ return this.duration;
}
public final URI getBackPort()
@@ -229,43 +195,16 @@
return this.messageNumber.get();
}
- public final void discard() throws RMException
+ public final void close() throws RMException
{
- synchronized (lock)
+ try
{
- this.client.getWSRMLock().lock();
- try
- {
- this.client.setWSRMSequence(null);
- this.discarded = true;
- }
- finally
- {
- this.client.getWSRMLock().unlock();
- }
+ sendCloseMessage();
+ sendTerminateMessage();
}
- }
-
- public final void close() throws RMException
- {
- synchronized (lock)
+ finally
{
- if (this.terminated)
- return;
-
- this.terminated = true;
-
- try
- {
- sendCloseMessage();
- sendTerminateMessage();
- }
- finally
- {
- client.getWSRMLock().lock();
- this.client.setWSRMSequence(null); // TODO: do not remove this
- this.client.getWSRMLock().unlock();
- }
+ this.client.setWSRMSequence(null);
}
}
@@ -311,13 +250,10 @@
public final void sendCloseMessage()
{
- synchronized (lock)
+ while (this.isAckRequested())
{
- while (this.isAckRequested())
- {
- logger.debug("Waiting till all inbound sequence acknowledgements will be sent");
- sendSequenceAcknowledgementMessage();
- }
+ logger.debug("Waiting till all inbound sequence acknowledgements will be sent");
+ sendSequenceAcknowledgementMessage();
}
Map<String, Object> wsrmReqCtx = new HashMap<String, Object>();
wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, false);
@@ -351,25 +287,12 @@
public final void setBehavior(RMIncompleteSequenceBehavior behavior)
{
- synchronized (lock)
+ if (behavior != null)
{
- if (behavior != null)
- {
- this.behavior = behavior;
- }
+ this.behavior = behavior;
}
}
- public final boolean isCompleted()
- {
- return true;
- }
-
- public final boolean isCompleted(int timeAmount, TimeUnit timeUnit)
- {
- return true;
- }
-
public final String getOutboundId()
{
return outgoingSequenceId;
@@ -380,19 +303,4 @@
return incomingSequenceId;
}
- public final boolean isClosed()
- {
- synchronized (lock)
- {
- return this.terminated;
- }
- }
-
- public final boolean isDiscarded()
- {
- synchronized (lock)
- {
- return this.discarded;
- }
- }
}
Modified: 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-04 16:53:09 UTC (rev 5180)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java 2007-12-04 18:31:13 UTC (rev 5181)
@@ -21,17 +21,7 @@
*/
package org.jboss.ws.extensions.wsrm.api;
-import java.util.concurrent.TimeUnit;
-
public interface RMSequence
{
- String getOutboundId();
- String getInboundId();
- void discard();
- long getDuration();
- boolean isDiscarded();
void close();
- boolean isClosed();
- boolean isCompleted();
- boolean isCompleted(int timeAmount, TimeUnit timeUnit);
}
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-04 16:53:09 UTC (rev 5180)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-04 18:31:13 UTC (rev 5181)
@@ -95,7 +95,7 @@
{
for (long i = range.getLower(); i <= range.getUpper(); i++)
{
- sequence.addReceivedMessage(i);
+ sequence.addReceivedOutboundMessage(i);
}
}
if (seqAckHeader.isFinal())
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-04 16:53:09 UTC (rev 5180)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-04 18:31:13 UTC (rev 5181)
@@ -28,7 +28,6 @@
import java.io.IOException;
import java.net.URL;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -56,6 +55,10 @@
static
{
+ System.out.println("FIXME [JBWS-515] Provide an initial implementation for WS-ReliableMessaging");
+ System.out.println("FIXME [JBWS-1699] Implement the basic message exchange that is required for WS-RM");
+ System.out.println("FIXME [JBWS-1700] Provide a comprehensive test case for WS-RM");
+
// load test properties
File propertiesFile = new File("resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties");
try
@@ -80,17 +83,12 @@
public void testOneWayMethods() throws Exception
{
- System.out.println("FIXME [JBWS-515] Provide an initial implementation for WS-ReliableMessaging");
- System.out.println("FIXME [JBWS-1699] Implement the basic message exchange that is required for WS-RM");
- System.out.println("FIXME [JBWS-1700] Provide a comprehensive test case for WS-RM");
if (true) return; // disable WS-RM tests - they cause regression in hudson
RMSequence sequence = null;
if (emulatorOn)
{
- RMProvider wsrmProvider = (RMProvider)proxy;
- sequence = wsrmProvider.createSequence(getAddressingType());
- System.out.println("Created sequence with id=" + sequence.getOutboundId());
+ sequence = ((RMProvider)proxy).createSequence(getAddressingType());
}
setAddrProps(proxy, "http://useless/action1", serviceURL);
proxy.method1();
@@ -100,11 +98,7 @@
proxy.method3(new String[] {"Hello","World"});
if (emulatorOn)
{
- if (!sequence.isCompleted(1000, TimeUnit.MILLISECONDS)) {
- fail("Sequence not completed within specified time amount");
- } else {
- sequence.close();
- }
+ sequence.close();
}
}
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-04 16:53:09 UTC (rev 5180)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-04 18:31:13 UTC (rev 5181)
@@ -62,6 +62,9 @@
static
{
+ System.out.println("FIXME [JBWS-515] Provide an initial implementation for WS-ReliableMessaging");
+ System.out.println("FIXME [JBWS-1699] Implement the basic message exchange that is required for WS-RM");
+ System.out.println("FIXME [JBWS-1700] Provide a comprehensive test case for WS-RM");
// load test properties
File propertiesFile = new File("resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties");
try
@@ -162,18 +165,12 @@
private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
{
- System.out.println("FIXME [JBWS-515] Provide an initial implementation for WS-ReliableMessaging");
- System.out.println("FIXME [JBWS-1699] Implement the basic message exchange that is required for WS-RM");
- System.out.println("FIXME [JBWS-1700] Provide a comprehensive test case for WS-RM");
if (true) return; // disable WS-RM tests - they cause regression in hudson
RMSequence sequence = null;
if (emulatorOn)
{
- RMProvider wsrmProvider = (RMProvider)proxyObject;
- sequence = wsrmProvider.createSequence(getAddressingType());
- System.out.println("Created sequence with outbound id=" + sequence.getOutboundId());
- System.out.println("Created sequence with inbound id=" + sequence.getInboundId());
+ sequence = ((RMProvider)proxyObject).createSequence(getAddressingType());
}
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
@@ -183,12 +180,7 @@
invokeWebServiceMethod(invocationType);
if (emulatorOn)
{
- if (!sequence.isCompleted(1000, TimeUnit.MILLISECONDS)) {
- sequence.discard();
- fail("Sequence not completed within specified time amount");
- } else {
- sequence.close();
- }
+ sequence.close();
}
}
16 years, 5 months
JBossWS SVN: r5180 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-04 11:53:09 -0500 (Tue, 04 Dec 2007)
New Revision: 5180
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
Log:
repair exchanged messages scenario
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-04 16:52:06 UTC (rev 5179)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-04 16:53:09 UTC (rev 5180)
@@ -272,7 +272,7 @@
/**
* Sets up terminated flag to true.
*/
- private void sendMessage(String action, QName operationQName) throws RMException
+ private void sendMessage(String action, QName operationQName, List protocolMessages) throws RMException
{
try
{
@@ -295,9 +295,7 @@
{
rmRequestContext = new HashMap();
}
- List outMsgs = new LinkedList();
- outMsgs.add(operationQName);
- rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages);
rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, this);
// set up method invocation context
requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props);
@@ -324,12 +322,20 @@
Map<String, Object> wsrmReqCtx = new HashMap<String, Object>();
wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, false);
this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx);
- sendMessage(RMConstant.CLOSE_SEQUENCE_WSA_ACTION, wsrmConstants.getCloseSequenceQName());
+ List msgs = new LinkedList();
+ msgs.add(wsrmConstants.getCloseSequenceQName());
+ sendMessage(RMConstant.CLOSE_SEQUENCE_WSA_ACTION, wsrmConstants.getCloseSequenceQName(), msgs);
}
public final void sendTerminateMessage()
{
- sendMessage(RMConstant.TERMINATE_SEQUENCE_WSA_ACTION, wsrmConstants.getTerminateSequenceQName());
+ List msgs = new LinkedList();
+ msgs.add(wsrmConstants.getTerminateSequenceQName());
+ if (this.getInboundId() != null)
+ {
+ msgs.add(wsrmConstants.getSequenceAcknowledgementQName());
+ }
+ sendMessage(RMConstant.TERMINATE_SEQUENCE_WSA_ACTION, wsrmConstants.getTerminateSequenceQName(), msgs);
}
public final void sendSequenceAcknowledgementMessage()
@@ -338,7 +344,9 @@
wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, true);
this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx);
ackRequested(false);
- sendMessage(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION, wsrmConstants.getSequenceAcknowledgementQName());
+ List msgs = new LinkedList();
+ msgs.add(wsrmConstants.getSequenceAcknowledgementQName());
+ sendMessage(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION, wsrmConstants.getSequenceAcknowledgementQName(), msgs);
}
public final void setBehavior(RMIncompleteSequenceBehavior behavior)
16 years, 5 months
JBossWS SVN: r5179 - in stack/native/trunk/src/test: java/org/jboss/test/ws/jaxws/wsrm/emulator/config and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-04 11:52:06 -0500 (Tue, 04 Dec 2007)
New Revision: 5179
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Constant.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/Request.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/RequestImpl.java
stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml
Log:
extend emulator functionality - enable matching by element content
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Constant.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Constant.java 2007-12-04 15:36:04 UTC (rev 5178)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Constant.java 2007-12-04 16:52:06 UTC (rev 5179)
@@ -59,6 +59,7 @@
public static final String NODE_ELEMENT = "node";
public static final String ID_ATTRIBUTE = "id";
public static final String NAME_ATTRIBUTE = "name";
+ public static final String EQUALS_ATTRIBUTE = "equals";
public static final String RESOURCE_ATTRIBUTE = "resource";
public static final String STATUS_CODE_ATTRIBUTE = "statusCode";
public static final String CONTENT_TYPE_ATTRIBUTE = "contentType";
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java 2007-12-04 15:36:04 UTC (rev 5178)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java 2007-12-04 16:52:06 UTC (rev 5179)
@@ -210,14 +210,19 @@
public static boolean matches(Document req, View view)
{
- List<String> matches = view.getRequest().getMatches();
+ Map<String, String> matches = view.getRequest().getMatches();
if ((matches == null) || (matches.size() == 0))
return true;
boolean match = true;
- for (String matchString : matches)
+ for (String matchString : matches.keySet())
{
match = match && elementExists(req, matchString);
+ String equalsValue = matches.get(matchString);
+ if (match && (null != equalsValue) && (!"".equals(equalsValue)))
+ {
+ match = match && equalsValue.equals(getElement(req, matchString).getTextContent());
+ }
}
return match;
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/Request.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/Request.java 2007-12-04 15:36:04 UTC (rev 5178)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/Request.java 2007-12-04 16:52:06 UTC (rev 5179)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.wsrm.emulator.config;
-import java.util.List;
import java.util.Map;
/**
@@ -35,6 +34,6 @@
{
String getHttpMethod();
String getPathInfo();
- List<String> getMatches();
+ Map<String, String> getMatches();
Map<String, String> getProperties();
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/RequestImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/RequestImpl.java 2007-12-04 15:36:04 UTC (rev 5178)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/config/RequestImpl.java 2007-12-04 16:52:06 UTC (rev 5179)
@@ -46,7 +46,7 @@
private final String httpMethod;
private final String pathInfo;
private final Map<String, String> properties;
- private final List<String> matches;
+ private final Map<String, String> matches;
RequestImpl(Element e, Map<String, String> namespaces)
{
@@ -56,17 +56,18 @@
if ((contains != null) && (contains.getLength() == 1))
{
NodeList nodes = ((Element)contains.item(0)).getElementsByTagName(NODE_ELEMENT);
- List<String> toFill = new LinkedList<String>();
- this.matches = Collections.unmodifiableList(toFill);
+ Map<String, String> toFill = new HashMap<String, String>();
+ this.matches = Collections.unmodifiableMap(toFill);
for (int i = 0; i < nodes.getLength(); i++)
{
String nameAttrValue = ((Element)nodes.item(i)).getAttribute(NAME_ATTRIBUTE);
- toFill.add(Util.replaceAll(nameAttrValue, namespaces));
+ String equalsAttrValue = ((Element)nodes.item(i)).getAttribute(EQUALS_ATTRIBUTE);
+ toFill.put(Util.replaceAll(nameAttrValue, namespaces), equalsAttrValue);
}
}
else
{
- this.matches = Collections.emptyList();
+ this.matches = Collections.emptyMap();
}
NodeList setNodes = e.getElementsByTagName(SET_ELEMENT);
if ((setNodes != null) && (setNodes.getLength() > 0))
@@ -91,7 +92,7 @@
return this.httpMethod;
}
- public final List<String> getMatches()
+ public final Map<String, String> getMatches()
{
return this.matches;
}
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml 2007-12-04 15:36:04 UTC (rev 5178)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml 2007-12-04 16:52:06 UTC (rev 5179)
@@ -54,6 +54,9 @@
<request httpMethod="POST" pathInfo="/ReqResService">
<contains>
<node name="|{${soap}}Envelope|{${soap}}Header|{${wsrm}}SequenceAcknowledgement"/>
+ <node
+ name="|{${soap}}Envelope|{${soap}}Header|{${wsa}}Action"
+ equals="http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement"/>
</contains>
</request>
<response statusCode="200"/>
16 years, 5 months
JBossWS SVN: r5178 - in stack/cxf/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 10:36:04 -0500 (Tue, 04 Dec 2007)
New Revision: 5178
Modified:
stack/cxf/trunk/.classpath
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/version.properties
Log:
Update CXF excludes
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2007-12-04 15:18:39 UTC (rev 5177)
+++ stack/cxf/trunk/.classpath 2007-12-04 15:36:04 UTC (rev 5178)
@@ -9,8 +9,6 @@
<classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="thirdparty/geronimo-javamail_1.4_spec-1.0-M1.jar"/>
<classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
@@ -23,7 +21,7 @@
<classpathentry kind="lib" path="thirdparty/jdom-1.0.jar"/>
<classpathentry kind="lib" path="thirdparty/neethi-2.0.2.jar"/>
<classpathentry kind="lib" path="thirdparty/resolver.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api-1.3.jar"/>
+ <classpathentry kind="lib" path="thirdparty/saaj-api-1.3.jar" sourcepath="apache-cxf"/>
<classpathentry kind="lib" path="thirdparty/saaj-impl-1.3.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-beans-2.0.6.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-context-2.0.6.jar"/>
@@ -37,5 +35,6 @@
<classpathentry kind="lib" path="thirdparty/XmlSchema-1.3.2.jar"/>
<classpathentry kind="lib" path="thirdparty/cxf-2.0.3-incubator.jar" sourcepath="apache-cxf"/>
<classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/>
+ <classpathentry kind="lib" path="tools/ant/lib/junit.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-04 15:18:39 UTC (rev 5177)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-04 15:36:04 UTC (rev 5178)
@@ -47,9 +47,12 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-04 15:18:39 UTC (rev 5177)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-04 15:36:04 UTC (rev 5178)
@@ -16,29 +16,30 @@
org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
org/jboss/test/ws/jaxws/samples/swaref/**
+# [JBWS-1683] Fix JAXR samples for CXF
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1756] Fix @WebServiceRef with CXF
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/serviceref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
+org/jboss/test/ws/jaxws/smoke/tools/**
+
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
-# [JBWS-1751] Investigate CXF samples handlerchain
+# [CXF-1250] SOAPMessage.getSOAPHeader returns null
org/jboss/test/ws/jaxws/samples/handlerchain/**
-# [JBWS-1752] Investigate CXF samples httpbinding
+# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/provider/**
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1753] Investigate CXF samples logicalhandler
+# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/**
-# [JBWS-1755] Investigate CXF samples provider
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1756] Fix @WebServiceRef with CXF
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/serviceref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
# [JBWS-1757] Investigate CXF samples soapbinding
org/jboss/test/ws/jaxws/samples/soapbinding/**
@@ -51,6 +52,4 @@
# [JBWS-1760] Investigate CXF samples xop
org/jboss/test/ws/jaxws/samples/xop/**
-# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
-org/jboss/test/ws/jaxws/smoke/tools/**
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-12-04 15:18:39 UTC (rev 5177)
+++ stack/cxf/trunk/version.properties 2007-12-04 15:36:04 UTC (rev 5178)
@@ -34,7 +34,7 @@
# Thirdparty library versions
jbossws-framework=2.0.2.GA
-jbossws-common=1.0.2.GA
+jbossws-common=snapshot
jbossws-spi=1.0.0.GA
jbossws-jboss42=4.2.1.GA
16 years, 5 months
JBossWS SVN: r5177 - in stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws: jbws944 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 10:18:39 -0500 (Tue, 04 Dec 2007)
New Revision: 5177
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
Log:
Remove EJB3 extension RemoteBinding, because it is not compatible accross container versions
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2007-12-04 15:12:31 UTC (rev 5176)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2007-12-04 15:18:39 UTC (rev 5177)
@@ -27,11 +27,8 @@
import javax.ejb.Stateless;
import javax.xml.ws.WebServiceRef;
-import org.jboss.annotation.ejb.RemoteBinding;
-
@Stateless
@Remote(EJB3Remote.class)
-@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean")
public class EJB3Bean implements EJB3Remote
{
@WebServiceRef(wsdlLocation = "META-INF/wsdl/TestService.wsdl")
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-12-04 15:12:31 UTC (rev 5176)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-12-04 15:18:39 UTC (rev 5177)
@@ -28,7 +28,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.wsf.spi.annotation.WebContext;
@WebService(name = "EJB3Bean", serviceName = "EJB3BeanService", targetNamespace = "http://org.jboss.ws/jbws944")
@@ -36,7 +35,6 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote({EJB3RemoteBusinessInterface.class,EJB3RemoteInterface.class})
@RemoteHome(EJB3RemoteHome.class)
-@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@Stateless(name = "FooBean01")
public class EJB3Bean01 implements EJB3RemoteBusinessInterface
{
16 years, 5 months