[jbossws-commits] JBossWS SVN: r14220 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/client and 10 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue May 3 06:35:14 EDT 2011
Author: alessio.soldano at jboss.com
Date: 2011-05-03 06:35:13 -0400 (Tue, 03 May 2011)
New Revision: 14220
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
Log:
[JBWS-3285] Remove ws-reliable messaging impl from native stack
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -57,7 +57,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;
@@ -387,15 +386,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/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -23,8 +23,6 @@
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -72,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;
@@ -171,35 +167,21 @@
SOAPElement soapBodyElement = soapBody;
if (style == Style.RPC)
{
- boolean serialize = true;
+ QName opQName = opMetaData.getQName();
+ Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
- if (opMetaData.getEndpointMetaData().getConfig().getRMMetaData() != null)
- {
- // RM hack to JAX-RPC serialization
- if (RMHelper.isRMOperation(opMetaData.getQName()))
- {
- serialize = false;
- }
- }
+ if (debugEnabled)
+ log.debug("Create RPC body element: " + opName);
- if (serialize)
- {
- QName opQName = opMetaData.getQName();
- Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
+ soapBodyElement = new SOAPBodyElementRpc(opName);
+ soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
- if (debugEnabled)
- log.debug("Create RPC body element: " + opName);
-
- 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);
}
}
@@ -322,14 +304,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;
@@ -360,20 +339,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
@@ -423,8 +399,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;
@@ -443,19 +418,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/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -35,9 +35,6 @@
import org.jboss.ws.core.MessageTrace;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.client.transport.NettyClient;
-import org.jboss.ws.extensions.wsrm.transport.RMChannel;
-import org.jboss.ws.extensions.wsrm.transport.RMMetadata;
-import org.jboss.ws.extensions.wsrm.transport.RMTransportHelper;
/**
* SOAPConnection implementation.
@@ -61,8 +58,6 @@
private boolean closed;
private Integer chunkSize;
- private static final RMChannel RM_CHANNEL = RMChannel.getInstance();
-
public HTTPRemotingConnection()
{
@@ -126,39 +121,20 @@
callProps.put(StubExt.PROPERTY_CHUNKED_ENCODING_SIZE, 0);
}
- if (RMTransportHelper.isRMMessage(callProps))
+ NettyClient client = new NettyClient(getMarshaller(), getUnmarshaller());
+ if (chunkSize != null)
{
- try
- {
- Map<String, Object> additionalHeaders = new HashMap<String, Object>();
- populateHeaders(reqMessage, additionalHeaders);
- RMMetadata rmMetadata = new RMMetadata(targetAddress, getMarshaller(), getUnmarshaller(), callProps, additionalHeaders);
- return RM_CHANNEL.send(reqMessage, rmMetadata);
- }
- catch (Throwable t)
- {
- IOException io = new IOException();
- io.initCause(t);
- throw io;
- }
+ client.setChunkSize(chunkSize);
}
- else
- {
- NettyClient client = new NettyClient(getMarshaller(), getUnmarshaller());
- if (chunkSize != null)
- {
- client.setChunkSize(chunkSize);
- }
-
- Map<String, Object> additionalHeaders = new HashMap<String, Object>();
- populateHeaders(reqMessage, additionalHeaders);
- //Trace the outgoing message
- MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
- MessageAbstraction resMessage = (MessageAbstraction)client.invoke(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
- //Trace the incoming response message
- MessageTrace.traceMessage("Incoming Response Message", resMessage);
- return resMessage;
- }
+
+ Map<String, Object> additionalHeaders = new HashMap<String, Object>();
+ populateHeaders(reqMessage, additionalHeaders);
+ //Trace the outgoing message
+ MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
+ MessageAbstraction resMessage = (MessageAbstraction)client.invoke(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
+ //Trace the incoming response message
+ MessageTrace.traceMessage("Incoming Response Message", resMessage);
+ return resMessage;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -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;
@@ -37,9 +35,6 @@
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
-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;
@@ -62,20 +57,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.RMClientSequence;
-import org.jboss.ws.extensions.wsrm.RMConstant;
-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;
import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter;
@@ -89,7 +70,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, FeatureAwareEndpointMetaData
+public class ClientImpl extends CommonClient implements BindingProvider, FeatureAwareEndpointMetaData
{
private static Logger log = Logger.getLogger(ClientImpl.class);
@@ -103,19 +84,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);
@@ -268,33 +236,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
@@ -319,34 +260,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
resContext.putAll(msgContext);
}
@@ -539,73 +452,6 @@
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;
- }
- }
-
//////////////////////////////////////////
// FeatureAwareEndpointMetaData support //
//////////////////////////////////////////
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -47,7 +47,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.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -92,7 +91,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.stubMethods.addAll(Arrays.asList(FeatureAwareEndpointMetaData.class.getMethods()));
this.objectMethods = Arrays.asList(Object.class.getMethods());
}
@@ -172,12 +170,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/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -65,7 +65,6 @@
import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil;
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.ws.core.utils.DelegateClassLoader;
-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;
@@ -413,7 +412,7 @@
T proxy;
try
{
- proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, RMProvider.class, BindingProvider.class, StubExt.class, FeatureAwareEndpointMetaData.class }, handler);
+ proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class, FeatureAwareEndpointMetaData.class }, handler);
}
catch (RuntimeException rte)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -63,7 +63,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;
@@ -273,8 +272,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/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -99,8 +99,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/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -40,8 +40,6 @@
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAlternative;
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion;
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
-import org.jboss.ws.extensions.wsrm.policy.RM10PolicyAssertionDeployer;
-import org.jboss.ws.extensions.wsrm.policy.RM11PolicyAssertionDeployer;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
import org.jboss.wsf.common.addressing.AddressingConstants;
@@ -60,8 +58,6 @@
{
me = new PolicyDeployer();
me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd", WSSecurityAssertionDeployer.class);
- me.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsrmp/200702", RM11PolicyAssertionDeployer.class);
- me.domainDeployerMap.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", RM10PolicyAssertionDeployer.class);
me.domainDeployerMap.put(AddressingConstants.Metadata.NS, AddressingPolicyAssertionDeployer.class);
me.domainDeployerMap.put("http://www.w3.org/2006/05/addressing/wsdl", NopAssertionDeployer.class);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -40,7 +40,6 @@
import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS;
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder;
-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.ServiceMetaData;
@@ -329,12 +328,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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -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;
@@ -189,7 +188,7 @@
}
}
- if ((tmpMethod == null) && (epMetaData.getConfig().getRMMetaData() == null)) // RM hack
+ if (tmpMethod == null)
throw new WSException("Cannot find java method: " + javaName);
}
return tmpMethod;
@@ -484,8 +483,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/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -81,7 +81,6 @@
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;
@@ -367,10 +366,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
+ if (outStream != null)
sendResponse(endpoint, outStream, isFault);
CommonMessageContext.cleanupAttachments(reqMsgContext);
}
Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -73,10 +73,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">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
<property name="provides">UnifiedMetaDataModel</property>
Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -55,10 +55,6 @@
<property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
</deploymentAspect>
- <deploymentAspect class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires" class="java.lang.String">StackEndpointHandler, UnifiedMetaDataModel</property>
- </deploymentAspect>
-
<deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
<property name="provides" class="java.lang.String">UnifiedMetaDataModel</property>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -928,65 +928,6 @@
</manifest>
</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" />
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </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" />
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </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>
</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -291,24 +291,6 @@
</fileset>
</jar>
- <!-- 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"/>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </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">
More information about the jbossws-commits
mailing list