[jbossws-commits] JBossWS SVN: r10199 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/core/client and 19 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 17 02:14:53 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-06-17 02:14:53 -0400 (Wed, 17 Jun 2009)
New Revision: 10199
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wsrm/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/wsrm/
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml
Log:
[JBPAPP-1902] Removing WS-RM initial prototype. Will not be supported in EAP5
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -53,7 +53,6 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -356,15 +355,8 @@
// Get the return object
Object retObj = null;
- boolean isWsrmMessage = msgContext.get(RMConstant.REQUEST_CONTEXT) != null;
- boolean wsrmOneWay = false;
- if (isWsrmMessage)
+ if (oneway == false && handlerPass)
{
- Boolean temp = (Boolean)((Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT)).get(RMConstant.ONE_WAY_OPERATION);
- wsrmOneWay = (temp == null) ? Boolean.FALSE : temp.booleanValue();
- }
- if ((oneway == false && handlerPass) || (isWsrmMessage && (wsrmOneWay == false)))
- {
// Verify
if (binding instanceof CommonSOAPBinding)
((CommonSOAPBinding)binding).checkMustUnderstand(opMetaData);
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -70,8 +70,6 @@
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.utils.MimeUtils;
-import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
@@ -170,15 +168,6 @@
{
boolean serialize = true;
- if (opMetaData.getEndpointMetaData().getConfig().getRMMetaData() != null)
- {
- // RM hack to JAX-RPC serialization
- if (RMHelper.isRMOperation(opMetaData.getQName()))
- {
- serialize = false;
- }
- }
-
if (serialize)
{
QName opQName = opMetaData.getQName();
@@ -318,14 +307,11 @@
}
}
- if (RMHelper.isRMOperation(opMetaData.getQName()) == false) // RM hack
- {
- if (payloadParent == null)
- throw new SOAPException("Cannot find RPC element in");
+ if (payloadParent == null)
+ throw new SOAPException("Cannot find RPC element in");
- QName elName = payloadParent.getElementQName();
- elName = namespaceRegistry.registerQName(elName);
- }
+ QName elName = payloadParent.getElementQName();
+ elName = namespaceRegistry.registerQName(elName);
}
int numParameters = 0;
@@ -364,20 +350,17 @@
}
}
- if (RMHelper.isRMOperation(opMetaData.getQName()) == false)
+ // Verify the numer of parameters matches the actual message payload
+ int numChildElements = 0;
+ Iterator itElements = payloadParent.getChildElements();
+ while (itElements.hasNext())
{
- // Verify the numer of parameters matches the actual message payload
- int numChildElements = 0;
- Iterator itElements = payloadParent.getChildElements();
- while (itElements.hasNext())
- {
- Node node = (Node)itElements.next();
- if (node instanceof SOAPElement)
- numChildElements++;
- }
- if (numChildElements != numParameters)
- throw new WSException("Invalid number of payload elements: " + numChildElements);
+ Node node = (Node)itElements.next();
+ if (node instanceof SOAPElement)
+ numChildElements++;
}
+ if (numChildElements != numParameters)
+ throw new WSException("Invalid number of payload elements: " + numChildElements);
}
// Generic message endpoint
@@ -424,8 +407,7 @@
// 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.
- boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null;
- if (opMetaData.isOneWay() && (false == isWsrmMessage))
+ if (opMetaData.isOneWay())
{
resMessage.getSOAPPart().setContent(null);
return resMessage;
@@ -444,19 +426,16 @@
{
QName opQName = opMetaData.getResponseName();
- if (false == RMHelper.isRMOperation(opQName)) // RM hack
- {
- Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
- soapBodyElement = new SOAPBodyElementRpc(opName);
- soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
+ Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
+ soapBodyElement = new SOAPBodyElementRpc(opName);
+ soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
- // Add soap encodingStyle
- if (opMetaData.getUse() == Use.ENCODED)
- {
- String envURI = soapEnvelope.getNamespaceURI();
- String envPrefix = soapEnvelope.getPrefix();
- soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC);
- }
+ // Add soap encodingStyle
+ if (opMetaData.getUse() == Use.ENCODED)
+ {
+ String envURI = soapEnvelope.getNamespaceURI();
+ String envPrefix = soapEnvelope.getPrefix();
+ soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC);
}
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -51,9 +51,6 @@
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.extensions.wsrm.transport.RMChannel;
-import org.jboss.ws.extensions.wsrm.transport.RMMetadata;
-import org.jboss.ws.extensions.wsrm.transport.RMTransportHelper;
import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.config.EndpointProperty;
@@ -107,8 +104,6 @@
private boolean closed;
private Integer chunkedLength;
- private static final RMChannel RM_CHANNEL = RMChannel.getInstance();
-
public HTTPRemotingConnection()
{
// HTTPClientInvoker connect sends gratuitous POST
@@ -213,48 +208,40 @@
try
{
- if (RMTransportHelper.isRMMessage(callProps))
- {
- RMMetadata rmMetadata = new RMMetadata(getRemotingVersion(), targetAddress, marshaller, unmarshaller, callProps, metadata, clientConfig);
- return RM_CHANNEL.send(reqMessage, rmMetadata);
- }
- else
- {
- Client client = new Client(locator, "jbossws", clientConfig);
- client.connect();
+ Client client = new Client(locator, "jbossws", clientConfig);
+ client.connect();
- client.setMarshaller(marshaller);
+ client.setMarshaller(marshaller);
- client.setUnMarshaller(unmarshaller);
+ client.setUnMarshaller(unmarshaller);
- if (log.isDebugEnabled())
- log.debug("Remoting metadata: " + metadata);
+ if (log.isDebugEnabled())
+ log.debug("Remoting metadata: " + metadata);
- // debug the outgoing message
- MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
+ // debug the outgoing message
+ MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
- MessageAbstraction resMessage = null;
+ MessageAbstraction resMessage = null;
- if (oneway == true)
- {
- client.invokeOneway(reqMessage, metadata, false);
- }
- else
- {
- resMessage = (MessageAbstraction)client.invoke(reqMessage, metadata);
- }
+ if (oneway == true)
+ {
+ client.invokeOneway(reqMessage, metadata, false);
+ }
+ else
+ {
+ resMessage = (MessageAbstraction)client.invoke(reqMessage, metadata);
+ }
- // Disconnect the remoting client
- client.disconnect();
+ // Disconnect the remoting client
+ client.disconnect();
- callProps.clear();
- callProps.putAll(metadata);
+ callProps.clear();
+ callProps.putAll(metadata);
- // trace the incomming response message
- MessageTrace.traceMessage("Incoming Response Message", resMessage);
+ // trace the incomming response message
+ MessageTrace.traceMessage("Incoming Response Message", resMessage);
- return resMessage;
- }
+ return resMessage;
}
catch (Throwable th)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -21,11 +21,9 @@
*/
package org.jboss.ws.core.jaxws.client;
-import java.net.URI;
import java.rmi.RemoteException;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -36,9 +34,6 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.handler.MessageContext;
@@ -50,7 +45,6 @@
import javax.xml.ws.soap.SOAPFaultException;
import org.jboss.remoting.transport.http.HTTPMetadataConstants;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonClient;
import org.jboss.ws.core.CommonMessageContext;
@@ -61,19 +55,6 @@
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.extensions.addressing.AddressingClientUtil;
-import org.jboss.ws.extensions.wsrm.RMAddressingConstants;
-import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.RMClientSequence;
-import org.jboss.ws.extensions.wsrm.api.RMException;
-import org.jboss.ws.extensions.wsrm.common.RMHelper;
-import org.jboss.ws.extensions.wsrm.protocol.RMConstants;
-import org.jboss.ws.extensions.wsrm.protocol.RMProvider;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMAckRequested;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMCreateSequenceResponse;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMSequence;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMSequenceAcknowledgement;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMSerializable;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -86,7 +67,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-Jul-2006
*/
-public class ClientImpl extends CommonClient implements org.jboss.ws.extensions.wsrm.api.RMProvider, BindingProvider
+public class ClientImpl extends CommonClient implements BindingProvider
{
// the associated endpoint meta data
@@ -99,19 +80,6 @@
private Map<HandlerType, HandlerChainExecutor> executorMap = new HashMap<HandlerType, HandlerChainExecutor>();
private static HandlerType[] HANDLER_TYPES = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
- // WS-RM sequence associated with the proxy
- private RMClientSequence wsrmSequence;
-
- public final void setWSRMSequence(RMClientSequence wsrmSequence)
- {
- this.wsrmSequence = wsrmSequence;
- }
-
- public final RMClientSequence getWSRMSequence()
- {
- return this.wsrmSequence;
- }
-
public ClientImpl(EndpointMetaData epMetaData, HandlerResolver handlerResolver)
{
super(epMetaData);
@@ -256,33 +224,6 @@
// request context is copied to the message context with a scope of HANDLER.
Map<String, Object> reqContext = getBindingProvider().getRequestContext();
- if (this.wsrmSequence != null)
- {
- if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
- {
- 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>();
- wsrmSequence.newMessageNumber();
- 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);
try
@@ -307,33 +248,6 @@
{
msgContext = MessageContextAssociation.peekMessageContext();
- if (this.wsrmSequence != null)
- {
- if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
- {
- 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))
- {
- 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);
- }
- }
- }
- }
// Copy the inbound msg properties to the binding's response context
for (String key : msgContext.keySet())
@@ -519,70 +433,4 @@
return Boolean.TRUE.equals(bool);
}
- ///////////////////
- // WS-RM support //
- ///////////////////
- @SuppressWarnings("unchecked")
- public void createSequence() throws RMException
- {
- if (this.wsrmSequence != null)
- throw new IllegalStateException("Sequence already registered with proxy instance");
-
- try
- {
- // set up addressing data
- RMClientSequence candidateSequence = new RMClientSequence(this.epConfigMetaData.getConfig().getRMMetaData());
- String address = getEndpointMetaData().getEndpointAddress();
- String action = RMAddressingConstants.CREATE_SEQUENCE_WSA_ACTION;
- AddressingProperties addressingProps = null;
- URI backPort = candidateSequence.getBackPort();
- if (backPort != null)
- {
- addressingProps = AddressingClientUtil.createDefaultProps(action, address);
- addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(backPort));
- }
- 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()));
- 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/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -46,7 +46,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.wsf.common.JavaUtils;
@@ -90,7 +89,6 @@
this.executor = executor;
this.stubMethods = new ArrayList(Arrays.asList(BindingProvider.class.getMethods()));
this.stubMethods.addAll(Arrays.asList(StubExt.class.getMethods()));
- this.stubMethods.addAll(Arrays.asList(RMProvider.class.getMethods()));
this.objectMethods = Arrays.asList(Object.class.getMethods());
}
@@ -161,12 +159,6 @@
private Object invoke(QName opName, Object[] args, Class retType, Map<String, Object> resContext) throws RemoteException
{
- boolean rmDetected = this.client.getEndpointConfigMetaData().getConfig().getRMMetaData() != null;
- boolean rmActivated = client.getWSRMSequence() != null;
- if (rmDetected && !rmActivated)
- {
- client.createSequence();
- }
Object retObj = client.invoke(opName, args, resContext);
if (retObj != null)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -61,7 +61,6 @@
import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl;
import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil;
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
-import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder;
import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
@@ -397,7 +396,7 @@
T proxy;
try
{
- proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, RMProvider.class, BindingProvider.class, StubExt.class }, handler);
+ proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class }, handler);
}
catch (RuntimeException rte)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -60,7 +60,6 @@
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.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -262,8 +261,7 @@
msgContext.setMessageAbstraction(resMessage);
}
- boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null;
- if ((oneway == false) || (isWsrmMessage)) // RM hack
+ if (oneway == false)
{
// 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/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -97,8 +97,7 @@
if (soapBodyElement == null)
{
- boolean wsrmDisabled = epMetaData.getConfig().getRMMetaData() == null;
- if ((epMetaData.getStyle() == Style.RPC) && (wsrmDisabled)) // RM hack
+ if (epMetaData.getStyle() == Style.RPC)
throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
// [JBWS-1125] Support empty soap body elements
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -36,7 +36,6 @@
import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS;
import org.jboss.ws.core.soap.Style;
-import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -305,12 +304,6 @@
// Eager initialization
epMetaData.eagerInitialize();
- // wsrm initialization
- if (epMetaData.getConfig().getRMMetaData() != null)
- {
- RMHelper.setupRMOperations(epMetaData);
- }
-
if(log.isDebugEnabled()) log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData());
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -40,7 +39,6 @@
public abstract class CommonConfig
{
private String configName;
- private RMConfig wsrmCfg;
private List<URI> features = new ArrayList<URI>();
private List<EndpointProperty> properties = new ArrayList<EndpointProperty>();
@@ -74,16 +72,6 @@
features.remove(nameToURI(type));
}
- public void setRMMetaData(RMConfig wsrmCfg)
- {
- this.wsrmCfg = wsrmCfg;
- }
-
- public RMConfig getRMMetaData()
- {
- return this.wsrmCfg;
- }
-
public void addProperty(String name, String value)
{
EndpointProperty p = new EndpointProperty();
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -21,8 +21,6 @@
*/
package org.jboss.ws.metadata.config.binding;
-import javax.xml.namespace.QName;
-
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.config.jaxws.ClientConfigJAXWS;
@@ -34,11 +32,6 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
-import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig;
-import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig;
-import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
/**
* ObjectModelFactory for JAXWS configurations.
@@ -127,114 +120,10 @@
commonConfig.setPostHandlerChains(postHandlerChains);
return postHandlerChains;
}
- if ("reliable-messaging".equals(localName))
- {
- RMConfig wsrmCfg = new RMConfig();
- commonConfig.setRMMetaData(wsrmCfg);
- return wsrmCfg;
- }
return null;
}
- public Object newChild(RMConfig wsrmConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- int countOfAttributes = attrs.getLength();
-
- if (localName.equals("delivery-assurance"))
- {
- RMDeliveryAssuranceConfig deliveryAssurance = getDeliveryAssurance(attrs);
- wsrmConfig.setDeliveryAssurance(deliveryAssurance);
- return deliveryAssurance;
- }
- if (localName.equals("message-retransmission"))
- {
- int interval = 0, attempts = 0, timeout=0;
- for (int i = 0; i < countOfAttributes; i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("interval"))
- interval = Integer.valueOf(attrs.getValue(i));
- if (attrLocalName.equals("attempts"))
- attempts = Integer.valueOf(attrs.getValue(i));
- if (attrLocalName.equals("timeout"))
- timeout = Integer.valueOf(attrs.getValue(i));
- }
-
- RMMessageRetransmissionConfig retransmissionConfig = new RMMessageRetransmissionConfig();
- retransmissionConfig.setCountOfAttempts(attempts);
- retransmissionConfig.setRetransmissionInterval(interval);
- retransmissionConfig.setMessageTimeout(timeout);
- wsrmConfig.setMessageRetransmission(retransmissionConfig);
- return retransmissionConfig;
- }
- if (localName.equals("backports-server"))
- {
- String host = null, port = null;
- for (int i = 0; i < countOfAttributes && (host == null || port == null); i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("host"))
- host = attrs.getValue(i);
- if (attrLocalName.equals("port"))
- port = attrs.getValue(i);
- }
-
- RMBackPortsServerConfig backportsServer = new RMBackPortsServerConfig();
- backportsServer.setHost(host);
- backportsServer.setPort(port);
- wsrmConfig.setBackPortsServer(backportsServer);
- return backportsServer;
- }
- if (localName.equals("port"))
- {
- String portName = null;
- for (int i = 0; i < countOfAttributes; i++)
- {
- if (attrs.getLocalName(i).equals("name"))
- {
- portName = attrs.getValue(i);
- break;
- }
- }
- RMPortConfig port = new RMPortConfig();
- port.setPortName(QName.valueOf(portName));
- wsrmConfig.getPorts().add(port);
- return port;
- }
-
- return null;
- }
-
- public Object newChild(RMPortConfig port, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- if (localName.equals("delivery-assurance"))
- {
- RMDeliveryAssuranceConfig deliveryAssurance = getDeliveryAssurance(attrs);
- port.setDeliveryAssurance(deliveryAssurance);
- return deliveryAssurance;
- }
-
- return null;
- }
-
- private RMDeliveryAssuranceConfig getDeliveryAssurance(Attributes attrs)
- {
- String inOrder = null, quality = null;
- for (int i = 0; i < attrs.getLength() && (inOrder == null || quality == null); i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("inOrder"))
- inOrder = attrs.getValue(i);
- if (attrLocalName.equals("quality"))
- quality = attrs.getValue(i);
- }
- RMDeliveryAssuranceConfig deliveryAssurance = new RMDeliveryAssuranceConfig();
- deliveryAssurance.setQuality(quality);
- deliveryAssurance.setInOrder(inOrder);
- return deliveryAssurance;
- }
-
/**
* Called when parsing of a new element started.
*/
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -62,8 +62,6 @@
import org.jboss.ws.core.jaxws.client.DispatchBinding;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
import org.jboss.ws.metadata.accessor.AccessorFactory;
import org.jboss.ws.metadata.accessor.AccessorFactoryCreator;
import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator;
@@ -866,62 +864,12 @@
log.debug("Create new config [name=" + configName + ",file=" + configFile + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- List<RMPortConfig> rmPortMetaData = null;
- if (base != null)
- {
- rmPortMetaData = backupRMMD(base.getConfig());
- }
CommonConfig config = factory.getConfig(getRootFile(), configName, configFile);
- propagateRMMD(rmPortMetaData, config);
toInitialise.setConfig(config);
toInitialise.configHandlerMetaData();
}
- private List<RMPortConfig> backupRMMD(CommonConfig config)
- {
- if ((config != null) && (config.getRMMetaData() != null))
- return config.getRMMetaData().getPorts();
-
- return null;
- }
-
- private void propagateRMMD(List<RMPortConfig> backedUpMD, CommonConfig config)
- {
- if ((backedUpMD != null) && (backedUpMD.size() > 0))
- {
- if (config.getRMMetaData() == null)
- {
- config.setRMMetaData(new RMConfig());
- config.getRMMetaData().getPorts().addAll(backedUpMD);
- }
- else
- {
- // RM policy specified in config file will be always used
- List<RMPortConfig> ports = config.getRMMetaData().getPorts();
- for (RMPortConfig portMD : backedUpMD)
- {
- QName portName = portMD.getPortName();
- if (!contains(ports, portName))
- {
- ports.add(portMD);
- }
- }
- }
- }
- }
-
- private boolean contains(List<RMPortConfig> ports, QName portName)
- {
- for (RMPortConfig pMD : ports)
- {
- if (pMD.getPortName().equals(portName))
- return true;
- }
-
- return false;
- }
-
public List<Class> getRegisteredTypes()
{
return Collections.unmodifiableList(registeredTypes);
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -36,7 +36,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.extensions.wsrm.protocol.RMProvider;
import org.jboss.wsf.common.JavaUtils;
import org.w3c.dom.Element;
@@ -184,7 +183,7 @@
}
}
- if ((tmpMethod == null) && (epMetaData.getConfig().getRMMetaData() == null)) // RM hack
+ if (tmpMethod == null)
throw new WSException("Cannot find java method: " + javaName);
}
return tmpMethod;
@@ -479,8 +478,7 @@
}
// Report unsynchronized java method
- boolean isRMMethod = RMProvider.get().getConstants().getNamespaceURI().equals(qname.getNamespaceURI());
- if ((javaMethod == null) && (isRMMethod == false)) // RM hack
+ if (javaMethod == null)
{
StringBuilder errMsg = new StringBuilder("Cannot synchronize to any of these methods:");
for (Method method : unsynchronizedMethods)
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -79,14 +79,12 @@
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser;
import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.spi.SPIProvider;
@@ -325,11 +323,7 @@
}
}
- Map<String, Object> rmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT);
- boolean isWsrmMessage = rmResCtx != null;
- boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION);
- if ((outStream != null) && (isWsrmOneWay == false)) // RM hack
- sendResponse(endpoint, outStream, isFault);
+ sendResponse(endpoint, outStream, isFault);
}
catch (Exception ex)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-17 06:14:53 UTC (rev 10199)
@@ -79,10 +79,6 @@
<property name="requires">UnifiedMetaDataModel</property>
</bean>
- <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
- </bean>
-
<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
<property name="provides">UnifiedMetaDataModel</property>
@@ -114,7 +110,6 @@
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
<inject bean="WSNativePublishContractDeploymentAspect"/>
<inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
<inject bean="WSNativeEagerInitializeDeploymentAspect"/>
<inject bean="WSJAXBIntroDeploymentAspect"/>
@@ -134,7 +129,6 @@
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
<inject bean="WSNativePublishContractDeploymentAspect"/>
<inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
<inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
@@ -153,7 +147,6 @@
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
<inject bean="WSNativePublishContractDeploymentAspect"/>
<inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
<inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2009-06-17 06:14:53 UTC (rev 10199)
@@ -43,7 +43,6 @@
<xsd:complexType name="commonConfigType">
<xsd:sequence>
<xsd:element name="config-name" type="xsd:string"/>
- <xsd:element name="reliable-messaging" type="tns:rmConfigType" minOccurs="0"/>
<xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/>
<xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/>
<xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/>
@@ -58,128 +57,4 @@
</xsd:sequence>
</xsd:complexType>
- <!-- WSRM configuration -->
- <xsd:complexType name="rmConfigType">
- <xsd:sequence>
- <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Global WS-RM delivery assurance configuration that applies to all WSDL ports.
- If there is the WS-Policy with attached WS-RM assertion in WSDL
- associated with some port or its associated binding it
- will always override this global configuration.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="backports-server" type="tns:backportsServerType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Backports server configuration to be used for addressable clients.
- If element is not present in client configuration then client is anonymous.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="message-retransmission" type="tns:messageRetransmissionType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Message retransmission allow users to configure the QoS of WS-RM.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="port" type="tns:portType" minOccurs="0" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>
- WSDL port specific WS-RM delivery assurance configuration.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="messageRetransmissionType">
- <xsd:attribute name="interval" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Message retransmission interval (in seconds)
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="attempts" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Maximum count of message retransmission attempts.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="timeout" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Maximum count of seconds to wait for response.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="backportsServerType">
- <xsd:attribute name="host" type="xsd:string" use="optional">
- <xsd:annotation>
- <xsd:documentation>
- Host name to be used for backports server. If not specified default one will be detected.
- Make sure you have DNS correctly configured so runtime is able to detect your real hostname.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="port" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Port number to be used for backports server.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="deliveryAssuranceType">
- <xsd:attribute name="quality" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Quality of service to be ensured.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="AtLeastOnce"/>
- <xsd:enumeration value="AtMostOnce"/>
- <xsd:enumeration value="ExactlyOnce"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="inOrder" type="xsd:boolean" use="required">
- <xsd:annotation>
- <xsd:documentation>
- In order quality of service to be ensured. Set this attribute to 'true' to ensure in order message delivery.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="portType">
- <xsd:sequence>
- <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType">
- <xsd:annotation>
- <xsd:documentation>
- This WSDL port specific WS-RM delivery assurance configuration
- applies to all its operations.
- This configuration always overrides the global configuration.
- If there is a WS-Policy with attached WS-RM assertion in WSDL
- associated with this port or its associated binding it
- will be always overriden this port specific configuration.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required">
- <xsd:annotation>
- <xsd:documentation>
- WSDL port name specified in the form {namespace}localPart.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
-
</xsd:schema>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-17 06:14:53 UTC (rev 10199)
@@ -750,57 +750,6 @@
</classes>
</war>
- <!-- jaxws-wsrm -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF">
- <include name="wsrm-jaxws-endpoint-config.xml"/>
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" prefix="WEB-INF/wsdl"/>
- <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/>
- </war>
-
- <war warfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF">
- <include name="wsrm-jaxws-endpoint-config.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/WEB-INF">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/wsdl" prefix="WEB-INF/wsdl"/>
- <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/>
- </war>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-wsrm-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF">
- <include name="wsrm-jaxws-client-config.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF">
- <include name="wsrm-jaxws-client-config.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/META-INF">
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- </jar>
-
<!-- Please add alphabetically -->
</target>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-17 06:14:53 UTC (rev 10199)
@@ -222,21 +222,6 @@
</classes>
</war>
- <!-- jaxws-samples-wsrm -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
- </classes>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/>
- <zipfileset file="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml" prefix="META-INF"/>
- </war>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/META-INF">
- <include name="wsrm-jaxws-client-config.xml"/>
- </metainf>
- </jar>
-
<!-- jaxws-samples-wssecurity-encrypt -->
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-encrypt.war"
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2009-06-17 06:14:53 UTC (rev 10199)
@@ -26,11 +26,6 @@
import javax.xml.namespace.QName;
-import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig;
-import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
-import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC;
@@ -126,34 +121,4 @@
assertEquals("Wrong property valule", value, "5000");
}
- public void testWSRMConfiguration() throws Exception
- {
- File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml");
- assertTrue(confFile.exists());
-
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL());
- EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard WSRM Endpoint");
- RMConfig wsrmConfig = epConfig.getRMMetaData();
- assertNotNull(wsrmConfig);
- RMDeliveryAssuranceConfig deliveryAssurance = wsrmConfig.getDeliveryAssurance();
- assertEquals(deliveryAssurance.getInOrder(), "true");
- assertEquals(deliveryAssurance.getQuality(), "AtLeastOnce");
- List<RMPortConfig> ports = wsrmConfig.getPorts();
- RMPortConfig port1 = ports.get(0);
- assertEquals(port1.getPortName(), new QName("http://custom/namespace/", "Port1"));
- assertEquals(port1.getDeliveryAssurance().getInOrder(), "false");
- assertEquals(port1.getDeliveryAssurance().getQuality(), "AtMostOnce");
- RMPortConfig port2 = ports.get(1);
- assertEquals(port2.getPortName(), new QName("http://custom/namespace/", "Port2"));
- assertEquals(port2.getDeliveryAssurance().getInOrder(), "true");
- assertEquals(port2.getDeliveryAssurance().getQuality(), "ExactlyOnce");
- RMBackPortsServerConfig backportsServer = wsrmConfig.getBackPortsServer();
- assertEquals(backportsServer.getHost(), "realhostname.realdomain");
- assertEquals(backportsServer.getPort(), "9999");
- RMMessageRetransmissionConfig messageRetransmission = wsrmConfig.getMessageRetransmission();
- assertEquals(messageRetransmission.getCountOfAttempts(), 50);
- assertEquals(messageRetransmission.getRetransmissionInterval(), 10);
- assertEquals(messageRetransmission.getMessageTimeout(), 3);
- }
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2009-06-16 12:41:21 UTC (rev 10198)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2009-06-17 06:14:53 UTC (rev 10199)
@@ -39,21 +39,4 @@
</endpoint-config>
- <endpoint-config>
-
- <config-name>Standard WSRM Endpoint</config-name>
- <reliable-messaging>
- <delivery-assurance inOrder="true" quality="AtLeastOnce"/>
- <backports-server host="realhostname.realdomain" port="9999"/>
- <message-retransmission attempts="50" interval="10" timeout="3"/>
- <port name="{http://custom/namespace/}Port1">
- <delivery-assurance inOrder="false" quality="AtMostOnce"/>
- </port>
- <port name="{http://custom/namespace/}Port2">
- <delivery-assurance inOrder="true" quality="ExactlyOnce"/>
- </port>
- </reliable-messaging>
-
- </endpoint-config>
-
</jaxws-config>
More information about the jbossws-commits
mailing list