June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3570 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-13 10:42:48 -0400 (Wed, 13 Jun 2007) New Revision: 3570 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java Log: wsa:To is not a required element Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-13 14:31:02 UTC (rev 3569) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-13 14:42:48 UTC (rev 3570) @@ -23,7 +23,6 @@ //$Id$ -import org.jboss.util.NotImplementedException; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; @@ -53,6 +52,8 @@ * read and write the Message Addressing Properties to a <code>SOAPMessage</code>. * All individual properties must implement <code>SOAPAddressingElement</code>. * + * @See http://www.w3.org/TR/ws-addr-core/ + * * @author Thomas.Diesler(a)jboss.org * @since 15-Nov-2005 */ @@ -96,17 +97,12 @@ AddressingConstants ADDR = builder.newAddressingConstants(); registerNamespaces(ADDR, soapHeader); - // required elements - String action = getRequiredHeaderContent(soapHeader, ADDR.getActionQName()); - String to = getRequiredHeaderContent(soapHeader, ADDR.getToQName()); - - // wsa:Action - // This REQUIRED element of type xs:anyURI conveys the [action] property. - // The [children] of this element convey the value of this property. - setAction(builder.newURI(action)); - // wsa:To - // This REQUIRED element (of type xs:anyURI) provides the value for the [destination] property. + // This OPTIONAL element provides the value for the [destination] property. + // If this element is NOT present then the value of the [destination] + // property is "http://www.w3.org/2005/08/addressing/anonymous". + String to = getOptionalHeaderContent(soapHeader, ADDR.getToQName()); + if(to!=null) setTo(builder.newURI(to)); // Read wsa:From @@ -119,8 +115,9 @@ } // Read wsa:ReplyTo - // This OPTIONAL element (of type wsa:EndpointReferenceType) provides the value for the [reply endpoint] property. - // This element MUST be present if a reply is expected. If this element is present, wsa:MessageID MUST be present. + // This OPTIONAL element provides the value for the [reply endpoint] property. + // If this element is NOT present then the value of the [address] property of the [reply endpoint] + // EPR is "http://www.w3.org/2005/08/addressing/anonymous". Element wsaReplyTo = DOMUtils.getFirstChildElement(soapHeader, ADDR.getReplyToQName()); if (wsaReplyTo != null) { @@ -138,25 +135,20 @@ setFaultTo(ref); } + // wsa:Action + // This REQUIRED element of type xs:anyURI conveys the [action] property. + // The [children] of this element convey the value of this property. + String action = getRequiredHeaderContent(soapHeader, ADDR.getActionQName()); + setAction(builder.newURI(action)); + // Read wsa:MessageID - // This OPTIONAL element conveys the [message id] property. - // This element MUST be present if wsa:ReplyTo or wsa:FaultTo is present. - if(wsaReplyTo!=null || wsaFaultTo!=null) - { - String msgIdValue = getRequiredHeaderContent(soapHeader, ADDR.getMessageIDQName()); - setMessageID(builder.newURI(msgIdValue)); - } - else - { + // This OPTIONAL element (whose content is of type xs:anyURI) conveys the [message id] property. String messageID = getOptionalHeaderContent(soapHeader, ADDR.getMessageIDQName()); if(messageID!=null) setMessageID(builder.newURI(messageID)); - } // Read wsa:RelatesTo - // This OPTIONAL (repeating) element information item contributes one abstract [relationship] property value, - // in the form of a (URI, QName) pair. - // The [children] property of this element (which is of type xs:anyURI) conveys the [message id] - // of the related message. This element MUST be present if the message is a reply. + // This OPTIONAL attribute conveys the relationship type as an IRI. + // When absent, the implied value of this attribute is "http://www.w3.org/2005/08/addressing/reply". Iterator itRelatesTo = DOMUtils.getChildElements(soapHeader, ADDR.getRelatesToQName()); List<Relationship> relList = new ArrayList<Relationship>(); while (itRelatesTo.hasNext()) @@ -222,18 +214,15 @@ SOAPFactoryImpl factory = (SOAPFactoryImpl)SOAPFactory.newInstance(); SOAPHeader soapHeader = message.getSOAPHeader(); - // Assert on REQUIRED elements wsa:Action and wsa:To - if (getAction() == null) - throw new AddressingException("Required addressing header missing: " + ADDR.getActionQName()); - if (getTo() == null) - throw new AddressingException("Required addressing header missing: " + ADDR.getToQName()); - // Add the xmlns:wsa declaration soapHeader.addNamespaceDeclaration(ADDR.getNamespacePrefix(), ADDR.getNamespaceURI()); - // Write REQUIRED wsa:Action and wsa:To - appendRequiredHeader(soapHeader, ADDR.getActionQName(), getAction()); - appendRequiredHeader(soapHeader, ADDR.getToQName(), getTo()); + // Write wsa:To + if (getTo() != null) + { + SOAPElement element = soapHeader.addChildElement(new NameImpl(ADDR.getToQName())); + element.addTextNode(getTo().getURI().toString()); + } // Write wsa:From if (getFrom() != null) @@ -265,6 +254,8 @@ soapHeader.addChildElement(soapElement); } + appendRequiredHeader(soapHeader, ADDR.getActionQName(), getAction()); + // Write wsa:MessageID if( (getReplyTo()!=null || getFaultTo()!=null) && null==getMessageID()) { @@ -303,12 +294,15 @@ } catch (SOAPException ex) { - throw new AddressingException("Cannot read headers", ex); + throw new AddressingException("Cannot read ws-addressing headers", ex); } } private void appendRequiredHeader(SOAPHeader soapHeader, QName name, AttributedURI value) throws SOAPException { + if(null == value) + throw new AddressingException("Required addressing property missing: " + name); + SOAPElement element = soapHeader.addChildElement(new NameImpl(name)); element.addTextNode(value.getURI().toString());

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3569 - in branches/jbossws-2.0/jbossws-core/src: main/java/org/jboss/ws/extensions/addressing/jaxws and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-13 10:31:02 -0400 (Wed, 13 Jun 2007) New Revision: 3569 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java Log: Fix JBWS-1263 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -36,7 +36,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import java.util.Set; +import java.util.HashSet; + /** * A client side handler that reads/writes the addressing properties * and puts then into the message context. @@ -49,27 +53,27 @@ // Provide logging private static Logger log = Logger.getLogger(WSAddressingClientHandler.class); - // addressing builder & constants - private AddressingBuilder addrBuilder; - - // should the request be normalized according to the specifications - private boolean normalize; - - public WSAddressingClientHandler() + private static AddressingBuilder ADDR_BUILDER; + private static AddressingConstantsImpl ADDR_CONSTANTS; + private static QName[] HEADERS = new QName[2]; + + static { - addrBuilder = AddressingBuilder.getAddressingBuilder(); - } + ADDR_CONSTANTS = new AddressingConstantsImpl(); + ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - public QName[] getHeaders() + HEADERS[0] = ADDR_CONSTANTS.getActionQName(); + HEADERS[1] = ADDR_CONSTANTS.getToQName(); + } + + public QName[] getHeaders() { - return new QName[] {}; + return HEADERS; } public void init(HandlerInfo handlerInfo) { super.init(handlerInfo); - normalize = "true".equals(handlerInfo.getHandlerConfig().get("normalize")); - } public boolean handleRequest(MessageContext msgContext) @@ -80,31 +84,19 @@ if (addrProps != null) { - if (normalize) - normalizeRequest(msgContext, addrProps); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); addrProps.writeHeaders(soapMessage); } else { // supply default addressing properties - addrProps = (SOAPAddressingPropertiesImpl)addrBuilder.newAddressingProperties(); + addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties(); msgContext.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); - - if (normalize) - normalizeRequest(msgContext, addrProps); } return true; } - /* supply the default addressing properties in case elements are missing */ - private void normalizeRequest(MessageContext msgContext, SOAPAddressingProperties addrProps) - { - // TODO: supply default header - } - public boolean handleResponse(MessageContext msgContext) { if(log.isDebugEnabled()) log.debug("handleResponse"); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -22,6 +22,8 @@ package org.jboss.ws.extensions.addressing.jaxrpc; import java.net.URISyntaxException; +import java.util.Set; +import java.util.HashSet; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; @@ -52,27 +54,27 @@ // Provide logging private static Logger log = Logger.getLogger(WSAddressingServerHandler.class); - // should the request be validated? - private boolean validate = true; - private static AddressingBuilder ADDR_BUILDER; private static AddressingConstantsImpl ADDR_CONSTANTS; + private static QName[] HEADERS = new QName[2]; + static { ADDR_CONSTANTS = new AddressingConstantsImpl(); ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); + + HEADERS[0] = ADDR_CONSTANTS.getActionQName(); + HEADERS[1] = ADDR_CONSTANTS.getToQName(); } public QName[] getHeaders() { - return new QName[] {}; + return HEADERS; } public void init(HandlerInfo handlerInfo) { super.init(handlerInfo); - String strValidate = (String)handlerInfo.getHandlerConfig().get("validate"); - validate = "true".equals(strValidate); } /** @@ -87,10 +89,6 @@ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); addrProps.readHeaders(soapMessage); msgContext.setProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps); - - if (validate) - validateRequest(addrProps); - return true; } @@ -166,14 +164,4 @@ outProps.writeHeaders(soapMessage); } - - /* check wsa formal constraints */ - private void validateRequest(SOAPAddressingProperties addrProps) - { - - // If wsa:ReplyTo is supplied and the message lacks a [message id] property, the processor MUST fault. - if (addrProps.getReplyTo() != null && addrProps.getMessageID() == null) - throw new IllegalArgumentException("wsa:MessageId is required when wsa:ReplyTo is supplied"); - - } } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -21,6 +21,12 @@ */ package org.jboss.ws.extensions.addressing.jaxws; +import org.jboss.logging.Logger; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; + +import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.addressing.AddressingBuilder; @@ -31,16 +37,16 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; import javax.xml.ws.handler.soap.SOAPMessageContext; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; -import org.jboss.logging.Logger; -import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; - /** * A client side handler that reads/writes the addressing properties * and puts then into the message context. * * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com * @since 24-Nov-2005 */ public class WSAddressingClientHandler extends GenericSOAPHandler @@ -48,16 +54,23 @@ // Provide logging private static Logger log = Logger.getLogger(WSAddressingClientHandler.class); - // addressing builder & constants - private AddressingBuilder addrBuilder; + private static AddressingBuilder ADDR_BUILDER; + private static AddressingConstantsImpl ADDR_CONSTANTS; + private static Set<QName> HEADERS = new HashSet<QName>(); + + static + { + ADDR_CONSTANTS = new AddressingConstantsImpl(); + ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - // should the request be normalized according to the specifications - private boolean normalize; + HEADERS.add( ADDR_CONSTANTS.getActionQName()); + HEADERS.add( ADDR_CONSTANTS.getToQName()); + } - public WSAddressingClientHandler() - { - addrBuilder = AddressingBuilder.getAddressingBuilder(); - } + public Set getHeaders() + { + return Collections.unmodifiableSet(HEADERS); + } protected boolean handleOutbound(MessageContext msgContext) { @@ -66,21 +79,15 @@ SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); if (addrProps != null) { - if (normalize) - normalizeRequest(msgContext, addrProps); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); addrProps.writeHeaders(soapMessage); } else { // supply default addressing properties - addrProps = (SOAPAddressingPropertiesImpl)addrBuilder.newAddressingProperties(); + addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties(); msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); - - if (normalize) - normalizeRequest(msgContext, addrProps); } return true; @@ -110,9 +117,4 @@ return true; } - /* supply the default addressing properties in case elements are missing */ - private void normalizeRequest(MessageContext msgContext, SOAPAddressingProperties addrProps) - { - // TODO: supply default header - } } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -21,8 +21,14 @@ */ package org.jboss.ws.extensions.addressing.jaxws; -import java.net.URISyntaxException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; import javax.xml.ws.addressing.AddressingBuilder; import javax.xml.ws.addressing.JAXWSAConstants; @@ -31,19 +37,17 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; import javax.xml.ws.handler.soap.SOAPMessageContext; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; -import org.jboss.logging.Logger; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; - /** * A server side handler that reads/writes the addressing properties * and puts then into the message context. * * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com * @since 24-Nov-2005 */ public class WSAddressingServerHandler extends GenericSOAPHandler @@ -53,14 +57,21 @@ private static AddressingBuilder ADDR_BUILDER; private static AddressingConstantsImpl ADDR_CONSTANTS; + private static Set<QName> HEADERS = new HashSet<QName>(); + static { ADDR_CONSTANTS = new AddressingConstantsImpl(); ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); + + HEADERS.add( ADDR_CONSTANTS.getActionQName()); + HEADERS.add( ADDR_CONSTANTS.getToQName()); } - // should the request be validated? - private boolean validate = true; + public Set getHeaders() + { + return Collections.unmodifiableSet(HEADERS); + } protected boolean handleInbound(MessageContext msgContext) { @@ -72,9 +83,6 @@ msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps); msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION); - if (validate) - validateRequest(addrProps); - return true; } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -51,6 +51,7 @@ private String reqEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" + + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>" + " <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>" + " <wsa:ReplyTo>" + " <wsa:Address>http://business456.example/client1</wsa:Address>" @@ -58,7 +59,6 @@ + " <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" + " </wsa:ReferenceParameters>" + " </wsa:ReplyTo>" - + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>" + " <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>" + " </env:Header>" + " <env:Body/>" @@ -66,8 +66,8 @@ private String resEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" + + " <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" + " <wsa:To>http://business456.example/client1</wsa:To>" + - " <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" + " <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo>" + " <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" + " </env:Header>" + Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -23,6 +23,7 @@ //$Id$ +import javax.jws.WebService; import java.rmi.Remote; import java.rmi.RemoteException; @@ -33,9 +34,10 @@ * * @since 24-Nov-2005 */ -public interface ActionEndpoint extends Remote +@WebService(targetNamespace = "http://org.jboss.ws/addressing/action") +public interface ActionEndpoint { - String foo(String item) throws RemoteException; + String foo(String item); - String bar(String item) throws RemoteException; + String bar(String item); } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -40,7 +40,11 @@ * @since 24-Nov-2005 */ @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebService(name = "ActionEndpoint", targetNamespace = "http://org.jboss.ws/addressing/action", wsdlLocation = "WEB-INF/wsdl/ActionRpcService.wsdl") +@WebService( + name = "ActionEndpoint", + targetNamespace = "http://org.jboss.ws/addressing/action", + endpointInterface = "org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint" +) @EndpointConfig(configName = "Standard WSAddressing Endpoint") public class ActionRpcEndpointImpl implements ActionEndpoint { Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -21,16 +21,22 @@ */ package org.jboss.test.ws.jaxws.wsaddressing.action; -import javax.xml.rpc.Service; - import junit.framework.Test; - +import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.handler.Handler; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + /** * Test endpoint using ws-addressing. - * + * * The wsa:Action should override any other dispatch method * * @author Thomas.Diesler(a)jboss.org @@ -38,27 +44,57 @@ */ public class AddressingActionTestCase extends JBossWSTest { - private static ActionEndpoint rpcEndpoint; + private static ActionEndpoint endpoint; - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war, jaxws-wsaddressing-action-rpc-client.jar"); - } + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war"); + } - protected void setUp() throws Exception - { - super.setUp(); + protected void setUp() throws Exception + { + super.setUp(); - if (rpcEndpoint == null) - { - Service rpcService = (Service)getInitialContext("wsarpc-client").lookup("java:comp/env/service/ActionRpcService"); - rpcEndpoint = (ActionEndpoint)rpcService.getPort(ActionEndpoint.class); - } - } + if (endpoint == null) + { + String wsdlLocation = "http://"+getServerHost()+":8080/jaxws-wsaddressing-action-rpc?wsdl"; + URL wsdlURL = new URL(wsdlLocation); + QName serviceName = new QName("http://org.jboss.ws/addressing/action", "ActionRpcEndpointImplService"); - public void testRpcEndpoint() throws Exception - { - assertEquals("bar:HelloFoo", rpcEndpoint.foo("HelloFoo")); - assertEquals("bar:HelloBar", rpcEndpoint.bar("HelloBar")); - } + Service service = Service.create(wsdlURL, serviceName); + endpoint = service.getPort(ActionEndpoint.class); + } + } + + public void testRpcEndpoint() throws Exception + { + + // Setup a custom chain + List<Handler> customHandlerChain = new ArrayList<Handler>(); + customHandlerChain.add(new CustomAddressingHandler()); + customHandlerChain.add(new WSAddressingClientHandler()); + ((BindingProvider)endpoint).getBinding().setHandlerChain(customHandlerChain); + + assertEquals("foo:HelloFoo", endpoint.foo("HelloFoo")); + assertEquals("bar:HelloBar", endpoint.bar("HelloBar")); + } + + /** + * Verify that our addresing impl. correctly processes + * wsa headers when mustUnderstand=1 is sent + * + * @throws Exception + */ + public void testRpcEndpointEnabledMU() throws Exception + { + + // Setup a custom chain + List<Handler> customHandlerChain = new ArrayList<Handler>(); + customHandlerChain.add(new AddressingHandlerEnableMU()); + customHandlerChain.add(new WSAddressingClientHandler()); + ((BindingProvider)endpoint).getBinding().setHandlerChain(customHandlerChain); + + assertEquals("foo:HelloFoo", endpoint.foo("HelloFoo")); + assertEquals("bar:HelloBar", endpoint.bar("HelloBar")); + } } Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.wsaddressing.action; + +import java.net.URISyntaxException; + +import javax.xml.namespace.QName; + +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.handler.GenericHandler; + +/** + * A client side handler that disables mustUnderstand processing + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Nov-2005 + */ +public class AddressingHandlerEnableMU extends GenericHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(CustomAddressingHandler.class); + + public QName[] getHeaders() + { + return new QName[] {}; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleRequest" + this); + try + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + outProps.setMu(true); + outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-addressing-action-rpc/ActionService")); + outProps.setAction(builder.newURI("urn:wsa-action-bar")); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); + } + catch (URISyntaxException ex) + { + throw new IllegalStateException("Cannot handle request", ex); + } + return true; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.wsaddressing.action; + +import java.net.URISyntaxException; + +import javax.xml.namespace.QName; + +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.handler.GenericHandler; + +/** + * A client side handler for the ws-addressing + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Nov-2005 + */ +public class CustomAddressingHandler extends GenericHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(CustomAddressingHandler.class); + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleRequest" + this); + try + { + SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder(); + SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-addressing-action-rpc/ActionService")); + outProps.setAction(builder.newURI("urn:wsa-action-bar")); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); + } + catch (URISyntaxException ex) + { + throw new IllegalStateException("Cannot handle request", ex); + } + return true; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-13 14:29:56 UTC (rev 3568) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-13 14:31:02 UTC (rev 3569) @@ -39,6 +39,8 @@ /** * Test endpoint using ws-addressing * + * NOTE: This test uses a JAX-RPC client against a JAX-WS endpoint. + * * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 */

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3568 - branches/jbossws-2.0/jbossws-core/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-13 10:29:56 -0400 (Wed, 13 Jun 2007) New Revision: 3568 Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml Log: Remove legacy JAX-RPC test Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-13 14:29:21 UTC (rev 3567) +++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-13 14:29:56 UTC (rev 3568) @@ -357,18 +357,6 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jbossws-client-config.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar>  <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3567 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-13 10:29:21 -0400 (Wed, 13 Jun 2007) New Revision: 3567 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java Log: Implement setMu(boolean) Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-13 14:28:26 UTC (rev 3566) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-13 14:29:21 UTC (rev 3567) @@ -37,10 +37,7 @@ import javax.xml.namespace.QName; import javax.xml.soap.*; -import javax.xml.ws.addressing.AddressingConstants; -import javax.xml.ws.addressing.AddressingException; -import javax.xml.ws.addressing.ReferenceParameters; -import javax.xml.ws.addressing.Relationship; +import javax.xml.ws.addressing.*; import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; import java.lang.reflect.Array; @@ -65,6 +62,8 @@ private NamespaceRegistry nsRegistry = new NamespaceRegistry(); + private boolean mustunderstand; + private String getRequiredHeaderContent(SOAPHeader soapHeader, QName qname) { Element element = DOMUtils.getFirstChildElement(soapHeader, qname); @@ -221,21 +220,20 @@ try { SOAPFactoryImpl factory = (SOAPFactoryImpl)SOAPFactory.newInstance(); - SOAPHeader soapHeader = message.getSOAPHeader(); + // Assert on REQUIRED elements wsa:Action and wsa:To if (getAction() == null) - throw new AddressingException("Required addressing property wsa:Action"); + throw new AddressingException("Required addressing header missing: " + ADDR.getActionQName()); + if (getTo() == null) + throw new AddressingException("Required addressing header missing: " + ADDR.getToQName()); // Add the xmlns:wsa declaration soapHeader.addNamespaceDeclaration(ADDR.getNamespacePrefix(), ADDR.getNamespaceURI()); - // Write wsa:To - if (getTo() != null) - { - SOAPElement wsaTo = soapHeader.addChildElement(new NameImpl(ADDR.getToQName())); - wsaTo.addTextNode(getTo().getURI().toString()); - } + // Write REQUIRED wsa:Action and wsa:To + appendRequiredHeader(soapHeader, ADDR.getActionQName(), getAction()); + appendRequiredHeader(soapHeader, ADDR.getToQName(), getTo()); // Write wsa:From if (getFrom() != null) @@ -266,13 +264,13 @@ soapElement.removeNamespaceDeclaration(ADDR.getNamespacePrefix()); soapHeader.addChildElement(soapElement); } - - // Write wsa:Action - SOAPElement wsaAction = soapHeader.addChildElement(new NameImpl(ADDR.getActionQName())); - wsaAction.addTextNode(getAction().getURI().toString()); - + // Write wsa:MessageID - if (getMessageID() != null) + if( (getReplyTo()!=null || getFaultTo()!=null) && null==getMessageID()) + { + throw new AddressingException("Required addressing header missing:" + ADDR.getMessageIDQName()); + } + else if (getMessageID() != null) { SOAPElement wsaMessageId = soapHeader.addChildElement(new NameImpl(ADDR.getMessageIDQName())); wsaMessageId.addTextNode(getMessageID().getURI().toString()); @@ -309,9 +307,23 @@ } } + private void appendRequiredHeader(SOAPHeader soapHeader, QName name, AttributedURI value) throws SOAPException + { + SOAPElement element = soapHeader.addChildElement(new NameImpl(name)); + element.addTextNode(value.getURI().toString()); + + if(mustunderstand) + { + // add soap:mustUnderstand=1 + String envNS = soapHeader.getParentElement().getNamespaceURI(); + element.addNamespaceDeclaration("soap", envNS); + element.addAttribute(new QName(envNS, "mustUnderstand", "soap"), "1"); + } + } + public void setMu(boolean mu) { - throw new NotImplementedException(); + this.mustunderstand = mu; } private void appendAttributes(SOAPElement soapElement, Map<QName, String> attributes)

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3566 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-13 10:28:26 -0400 (Wed, 13 Jun 2007) New Revision: 3566 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java Log: Cleanup mustUNderstand processing. Rely on binding as HeaderSource only Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-06-13 13:30:03 UTC (rev 3565) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-06-13 14:28:26 UTC (rev 3566) @@ -78,10 +78,16 @@ // provide logging private static Logger log = Logger.getLogger(ClientImpl.class); + // the associated endpoint meta data private final EndpointMetaData epMetaData; + + // Keep a handle on the resolver so that updateConfig calls may revisit the associated chains private final HandlerResolver handlerResolver; + private Map<HandlerType, HandlerChainExecutor> executorMap = new HashMap<HandlerType, HandlerChainExecutor>(); + private static HandlerType[] HANDLER_TYPES = new HandlerType[] {HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST}; + public ClientImpl(EndpointMetaData epMetaData, HandlerResolver handlerResolver) { super(epMetaData); @@ -107,24 +113,29 @@ PortInfo portInfo = getPortInfo(epMetaData); - if (handlerResolver instanceof HandlerResolverImpl) - { - HandlerResolverImpl impl = (HandlerResolverImpl)handlerResolver; - impl.initHandlerChain(epMetaData, HandlerType.PRE, clearExistingHandlers); - impl.initHandlerChain(epMetaData, HandlerType.ENDPOINT, clearExistingHandlers); - impl.initHandlerChain(epMetaData, HandlerType.POST, clearExistingHandlers); + if (handlerResolver != null) + { + + boolean jbossHandlerResolver = handlerResolver instanceof HandlerResolverImpl; + + if (jbossHandlerResolver) // knows about PRE and POST handlers + { + HandlerResolverImpl impl = (HandlerResolverImpl)handlerResolver; + impl.initHandlerChain(epMetaData, HandlerType.PRE, clearExistingHandlers); + impl.initHandlerChain(epMetaData, HandlerType.ENDPOINT, clearExistingHandlers); + impl.initHandlerChain(epMetaData, HandlerType.POST, clearExistingHandlers); - List<Handler> preChain = impl.getHandlerChain(portInfo, HandlerType.PRE); - binding.setHandlerChain(preChain, HandlerType.PRE); - List<Handler> postChain = impl.getHandlerChain(portInfo, HandlerType.POST); - binding.setHandlerChain(postChain, HandlerType.POST); - } + List<Handler> preChain = impl.getHandlerChain(portInfo, HandlerType.PRE); + List<Handler> postChain = impl.getHandlerChain(portInfo, HandlerType.POST); + + binding.setHandlerChain(postChain, HandlerType.POST); + binding.setHandlerChain(preChain, HandlerType.PRE); + } - if (handlerResolver != null) - { - List<Handler> epChain = handlerResolver.getHandlerChain(portInfo); - binding.setHandlerChain(epChain); - } + // The regular handler chain + List<Handler> endpointChain = handlerResolver.getHandlerChain(portInfo); + binding.setHandlerChain(endpointChain); + } } /** @@ -377,22 +388,26 @@ configProvider.setConfigName(configName, configFile); } + /** + * Retrieve header names that can be processed by this binding + * @return + */ public Set<QName> getHeaders() { - if (handlerResolver instanceof HandlerResolverImpl) - return ((HandlerResolverImpl)handlerResolver).getHeaders(); + Set<QName> headers = new HashSet<QName>(); + + BindingExt binding = (BindingExt)getBinding(); - Set<QName> headers = new HashSet<QName>(); - PortInfo portInfo = getPortInfo(epMetaData); - List<Handler> handlerChain = handlerResolver.getHandlerChain(portInfo); - if (handlerChain != null) - { - for (Handler handler : handlerChain) - if (handler instanceof SOAPHandler) - headers.addAll(((SOAPHandler)handler).getHeaders()); - } - - return headers; + for(HandlerType type : HANDLER_TYPES) + { + for(Handler bindingHandler : binding.getHandlerChain(type)) + { + if(bindingHandler instanceof SOAPHandler) + headers.addAll( ((SOAPHandler)bindingHandler).getHeaders()); + } + } + + return headers; } @Override @@ -410,4 +425,4 @@ PortInfo portInfo = new PortInfoImpl(serviceName, portName, bindingID); return portInfo; } -} \ No newline at end of file +}

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3565 - in branches/jbossws-2.0: testsuite and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-13 09:30:03 -0400 (Wed, 13 Jun 2007) New Revision: 3565 Modified: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml branches/jbossws-2.0/testsuite/.classpath branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl Log: [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation Modified: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-13 12:55:06 UTC (rev 3564) +++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-13 13:30:03 UTC (rev 3565) @@ -41,6 +41,8 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-2.0/testsuite/.classpath =================================================================== --- branches/jbossws-2.0/testsuite/.classpath 2007-06-13 12:55:06 UTC (rev 3564) +++ branches/jbossws-2.0/testsuite/.classpath 2007-06-13 13:30:03 UTC (rev 3565) @@ -14,5 +14,6 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/stax-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/wsdl4j.jar" sourcepath="/integration-spi/thirdparty/wsdl4j-src.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-13 12:55:06 UTC (rev 3564) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-13 13:30:03 UTC (rev 3565) @@ -23,6 +23,9 @@ import java.net.URL; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; @@ -54,10 +57,15 @@ Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); + // [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation + Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl"); + String nsURI = wsdl.getNamespace("jbws1616"); + assertEquals("http://jira.jboss.org/jira/browse/JBWS-1616", nsURI); + // [JBWS-1655] Add support for endpoint address rewriting BindingProvider bp = (BindingProvider)port; bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); - + String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); @@ -70,12 +78,26 @@ Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); + // [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation + Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl"); + String nsURI = wsdl.getNamespace("jbws1616"); + assertEquals("http://jira.jboss.org/jira/browse/JBWS-1616", nsURI); + // [JBWS-1655] Add support for endpoint address rewriting BindingProvider bp = (BindingProvider)port; bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); - + String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } + + private Definition getWSDLDefinition(String wsdlLocation) throws Exception + { + WSDLFactory wsdlFactory = WSDLFactory.newInstance(); + WSDLReader wsdlReader = wsdlFactory.newWSDLReader(); + + Definition definition = wsdlReader.readWSDL(null, wsdlLocation); + return definition; + } } Modified: branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl =================================================================== --- branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2007-06-13 12:55:06 UTC (rev 3564) +++ branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2007-06-13 13:30:03 UTC (rev 3565) @@ -8,6 +8,7 @@ <definitions name="TestEndpointService" targetNamespace="http://eardeployment.jaxws/" xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:jbws1616="http://jira.jboss.org/jira/browse/JBWS-1616" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3564 - in branches/jbossws-2.0/jbossws-core/src/test/resources/common: jbws1692 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-13 08:55:06 -0400 (Wed, 13 Jun 2007) New Revision: 3564 Added: branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/ branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/import-node.xml branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/soap-request-template.xml Log: [JBWS-1692] SOAPElement.importNode() not supported Added: branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/import-node.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/import-node.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/import-node.xml 2007-06-13 12:55:06 UTC (rev 3564) @@ -0,0 +1 @@ +<b:Request xmlns:b="urn:custom-ns"/> \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/import-node.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/soap-request-template.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/soap-request-template.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/soap-request-template.xml 2007-06-13 12:55:06 UTC (rev 3564) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> + <SOAP-ENV:Body><a xmlns="urn:custom"/></SOAP-ENV:Body> +</SOAP-ENV:Envelope> \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/common/jbws1692/soap-request-template.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3563 - in branches/jbossws-2.0: build/ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-13 08:52:28 -0400 (Wed, 13 Jun 2007) New Revision: 3563 Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml branches/jbossws-2.0/build/ant.properties.example branches/jbossws-2.0/build/dist/ant.properties.example branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java Log: [JBWS-1624] JBossWS samples don't work with JMX authentication Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-13 12:50:00 UTC (rev 3562) +++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-13 12:52:28 UTC (rev 3563) @@ -324,6 +324,8 @@ <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> + <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> + <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> @@ -360,6 +362,8 @@ <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> + <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> + <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> <!-- http://jira.jboss.com/jira/browse/JBWS-917 <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> Modified: branches/jbossws-2.0/build/ant.properties.example =================================================================== --- branches/jbossws-2.0/build/ant.properties.example 2007-06-13 12:50:00 UTC (rev 3562) +++ branches/jbossws-2.0/build/ant.properties.example 2007-06-13 12:52:28 UTC (rev 3563) @@ -15,6 +15,10 @@ jboss.server.instance=default jboss.bind.address=localhost +# JBoss JMX invoker authentication +#jmx.authentication.username=admin +#jmx.authentication.password=admin + # JBoss Repository #jboss.repository=file:/home/tdiesler/svn/jboss.local.repository jboss.repository=http://repository.jboss.org Modified: branches/jbossws-2.0/build/dist/ant.properties.example =================================================================== --- branches/jbossws-2.0/build/dist/ant.properties.example 2007-06-13 12:50:00 UTC (rev 3562) +++ branches/jbossws-2.0/build/dist/ant.properties.example 2007-06-13 12:52:28 UTC (rev 3563) @@ -19,6 +19,10 @@ #jboss.repository=file:/home/tdiesler/svn/jboss.local.repository jboss.repository=http://repository.jboss.org +# JBoss JMX invoker authentication +#jmx.authentication.username=admin +#jmx.authentication.password=admin + # Java Compiler options javac.debug=yes javac.deprecation=no Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java 2007-06-13 12:50:00 UTC (rev 3562) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java 2007-06-13 12:52:28 UTC (rev 3563) @@ -21,11 +21,21 @@ */ package org.jboss.wsf.spi.test; +import java.io.IOException; +import java.io.Serializable; import java.net.URL; +import java.security.Principal; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanException; import javax.management.MBeanServerConnection; +import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import javax.management.ReflectionException; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; + /** * A JBossWS test helper that deals with test deployment/undeployment, etc. * @@ -37,19 +47,72 @@ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; private MBeanServerConnection server; + private String username; + private String password; public TestDeployerJBoss(MBeanServerConnection server) { this.server = server; + + username = System.getProperty("jmx.authentication.username"); + if ("${jmx.authentication.username}".equals(username)) + username = null; + + password = System.getProperty("jmx.authentication.password"); + if ("${jmx.authentication.password}".equals(password)) + password = null; } public void deploy(URL url) throws Exception { - server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); + invokeMainDeployer("deploy", url); } public void undeploy(URL url) throws Exception { - server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); + invokeMainDeployer("undeploy", url); } + + private void invokeMainDeployer(String methodName, URL url) throws Exception + { + Principal prevUsername = null; + Object prevPassword = null; + + SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor(); + if (username != null || password != null) + { + prevUsername = securityAdaptor.getPrincipal(); + prevPassword = securityAdaptor.getCredential(); + securityAdaptor.setPrincipal(new SimplePrincipal(username)); + securityAdaptor.setCredential(password); + } + + try + { + server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[] { url }, new String[] { "java.net.URL" }); + } + finally + { + if (username != null || password != null) + { + securityAdaptor.setPrincipal(prevUsername); + securityAdaptor.setCredential(prevPassword); + } + } + } + + public static class SimplePrincipal implements Principal, Serializable + { + private String name; + + public SimplePrincipal(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + } }

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3562 - in trunk/jbossws-core: src/main/java/org/jboss/ws/core/jaxws/client and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-13 08:50:00 -0400 (Wed, 13 Jun 2007) New Revision: 3562 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java trunk/jbossws-core/src/test/resources/jaxws/wsaddressing/action/META-INF/ Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java Log: Fix JBWS-1263 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-13 12:50:00 UTC (rev 3562) @@ -356,19 +356,7 @@ <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> <include name="wsdl/**"/> </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jbossws-client-config.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> + </war>  <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -379,20 +379,35 @@ public Set<QName> getHeaders() { - if (handlerResolver instanceof HandlerResolverImpl) - return ((HandlerResolverImpl)handlerResolver).getHeaders(); + Set<QName> headers = new HashSet<QName>(); - Set<QName> headers = new HashSet<QName>(); - PortInfo portInfo = getPortInfo(epMetaData); - List<Handler> handlerChain = handlerResolver.getHandlerChain(portInfo); - if (handlerChain != null) - { - for (Handler handler : handlerChain) - if (handler instanceof SOAPHandler) - headers.addAll(((SOAPHandler)handler).getHeaders()); - } + if (handlerResolver instanceof HandlerResolverImpl) + { + // From resolver + Set resolverHeaders = ((HandlerResolverImpl)handlerResolver).getHeaders(); + headers.addAll(resolverHeaders); + } + else + { + PortInfo portInfo = getPortInfo(epMetaData); + List<Handler> handlerChain = handlerResolver.getHandlerChain(portInfo); + if (handlerChain != null) + { + for (Handler handler : handlerChain) + if (handler instanceof SOAPHandler) + headers.addAll(((SOAPHandler)handler).getHeaders()); + } + } - return headers; + // Add the binding headers as well + // I.e. client calls Binding.setHandlerCain(...) + for(Handler bindingHandler : getBinding().getHandlerChain()) + { + if(bindingHandler instanceof SOAPHandler) + headers.addAll( ((SOAPHandler)bindingHandler).getHeaders()); + } + + return headers; } @Override Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -36,7 +36,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import java.util.Set; +import java.util.HashSet; + /** * A client side handler that reads/writes the addressing properties * and puts then into the message context. @@ -49,27 +53,27 @@ // Provide logging private static Logger log = Logger.getLogger(WSAddressingClientHandler.class); - // addressing builder & constants - private AddressingBuilder addrBuilder; + private static AddressingBuilder ADDR_BUILDER; + private static AddressingConstantsImpl ADDR_CONSTANTS; + private static QName[] HEADERS = new QName[2]; - // should the request be normalized according to the specifications - private boolean normalize; - - public WSAddressingClientHandler() + static { - addrBuilder = AddressingBuilder.getAddressingBuilder(); - } + ADDR_CONSTANTS = new AddressingConstantsImpl(); + ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - public QName[] getHeaders() + HEADERS[0] = ADDR_CONSTANTS.getActionQName(); + HEADERS[1] = ADDR_CONSTANTS.getToQName(); + } + + public QName[] getHeaders() { - return new QName[] {}; + return HEADERS; } public void init(HandlerInfo handlerInfo) { - super.init(handlerInfo); - normalize = "true".equals(handlerInfo.getHandlerConfig().get("normalize")); - + super.init(handlerInfo); } public boolean handleRequest(MessageContext msgContext) @@ -79,32 +83,20 @@ SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.getProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); if (addrProps != null) - { - if (normalize) - normalizeRequest(msgContext, addrProps); - + { SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); addrProps.writeHeaders(soapMessage); } else { // supply default addressing properties - addrProps = (SOAPAddressingPropertiesImpl)addrBuilder.newAddressingProperties(); + addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties(); msgContext.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); - - if (normalize) - normalizeRequest(msgContext, addrProps); } return true; } - /* supply the default addressing properties in case elements are missing */ - private void normalizeRequest(MessageContext msgContext, SOAPAddressingProperties addrProps) - { - // TODO: supply default header - } - public boolean handleResponse(MessageContext msgContext) { if(log.isDebugEnabled()) log.debug("handleResponse"); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -22,6 +22,8 @@ package org.jboss.ws.extensions.addressing.jaxrpc; import java.net.URISyntaxException; +import java.util.Set; +import java.util.HashSet; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; @@ -52,27 +54,27 @@ // Provide logging private static Logger log = Logger.getLogger(WSAddressingServerHandler.class); - // should the request be validated? - private boolean validate = true; - private static AddressingBuilder ADDR_BUILDER; private static AddressingConstantsImpl ADDR_CONSTANTS; - static + private static QName[] HEADERS = new QName[2]; + + static { ADDR_CONSTANTS = new AddressingConstantsImpl(); ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - } + HEADERS[0] = ADDR_CONSTANTS.getActionQName(); + HEADERS[1] = ADDR_CONSTANTS.getToQName(); + } + public QName[] getHeaders() { - return new QName[] {}; + return HEADERS; } public void init(HandlerInfo handlerInfo) { - super.init(handlerInfo); - String strValidate = (String)handlerInfo.getHandlerConfig().get("validate"); - validate = "true".equals(strValidate); + super.init(handlerInfo); } /** @@ -87,10 +89,6 @@ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); addrProps.readHeaders(soapMessage); msgContext.setProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps); - - if (validate) - validateRequest(addrProps); - return true; } @@ -166,14 +164,4 @@ outProps.writeHeaders(soapMessage); } - - /* check wsa formal constraints */ - private void validateRequest(SOAPAddressingProperties addrProps) - { - - // If wsa:ReplyTo is supplied and the message lacks a [message id] property, the processor MUST fault. - if (addrProps.getReplyTo() != null && addrProps.getMessageID() == null) - throw new IllegalArgumentException("wsa:MessageId is required when wsa:ReplyTo is supplied"); - - } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -21,6 +21,12 @@ */ package org.jboss.ws.extensions.addressing.jaxws; +import org.jboss.logging.Logger; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; + +import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.addressing.AddressingBuilder; @@ -31,88 +37,84 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; import javax.xml.ws.handler.soap.SOAPMessageContext; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; -import org.jboss.logging.Logger; -import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; - /** * A client side handler that reads/writes the addressing properties * and puts then into the message context. * * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com * @since 24-Nov-2005 */ public class WSAddressingClientHandler extends GenericSOAPHandler { - // Provide logging - private static Logger log = Logger.getLogger(WSAddressingClientHandler.class); + // Provide logging + private static Logger log = Logger.getLogger(WSAddressingClientHandler.class); - // addressing builder & constants - private AddressingBuilder addrBuilder; + private static AddressingBuilder ADDR_BUILDER; + private static AddressingConstantsImpl ADDR_CONSTANTS; + private static Set<QName> HEADERS = new HashSet<QName>(); - // should the request be normalized according to the specifications - private boolean normalize; + static + { + ADDR_CONSTANTS = new AddressingConstantsImpl(); + ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - public WSAddressingClientHandler() - { - addrBuilder = AddressingBuilder.getAddressingBuilder(); - } + HEADERS.add( ADDR_CONSTANTS.getActionQName()); + HEADERS.add( ADDR_CONSTANTS.getToQName()); + } - protected boolean handleOutbound(MessageContext msgContext) - { - if(log.isDebugEnabled()) log.debug("handleOutbound"); + public Set getHeaders() + { + return Collections.unmodifiableSet(HEADERS); + } - SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); - if (addrProps != null) - { - if (normalize) - normalizeRequest(msgContext, addrProps); + protected boolean handleOutbound(MessageContext msgContext) + { + if(log.isDebugEnabled()) log.debug("handleOutbound"); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - addrProps.writeHeaders(soapMessage); - } - else - { - // supply default addressing properties - addrProps = (SOAPAddressingPropertiesImpl)addrBuilder.newAddressingProperties(); - msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); - msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); + SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); + if (addrProps != null) + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + addrProps.writeHeaders(soapMessage); + } + else + { + // supply default addressing properties + addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties(); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); + msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); + } - if (normalize) - normalizeRequest(msgContext, addrProps); - } + return true; + } - return true; - } + protected boolean handleInbound(MessageContext msgContext) + { + if(log.isDebugEnabled()) log.debug("handleInbound"); - protected boolean handleInbound(MessageContext msgContext) - { - if(log.isDebugEnabled()) log.debug("handleInbound"); + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + if (soapMessage.getSOAPPart().getEnvelope() != null) + { + SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder(); + SOAPAddressingProperties addrProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + addrProps.readHeaders(soapMessage); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND, addrProps); + msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION); + } + } + catch (SOAPException ex) + { + throw new AddressingException("Cannot handle response", ex); + } - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - if (soapMessage.getSOAPPart().getEnvelope() != null) - { - SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder(); - SOAPAddressingProperties addrProps = (SOAPAddressingProperties)builder.newAddressingProperties(); - addrProps.readHeaders(soapMessage); - msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND, addrProps); - msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION); - } - } - catch (SOAPException ex) - { - throw new AddressingException("Cannot handle response", ex); - } + return true; + } - return true; - } - - /* supply the default addressing properties in case elements are missing */ - private void normalizeRequest(MessageContext msgContext, SOAPAddressingProperties addrProps) - { - // TODO: supply default header - } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -21,8 +21,14 @@ */ package org.jboss.ws.extensions.addressing.jaxws; -import java.net.URISyntaxException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; import javax.xml.ws.addressing.AddressingBuilder; import javax.xml.ws.addressing.JAXWSAConstants; @@ -31,129 +37,131 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; import javax.xml.ws.handler.soap.SOAPMessageContext; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; -import org.jboss.logging.Logger; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; - /** * A server side handler that reads/writes the addressing properties * and puts then into the message context. * * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com * @since 24-Nov-2005 */ public class WSAddressingServerHandler extends GenericSOAPHandler { - // Provide logging - private static Logger log = Logger.getLogger(WSAddressingServerHandler.class); + // Provide logging + private static Logger log = Logger.getLogger(WSAddressingServerHandler.class); - private static AddressingBuilder ADDR_BUILDER; - private static AddressingConstantsImpl ADDR_CONSTANTS; - static - { - ADDR_CONSTANTS = new AddressingConstantsImpl(); - ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - } + private static AddressingBuilder ADDR_BUILDER; + private static AddressingConstantsImpl ADDR_CONSTANTS; + private static Set<QName> HEADERS = new HashSet<QName>(); - // should the request be validated? - private boolean validate = true; + static + { + ADDR_CONSTANTS = new AddressingConstantsImpl(); + ADDR_BUILDER = AddressingBuilder.getAddressingBuilder(); - protected boolean handleInbound(MessageContext msgContext) - { - if(log.isDebugEnabled()) log.debug("handleInbound"); + HEADERS.add( ADDR_CONSTANTS.getActionQName()); + HEADERS.add( ADDR_CONSTANTS.getToQName()); + } - SOAPAddressingProperties addrProps = (SOAPAddressingProperties)ADDR_BUILDER.newAddressingProperties(); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - addrProps.readHeaders(soapMessage); - msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps); - msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION); + public Set getHeaders() + { + return Collections.unmodifiableSet(HEADERS); + } - if (validate) - validateRequest(addrProps); + protected boolean handleInbound(MessageContext msgContext) + { + if(log.isDebugEnabled()) log.debug("handleInbound"); - return true; - } + SOAPAddressingProperties addrProps = (SOAPAddressingProperties)ADDR_BUILDER.newAddressingProperties(); + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + addrProps.readHeaders(soapMessage); + msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps); + msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION); - protected boolean handleOutbound(MessageContext msgContext) - { - if(log.isDebugEnabled()) log.debug("handleOutbound"); - handleResponseOrFault(msgContext, false); - return true; - } + return true; + } - /** - * Get a SOAPAddressingProperties object from the message context - * and write the adressing headers - */ - public boolean handleFault(MessageContext msgContext) - { - if(log.isDebugEnabled()) log.debug("handleFault"); - handleResponseOrFault(msgContext, true); - return true; - } + protected boolean handleOutbound(MessageContext msgContext) + { + if(log.isDebugEnabled()) log.debug("handleOutbound"); + handleResponseOrFault(msgContext, false); + return true; + } - private void handleResponseOrFault(MessageContext msgContext, boolean isFault) - { - SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder(); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + /** + * Get a SOAPAddressingProperties object from the message context + * and write the adressing headers + */ + public boolean handleFault(MessageContext msgContext) + { + if(log.isDebugEnabled()) log.debug("handleFault"); + handleResponseOrFault(msgContext, true); + return true; + } - SOAPAddressingProperties inProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); - SOAPAddressingProperties outProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND); + private void handleResponseOrFault(MessageContext msgContext, boolean isFault) + { + SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder(); + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - if (outProps == null) - { - // create new response properties - outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); - msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, outProps); - msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); - } + SOAPAddressingProperties inProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); + SOAPAddressingProperties outProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND); - outProps.initializeAsReply(inProps, isFault); + if (outProps == null) + { + // create new response properties + outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, outProps); + msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); + } - try - { - // supply the response action + outProps.initializeAsReply(inProps, isFault); - OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData(); + try + { + // supply the response action - if (!isFault && !opMetaData.isOneWay()) - { + OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData(); - AddressingOpMetaExt addrExt = (AddressingOpMetaExt)opMetaData.getExtension(ADDR_CONSTANTS.getNamespaceURI()); - if (addrExt != null) - { - outProps.setAction(ADDR_BUILDER.newURI(addrExt.getOutboundAction())); - } - else - { - log.warn("Unable to resolve replyAction for " + opMetaData.getQName()); - } + if (!isFault && !opMetaData.isOneWay()) + { - } - else if (isFault) - { - outProps.setAction(ADDR_BUILDER.newURI(ADDR_CONSTANTS.getDefaultFaultAction())); - } + AddressingOpMetaExt addrExt = (AddressingOpMetaExt)opMetaData.getExtension(ADDR_CONSTANTS.getNamespaceURI()); + if (addrExt != null) + { + outProps.setAction(ADDR_BUILDER.newURI(addrExt.getOutboundAction())); + } + else + { + log.warn("Unable to resolve replyAction for " + opMetaData.getQName()); + } - } - catch (URISyntaxException e) - { - log.error("Error setting response action", e); - } + } + else if (isFault) + { + outProps.setAction(ADDR_BUILDER.newURI(ADDR_CONSTANTS.getDefaultFaultAction())); + } - outProps.writeHeaders(soapMessage); - } + } + catch (URISyntaxException e) + { + log.error("Error setting response action", e); + } - /* check wsa formal constraints */ - private void validateRequest(SOAPAddressingProperties addrProps) - { - // If wsa:ReplyTo is supplied and the message lacks a [message id] property, the processor MUST fault. - if (addrProps.getReplyTo() != null && addrProps.getMessageID() == null) - throw new IllegalArgumentException("wsa:MessageId is required when wsa:ReplyTo is supplied"); + outProps.writeHeaders(soapMessage); + } - } + /* check wsa formal constraints */ + private void validateRequest(SOAPAddressingProperties addrProps) + { + // If wsa:ReplyTo is supplied and the message lacks a [message id] property, the processor MUST fault. + if (addrProps.getReplyTo() != null && addrProps.getMessageID() == null) + throw new IllegalArgumentException("wsa:MessageId is required when wsa:ReplyTo is supplied"); + + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -37,10 +37,7 @@ import javax.xml.namespace.QName; import javax.xml.soap.*; -import javax.xml.ws.addressing.AddressingConstants; -import javax.xml.ws.addressing.AddressingException; -import javax.xml.ws.addressing.ReferenceParameters; -import javax.xml.ws.addressing.Relationship; +import javax.xml.ws.addressing.*; import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; import java.lang.reflect.Array; @@ -65,6 +62,8 @@ private NamespaceRegistry nsRegistry = new NamespaceRegistry(); + private boolean mustunderstand; + private String getRequiredHeaderContent(SOAPHeader soapHeader, QName qname) { Element element = DOMUtils.getFirstChildElement(soapHeader, qname); @@ -86,7 +85,7 @@ return null; } - + public void readHeaders(SOAPMessage message) throws AddressingException { try @@ -221,22 +220,21 @@ try { SOAPFactoryImpl factory = (SOAPFactoryImpl)SOAPFactory.newInstance(); + SOAPHeader soapHeader = message.getSOAPHeader(); - SOAPHeader soapHeader = message.getSOAPHeader(); - + // Assert on REQUIRED elements wsa:Action and wsa:To if (getAction() == null) - throw new AddressingException("Required addressing property wsa:Action"); + throw new AddressingException("Required addressing header missing: " + ADDR.getActionQName()); + if (getTo() == null) + throw new AddressingException("Required addressing header missing: " + ADDR.getToQName()); // Add the xmlns:wsa declaration soapHeader.addNamespaceDeclaration(ADDR.getNamespacePrefix(), ADDR.getNamespaceURI()); - // Write wsa:To - if (getTo() != null) - { - SOAPElement wsaTo = soapHeader.addChildElement(new NameImpl(ADDR.getToQName())); - wsaTo.addTextNode(getTo().getURI().toString()); - } - + // Write REQUIRED wsa:Action and wsa:To + appendRequiredHeader(soapHeader, ADDR.getActionQName(), getAction()); + appendRequiredHeader(soapHeader, ADDR.getToQName(), getTo()); + // Write wsa:From if (getFrom() != null) { @@ -267,13 +265,13 @@ soapHeader.addChildElement(soapElement); } - // Write wsa:Action - SOAPElement wsaAction = soapHeader.addChildElement(new NameImpl(ADDR.getActionQName())); - wsaAction.addTextNode(getAction().getURI().toString()); - // Write wsa:MessageID - if (getMessageID() != null) + if( (getReplyTo()!=null || getFaultTo()!=null) && null==getMessageID()) { + throw new AddressingException("Required addressing header missing:" + ADDR.getMessageIDQName()); + } + else if (getMessageID() != null) + { SOAPElement wsaMessageId = soapHeader.addChildElement(new NameImpl(ADDR.getMessageIDQName())); wsaMessageId.addTextNode(getMessageID().getURI().toString()); } @@ -309,9 +307,23 @@ } } + private void appendRequiredHeader(SOAPHeader soapHeader, QName name, AttributedURI value) throws SOAPException + { + SOAPElement element = soapHeader.addChildElement(new NameImpl(name)); + element.addTextNode(value.getURI().toString()); + + if(mustunderstand) + { + // add soap:mustUnderstand=1 + String envNS = soapHeader.getParentElement().getNamespaceURI(); + element.addNamespaceDeclaration("soap", envNS); + element.addAttribute(new QName(envNS, "mustUnderstand", "soap"), "1"); + } + } + public void setMu(boolean mu) { - throw new NotImplementedException(); + this.mustunderstand = mu; } private void appendAttributes(SOAPElement soapElement, Map<QName, String> attributes) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -51,6 +51,7 @@ private String reqEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" + + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>" + " <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>" + " <wsa:ReplyTo>" + " <wsa:Address>http://business456.example/client1</wsa:Address>" @@ -58,7 +59,6 @@ + " <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" + " </wsa:ReferenceParameters>" + " </wsa:ReplyTo>" - + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>" + " <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>" + " </env:Header>" + " <env:Body/>" @@ -66,8 +66,8 @@ private String resEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" + + " <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" + " <wsa:To>http://business456.example/client1</wsa:To>" + - " <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" + " <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo>" + " <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" + " </env:Header>" + Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -23,6 +23,7 @@ //$Id$ +import javax.jws.WebService; import java.rmi.Remote; import java.rmi.RemoteException; @@ -33,9 +34,10 @@ * * @since 24-Nov-2005 */ -public interface ActionEndpoint extends Remote +@WebService(targetNamespace = "http://org.jboss.ws/addressing/action") +public interface ActionEndpoint { - String foo(String item) throws RemoteException; + String foo(String item); - String bar(String item) throws RemoteException; + String bar(String item); } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -40,7 +40,11 @@ * @since 24-Nov-2005 */ @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebService(name = "ActionEndpoint", targetNamespace = "http://org.jboss.ws/addressing/action", wsdlLocation = "WEB-INF/wsdl/ActionRpcService.wsdl") +@WebService( + name = "ActionEndpoint", + targetNamespace = "http://org.jboss.ws/addressing/action", + endpointInterface = "org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint" +) @EndpointConfig(configName = "Standard WSAddressing Endpoint") public class ActionRpcEndpointImpl implements ActionEndpoint { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -21,16 +21,22 @@ */ package org.jboss.test.ws.jaxws.wsaddressing.action; -import javax.xml.rpc.Service; - import junit.framework.Test; - +import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.handler.Handler; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + /** * Test endpoint using ws-addressing. - * + * * The wsa:Action should override any other dispatch method * * @author Thomas.Diesler(a)jboss.org @@ -38,27 +44,57 @@ */ public class AddressingActionTestCase extends JBossWSTest { - private static ActionEndpoint rpcEndpoint; + private static ActionEndpoint endpoint; - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war, jaxws-wsaddressing-action-rpc-client.jar"); - } + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war"); + } - protected void setUp() throws Exception - { - super.setUp(); + protected void setUp() throws Exception + { + super.setUp(); - if (rpcEndpoint == null) - { - Service rpcService = (Service)getInitialContext("wsarpc-client").lookup("java:comp/env/service/ActionRpcService"); - rpcEndpoint = (ActionEndpoint)rpcService.getPort(ActionEndpoint.class); - } - } + if (endpoint == null) + { + String wsdlLocation = "http://"+getServerHost()+":8080/jaxws-wsaddressing-action-rpc?wsdl"; + URL wsdlURL = new URL(wsdlLocation); + QName serviceName = new QName("http://org.jboss.ws/addressing/action", "ActionRpcEndpointImplService"); - public void testRpcEndpoint() throws Exception - { - assertEquals("bar:HelloFoo", rpcEndpoint.foo("HelloFoo")); - assertEquals("bar:HelloBar", rpcEndpoint.bar("HelloBar")); - } + Service service = Service.create(wsdlURL, serviceName); + endpoint = service.getPort(ActionEndpoint.class); + } + } + + public void testRpcEndpoint() throws Exception + { + + // Setup a custom chain + List<Handler> customHandlerChain = new ArrayList<Handler>(); + customHandlerChain.add(new CustomAddressingHandler()); + customHandlerChain.add(new WSAddressingClientHandler()); + ((BindingProvider)endpoint).getBinding().setHandlerChain(customHandlerChain); + + assertEquals("foo:HelloFoo", endpoint.foo("HelloFoo")); + assertEquals("bar:HelloBar", endpoint.bar("HelloBar")); + } + + /** + * Verify that our addresing impl. correctly processes + * wsa headers when mustUnderstand=1 is sent + * + * @throws Exception + */ + public void testRpcEndpointEnabledMU() throws Exception + { + + // Setup a custom chain + List<Handler> customHandlerChain = new ArrayList<Handler>(); + customHandlerChain.add(new AddressingHandlerEnableMU()); + customHandlerChain.add(new WSAddressingClientHandler()); + ((BindingProvider)endpoint).getBinding().setHandlerChain(customHandlerChain); + + assertEquals("foo:HelloFoo", endpoint.foo("HelloFoo")); + assertEquals("bar:HelloBar", endpoint.bar("HelloBar")); + } } Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.wsaddressing.action; + +import java.net.URISyntaxException; + +import javax.xml.namespace.QName; + +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.handler.GenericHandler; + +/** + * A client side handler that disables mustUnderstand processing + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Nov-2005 + */ +public class AddressingHandlerEnableMU extends GenericHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(CustomAddressingHandler.class); + + public QName[] getHeaders() + { + return new QName[] {}; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleRequest" + this); + try + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + outProps.setMu(true); + outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-addressing-action-rpc/ActionService")); + outProps.setAction(builder.newURI("urn:wsa-action-bar")); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); + } + catch (URISyntaxException ex) + { + throw new IllegalStateException("Cannot handle request", ex); + } + return true; + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wsaddressing.action; - -import java.net.URISyntaxException; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler; - -/** - * A client side handler for the ws-addressing - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Nov-2005 - */ -public class ClientDocHandler extends AddressingHandler -{ - // Provide logging - private static Logger log = Logger.getLogger(ClientDocHandler.class); - - public QName[] getHeaders() - { - return new QName[] {}; - } - - public boolean handleRequest(MessageContext msgContext) - { - log.info("handleRequest" + this); - try - { - AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); - AddressingProperties outProps = builder.newAddressingProperties(); - outProps.setTo(builder.newURI("uri:jaxrpc-addressing-action-doc/ActionService")); - outProps.setAction(builder.newURI("urn:wsa-action-bar")); - msgContext.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); - } - catch (URISyntaxException ex) - { - throw new IllegalStateException("Cannot handle request", ex); - } - return true; - } -} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wsaddressing.action; - -import java.net.URISyntaxException; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; - -import org.jboss.logging.Logger; - -/** - * A client side handler for the ws-addressing - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Nov-2005 - */ -public class ClientRpcHandler extends GenericHandler -{ - // Provide logging - private static Logger log = Logger.getLogger(ClientRpcHandler.class); - - public QName[] getHeaders() - { - return new QName[] {}; - } - - public boolean handleRequest(MessageContext msgContext) - { - log.info("handleRequest" + this); - try - { - AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); - AddressingProperties outProps = builder.newAddressingProperties(); - outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-addressing-action-rpc/ActionService")); - outProps.setAction(builder.newURI("urn:wsa-action-bar")); - msgContext.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); - } - catch (URISyntaxException ex) - { - throw new IllegalStateException("Cannot handle request", ex); - } - return true; - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java (from rev 3558, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.wsaddressing.action; + +import java.net.URISyntaxException; + +import javax.xml.namespace.QName; + +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.handler.GenericHandler; + +/** + * A client side handler for the ws-addressing + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Nov-2005 + */ +public class CustomAddressingHandler extends GenericHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(CustomAddressingHandler.class); + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleRequest" + this); + try + { + SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder(); + SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-addressing-action-rpc/ActionService")); + outProps.setAction(builder.newURI("urn:wsa-action-bar")); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); + } + catch (URISyntaxException ex) + { + throw new IllegalStateException("Cannot handle request", ex); + } + return true; + } +} Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-13 11:51:02 UTC (rev 3561) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-13 12:50:00 UTC (rev 3562) @@ -39,6 +39,8 @@ /** * Test endpoint using ws-addressing * + * NOTE: This test uses a JAX-RPC client against a JAX-WS endpoint. + * * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 */

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3561 - in branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common: jbws1692 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-13 07:51:02 -0400 (Wed, 13 Jun 2007) New Revision: 3561 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/jbws1692/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java Log: javadoc Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2007-06-13 11:51:02 UTC (rev 3561) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.common.jbws1692; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; + +import org.jboss.wsf.spi.test.JBossWSTest; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * SOAPElement.importNode() not supported + * + * http://jira.jboss.org/jira/browse/JBWS-1692 + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Jun-2006 + */ +public class JBWS1692TestCase extends JBossWSTest +{ + public void testImportNode() throws Exception + { + MessageFactory factory = MessageFactory.newInstance(); + File soapreqfile = new File("resources/common/jbws1692/soap-request-template.xml"); + SOAPMessage msg = factory.createMessage(null, new FileInputStream(soapreqfile)); + + // Get the node that needs to be imported + Node someNode = getNode("resources/common/jbws1692/import-node.xml"); + + // Import the node + Node importedNode = msg.getSOAPPart().getOwnerDocument().importNode(someNode, true); + + // Append the node to the first child + msg.getSOAPBody().getFirstChild().appendChild(importedNode); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + msg.writeTo(baos); + String resXML = new String(baos.toByteArray()); + assertTrue("Invalid response: " + resXML, resXML.indexOf("<a xmlns='urn:custom'><b:Request xmlns:b='urn:custom-ns'/></a>") > 0); + } + + private Node getNode(String xmlFile) throws Exception + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setNamespaceAware(true); + factory.setIgnoringComments(true); + + File requestFile = new File(xmlFile); + FileInputStream fis = new FileInputStream(requestFile); + + Document doc = factory.newDocumentBuilder().parse(fis); + NodeList nodes = doc.getElementsByTagNameNS("urn:custom-ns", "Request"); + return nodes.item(0); + } +} \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007