Author: darran.lofthouse(a)jboss.com Date: 2007-08-24 10:19:52 -0400 (Fri, 24 Aug 2007) New Revision: 4498 Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPFaultException.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml Removed: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/Constants.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/TextImpl.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-jars-jaxrpc.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java Log: [JBPAPP-268] MessageFactory does not preserve comments and text nodes - And related fixes. Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/Constants.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/Constants.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/Constants.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -120,7 +120,7 @@ static final String PREFIX_XML = "xml"; /** XOP Include */ - static final Name NAME_XOP_INCLUDE = new NameImpl("Include", PREFIX_XOP, NS_XOP); + static final QName NAME_XOP_INCLUDE = new QName(NS_XOP, "Include", PREFIX_XOP); /** SOAP-1.1 roles */ static final String URI_SOAP11_NEXT_ACTOR = "http://schemas.xmlsoap.org/soap/actor/next"; Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -60,6 +60,7 @@ import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPBodyElementDoc; import org.jboss.ws.core.soap.SOAPBodyElementRpc; +import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; @@ -133,7 +134,8 @@ protected abstract MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException; /** On the client side, generate the payload from IN parameters. */ - public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException + public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + throws BindingException { if (log.isDebugEnabled()) log.debug("bindRequestMessage: " + opMetaData.getQName()); @@ -286,7 +288,21 @@ SOAPElement soapBodyElement = soapBody; if (style == Style.RPC) { - soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + + soapBodyElement = null; + Iterator it = soapBody.getChildElements(); + while (soapBodyElement == null && it.hasNext()) + { + Object childNode = it.next(); + if (childNode instanceof SOAPElement) + { + soapBodyElement = (SOAPElement)childNode; + } + } + + if (soapBodyElement == null) + throw new SOAPException("Cannot find RPC element in"); + Name elName = soapBodyElement.getElementName(); QName elQName = new QName(elName.getURI(), elName.getLocalName(), elName.getPrefix()); @@ -320,17 +336,15 @@ { boolean isHeader = paramMetaData.isInHeader(); SOAPElement element = isHeader ? soapHeader : soapBodyElement; - if(!isHeader) numParameters++; - + if (!isHeader) + numParameters++; + SOAPContentElement value = getParameterFromMessage(paramMetaData, element, false); epInv.setRequestParamValue(xmlName, value); } } } - // TCK: verify the numer of parameters matches the actual message payload - int numChildren = soapBodyElement.getChildNodes().getLength(); - if(numChildren!=numParameters) throw new WSException("Invalid number of payload elements: " + numChildren); } // Generic message endpoint @@ -519,12 +533,9 @@ msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); SOAPHeader soapHeader = soapEnvelope.getHeader(); - SOAPBody soapBody = soapEnvelope.getBody(); - Iterator bodyChildren = soapBody.getChildElements(); + SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody(); - SOAPBodyElement soapBodyElement = null; - if (bodyChildren.hasNext() != false) - soapBodyElement = (SOAPBodyElement)bodyChildren.next(); + SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); // Translate the SOAPFault to an exception and throw it if (soapBodyElement instanceof SOAPFaultImpl) @@ -790,44 +801,48 @@ Iterator childElements = soapElement.getChildElements(); while (childElements.hasNext()) { - SOAPElementImpl childElement = (SOAPElementImpl)childElements.next(); + Object childNode = childElements.next(); + if (childNode instanceof SOAPElement) + { + SOAPElementImpl childElement = (SOAPElementImpl)childNode; - // If this message was manipulated by a handler the child may not be a content element - if (!(childElement instanceof SOAPContentElement)) - childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); + // If this message was manipulated by a handler the child may not be a content element + if (!(childElement instanceof SOAPContentElement)) + childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); - // The parameters are expected to be lazy - SOAPContentElement aux = (SOAPContentElement)childElement; - Name elName = aux.getElementName(); + // The parameters are expected to be lazy + SOAPContentElement aux = (SOAPContentElement)childElement; + Name elName = aux.getElementName(); - if (xmlName.equals(elName)) - { - soapContentElement = aux; - soapContentElement.setParamMetaData(paramMetaData); - break; - } + if (xmlName.equals(elName)) + { + soapContentElement = aux; + soapContentElement.setParamMetaData(paramMetaData); + break; + } - if (SOAP_ARRAY_NAME.equals(elName)) - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); - try + if (SOAP_ARRAY_NAME.equals(elName)) { - QName compXMLName = paramMetaData.getXmlName(); - Element compElement = DOMUtils.getFirstChildElement(aux); - // NPE when the soap encoded array size is 0 on the return path - // http://jira.jboss.org/jira/browse/JBWS-1285 - if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart())) + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); + try { - soapContentElement = aux; - soapContentElement.setParamMetaData(paramMetaData); - break; + QName compXMLName = paramMetaData.getXmlName(); + Element compElement = DOMUtils.getFirstChildElement(aux); + // NPE when the soap encoded array size is 0 on the return path + // http://jira.jboss.org/jira/browse/JBWS-1285 + if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart())) + { + soapContentElement = aux; + soapContentElement.setParamMetaData(paramMetaData); + break; + } } + finally + { + msgContext.remove(CommonMessageContext.ALLOW_EXPAND_TO_DOM); + } } - finally - { - msgContext.remove(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - } } } Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPFaultException.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPFaultException.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPFaultException.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,55 @@ +/* + * 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.ws.core; + +// $Id$ + +import javax.xml.namespace.QName; + +/** + * The SOAPFaultException exception represents a SOAP fault. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class CommonSOAPFaultException extends RuntimeException +{ + private QName faultCode; + private String faultString; + + public CommonSOAPFaultException(QName faultCode, String faultString) + { + super(faultString); + + this.faultCode = faultCode; + this.faultString = faultString; + } + + public QName getFaultCode() + { + return faultCode; + } + + public String getFaultString() + { + return faultString; + } +} Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPFaultException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -93,7 +93,7 @@ SOAPMessage reqMessage = (SOAPMessage)payload; SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody(); - SOAPContentElement bodyElement = (SOAPContentElement)body.getFirstChild(); + SOAPContentElement bodyElement = (SOAPContentElement)body.getBodyElement(); Source source = bodyElement.getXMLFragment().getSource(); if (source == null) Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -34,13 +34,16 @@ import javax.xml.ws.LogicalMessage; import javax.xml.ws.WebServiceException; -import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; import org.jboss.ws.core.HTTPMessageImpl; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.jaxrpc.Style; -import org.jboss.ws.core.soap.*; +import org.jboss.ws.core.soap.EnvelopeBuilderDOM; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.SOAPBodyImpl; +import org.jboss.ws.core.soap.SOAPContentElement; +import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.core.utils.DOMUtils; import org.w3c.dom.Element; @@ -53,8 +56,6 @@ */ public class LogicalMessageImpl implements LogicalMessage { - // provide logging - private static final Logger log = Logger.getLogger(LogicalMessageImpl.class); private Style style; private MessageAbstraction message; @@ -72,7 +73,7 @@ { SOAPMessage soapMessage = (SOAPMessage)message; SOAPBodyImpl soapBody = getSOAPBody(soapMessage); - SOAPElement bodyElement = (SOAPElement)soapBody.getFirstChild(); + SOAPElement bodyElement = (SOAPElement)soapBody.getBodyElement(); if (style == Style.RPC) { @@ -98,15 +99,17 @@ { SOAPMessage soapMessage = (SOAPMessage)message; SOAPBodyImpl soapBody = getSOAPBody(soapMessage); - SOAPElement bodyElement = (SOAPElement)soapBody.getFirstChild(); + SOAPElement bodyElement = (SOAPElement)soapBody.getBodyElement(); try { if (style == Style.RPC) { try { - EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style); + EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(); + builder.setStyle(style); Element domBodyElement = DOMUtils.sourceToElement(source); + soapBody.removeContents(); builder.buildBodyElementRpc(soapBody, domBodyElement); } catch (IOException ex) @@ -131,8 +134,7 @@ httpMessage.setXmlFragment(new XMLFragment(source)); } - MessageContextAssociation.peekMessageContext().setModified(true); - + MessageContextAssociation.peekMessageContext().setModified(true); } public Object getPayload(JAXBContext jaxbContext) @@ -174,6 +176,8 @@ { throw new NotImplementedException(); } + + MessageContextAssociation.peekMessageContext().setModified(true); } private SOAPBodyImpl getSOAPBody(SOAPMessage soapMessage) Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -33,7 +33,6 @@ import javax.xml.namespace.QName; import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.Name; -import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPHeader; @@ -55,6 +54,7 @@ import org.jboss.ws.core.jaxws.handler.HandlerDelegateJAXWS; import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.extensions.xop.XOPContext; @@ -343,10 +343,10 @@ if (opMetaData == null) { String faultString; - SOAPBody soapBody = soapMessage.getSOAPBody(); - if (soapBody.getChildElements().hasNext()) - { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); + SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); + if (soapBodyElement != null) + { Name soapName = soapBodyElement.getElementName(); faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -30,6 +30,8 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; +import org.jboss.ws.core.jaxrpc.Style; + /** * @author Heiko Braun, <heiko.braun(a)jboss.com&gt; * @author Thomas.Diesler(a)jboss.com @@ -37,5 +39,9 @@ */ public interface EnvelopeBuilder { + Style getStyle(); + + void setStyle(Style style); + SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException; } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -26,10 +26,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import java.util.Iterator; import javax.xml.namespace.QName; import javax.xml.soap.Name; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; @@ -40,9 +41,13 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonSOAPFaultException; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.utils.DOMUtils; +import org.w3c.dom.Comment; +import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; @@ -55,13 +60,19 @@ */ public class EnvelopeBuilderDOM implements EnvelopeBuilder { - // provide logging +// provide logging private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class); - private Style style = Style.DOCUMENT; + private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); + private Style style; - public EnvelopeBuilderDOM(Style style) + public Style getStyle() { + return style; + } + + public void setStyle(Style style) + { this.style = style; } @@ -79,7 +90,8 @@ { return null; } - throw ex; + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex.getMessage()); } return build(soapMessage, domEnv); @@ -99,7 +111,8 @@ { return null; } - throw ex; + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex.getMessage()); } return build(soapMessage, domEnv); @@ -107,29 +120,54 @@ public SOAPEnvelope build(SOAPMessage soapMessage, Element domEnv) throws SOAPException { - String envNS = domEnv.getNamespaceURI(); - String envPrefix = domEnv.getPrefix(); - // Construct the envelope - SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart(); SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, soapFactory.createElement(domEnv, false)); DOMUtils.copyAttributes(soapEnv, domEnv); - // Add the header elements - Element domHeader = DOMUtils.getFirstChildElement(domEnv, new QName(envNS, "Header")); - if (domHeader != null) + NodeList envChildNodes = domEnv.getChildNodes(); + for (int i = 0; i < envChildNodes.getLength(); i++) { - SOAPHeader soapHeader = soapEnv.getHeader(); + Node child = envChildNodes.item(i); + short childType = child.getNodeType(); + if (childType == Node.ELEMENT_NODE) + { + String elName = child.getLocalName(); + if ("Header".equals(elName)) + { + buildSOAPHeader(soapEnv, (Element)child); + } + else if ("Body".equals(elName)) + { + buildSOAPBody(soapEnv, (Element)child); + } + else + { + log.warn("Ignore envelope child: " + elName); + } + } + } - DOMUtils.copyAttributes(soapHeader, domHeader); + return soapEnv; + } - Iterator it = DOMUtils.getChildElements(domHeader); - while (it.hasNext()) + private SOAPHeader buildSOAPHeader(SOAPEnvelopeImpl soapEnv, Element domHeader) throws SOAPException + { + SOAPHeader soapHeader = soapEnv.getHeader(); + if (soapHeader == null) + soapHeader = soapEnv.addHeader(); + + DOMUtils.copyAttributes(soapHeader, domHeader); + + NodeList headerChildNodes = domHeader.getChildNodes(); + for (int i = 0; i < headerChildNodes.getLength(); i++) + { + Node child = headerChildNodes.item(i); + short childType = child.getNodeType(); + if (childType == Node.ELEMENT_NODE) { - Element srcElement = (Element)it.next(); - //registerNamespacesLocally(srcElement); + Element srcElement = (Element)child; XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI()); @@ -139,99 +177,60 @@ DOMUtils.copyAttributes(destElement, srcElement); destElement.setXMLFragment(xmlFragment); } + else + { + log.warn("Ignore child type: " + childType); + } } - // Add the body elements - Element domBody = DOMUtils.getFirstChildElement(domEnv, new QName(envNS, "Body")); + return soapHeader; + } + + private SOAPBody buildSOAPBody(SOAPEnvelopeImpl soapEnv, Element domBody) throws SOAPException + { + String envNS = soapEnv.getNamespaceURI(); + SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnv.getBody(); + if (soapBody == null) + soapBody = (SOAPBodyImpl)soapEnv.addBody(); DOMUtils.copyAttributes(soapBody, domBody); - Iterator itBody = DOMUtils.getChildElements(domBody); - if (itBody.hasNext()) + SOAPBodyElement soapBodyElement = null; + boolean attachHRefElements = Constants.URI_SOAP11_ENC.equals(soapEnv.getAttributeNS(envNS, "encodingStyle")); + + NodeList bodyChildNodes = domBody.getChildNodes(); + for (int i = 0; i < bodyChildNodes.getLength(); i++) { - Element domBodyElement = (Element)itBody.next(); - - String localName = domBodyElement.getLocalName(); - String prefix = domBodyElement.getPrefix(); - String nsURI = domBodyElement.getNamespaceURI(); - Name beName = new NameImpl(localName, prefix, nsURI); - - // Process a <env:Fault> message - if (beName.equals(new NameImpl("Fault", envPrefix, envNS))) + Node child = bodyChildNodes.item(i); + short childType = child.getNodeType(); + if (childType == Node.ELEMENT_NODE) { - SOAPFaultImpl soapFault = new SOAPFaultImpl(envPrefix, envNS); - soapBody.addChildElement(soapFault); - - DOMUtils.copyAttributes(soapFault, domBodyElement); - - // copy everything and let soapFault discover child elements itself - XMLFragment xmlFragment = new XMLFragment(new DOMSource(domBodyElement)); - soapFault.setXMLFragment(xmlFragment); - } - - // Process and RPC or DOCUMENT style message - else - { - - if (style == Style.RPC) + if (soapBodyElement == null) { - buildBodyElementRpc(soapBody, domBodyElement); + soapBodyElement = buildSOAPBodyElement(soapEnv, (Element)child); + attachHRefElements = attachHRefElements || Constants.URI_SOAP11_ENC.equals(soapBody.getAttributeNS(envNS, "encodingStyle")); } - else if (style == Style.DOCUMENT) + else if (attachHRefElements) { - buildBodyElementDoc(soapBody, domBodyElement); + // Process additional soap encoded body elements + soapBody.addChildElement(soapFactory.createElement((Element)child, true)); } - else if (style == null) - { - SOAPBodyElementMessage soapBodyElement = new SOAPBodyElementMessage(beName); - soapBodyElement = (SOAPBodyElementMessage)soapBody.addChildElement(soapBodyElement); - - DOMUtils.copyAttributes(soapBodyElement, domBodyElement); - - NodeList nlist = domBodyElement.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) - { - org.w3c.dom.Node child = nlist.item(i); - short childType = child.getNodeType(); - if (childType == org.w3c.dom.Node.ELEMENT_NODE) - { - SOAPElement soapElement = soapFactory.createElement((Element)child); - soapBodyElement.addChildElement(soapElement); - } - else if (childType == org.w3c.dom.Node.TEXT_NODE) - { - String nodeValue = child.getNodeValue(); - soapBodyElement.addTextNode(nodeValue); - } - else if (childType == org.w3c.dom.Node.CDATA_SECTION_NODE) - { - String nodeValue = child.getNodeValue(); - soapBodyElement.addTextNode(nodeValue); - } - else - { - log.warn("Ignore child type: " + childType); - } - } - } - else - { - throw new WSException("Unsupported message style: " + style); - } } + else if (childType == Node.COMMENT_NODE) + { + appendCommentNode(soapBody, child); + } + else if (childType == Node.TEXT_NODE) + { + appendTextNode(soapBody, child); + } + else + { + log.warn("Ignore child type: " + childType); + } } - // Process additional soap encoded body elements - boolean attachHRefElements = Constants.URI_SOAP11_ENC.equals(soapEnv.getAttributeNS(envNS, "encodingStyle")); - attachHRefElements = attachHRefElements || Constants.URI_SOAP11_ENC.equals(soapBody.getAttributeNS(envNS, "encodingStyle")); - attachHRefElements = attachHRefElements && itBody.hasNext(); - while (attachHRefElements && itBody.hasNext()) - { - Element srcElement = (Element)itBody.next(); - soapBody.addChildElement(soapFactory.createElement(srcElement, true)); - } - // Inline all attached href elements if (attachHRefElements) { @@ -239,48 +238,166 @@ inlineHandler.processHRefs(); } - return soapEnv; + return soapBody; } - public void buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException + private SOAPBodyElement buildSOAPBodyElement(SOAPEnvelopeImpl soapEnv, Element domBodyElement) throws SOAPException { - soapBody.removeContents(); + String envNS = soapEnv.getNamespaceURI(); + String envPrefix = soapEnv.getPrefix(); + SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnv.getBody(); + QName beName = DOMUtils.getElementQName(domBodyElement); + + SOAPBodyElement soapBodyElement = null; + + // Process a <env:Fault> message + if (beName.equals(new QName(envNS, "Fault"))) + { + SOAPFaultImpl soapFault = new SOAPFaultImpl(envPrefix, envNS); + soapBody.addChildElement(soapFault); + soapBodyElement = soapFault; + + DOMUtils.copyAttributes(soapFault, domBodyElement); + + // copy everything and let soapFault discover child elements itself + XMLFragment xmlFragment = new XMLFragment(new DOMSource(domBodyElement)); + soapFault.setXMLFragment(xmlFragment); + } + + // Process and RPC or DOCUMENT style message + else + { + if (style == Style.DOCUMENT) + { + buildBodyElementDoc(soapBody, domBodyElement); + } + else if (style == Style.RPC) + { + soapBodyElement = buildBodyElementRpc(soapBody, domBodyElement); + } + else if (style == null) + { + buildBodyElementDefault(soapBody, domBodyElement); + } + else + { + throw new WSException("Unsupported message style: " + style); + } + } + + return soapBodyElement; + } + + public SOAPBodyElement buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException + { Element srcElement = (Element)domBodyElement; QName beName = DOMUtils.getElementQName(domBodyElement); - SOAPContentElement destElement = new SOAPBodyElementDoc(beName); - destElement = (SOAPContentElement)soapBody.addChildElement(destElement); + SOAPBodyElementDoc soapBodyElement = new SOAPBodyElementDoc(beName); + SOAPContentElement contentElement = (SOAPContentElement)soapBody.addChildElement(soapBodyElement); - DOMUtils.copyAttributes(destElement, srcElement); + DOMUtils.copyAttributes(contentElement, srcElement); XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); - destElement.setXMLFragment(xmlFragment); + contentElement.setXMLFragment(xmlFragment); + + return soapBodyElement; } - public void buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException + public SOAPBodyElement buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException { - soapBody.removeContents(); - QName beName = DOMUtils.getElementQName(domBodyElement); SOAPBodyElementRpc soapBodyElement = new SOAPBodyElementRpc(beName); soapBodyElement = (SOAPBodyElementRpc)soapBody.addChildElement(soapBodyElement); DOMUtils.copyAttributes(soapBodyElement, domBodyElement); - Iterator itBodyElement = DOMUtils.getChildElements(domBodyElement); - while (itBodyElement.hasNext()) + NodeList nlist = domBodyElement.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) { - Element srcElement = (Element)itBodyElement.next(); + Node child = nlist.item(i); + short childType = child.getNodeType(); + if (childType == Node.ELEMENT_NODE) + { + Element srcElement = (Element)child; + Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI()); + SOAPContentElement destElement = new SOAPContentElement(name); + destElement = (SOAPContentElement)soapBodyElement.addChildElement(destElement); - Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI()); - SOAPContentElement destElement = new SOAPContentElement(name); - destElement = (SOAPContentElement)soapBodyElement.addChildElement(destElement); + DOMUtils.copyAttributes(destElement, srcElement); - DOMUtils.copyAttributes(destElement, srcElement); + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); + destElement.setXMLFragment(xmlFragment); + } + else if (childType == Node.COMMENT_NODE) + { + appendCommentNode(soapBodyElement, child); + } + else if (childType == Node.TEXT_NODE) + { + appendTextNode(soapBodyElement, child); + } + else + { + log.warn("Ignore child type: " + childType); + } + } - XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); - destElement.setXMLFragment(xmlFragment); + return soapBodyElement; + } + + public SOAPBodyElement buildBodyElementDefault(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException + { + QName beName = DOMUtils.getElementQName(domBodyElement); + SOAPBodyElement soapBodyElement = new SOAPBodyElementMessage(beName); + soapBodyElement = (SOAPBodyElementMessage)soapBody.addChildElement(soapBodyElement); + + DOMUtils.copyAttributes(soapBodyElement, domBodyElement); + + NodeList nlist = domBodyElement.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) + { + Node child = nlist.item(i); + short childType = child.getNodeType(); + if (childType == Node.ELEMENT_NODE) + { + SOAPElement soapElement = soapFactory.createElement((Element)child); + soapBodyElement.addChildElement(soapElement); + } + else if (childType == Node.COMMENT_NODE) + { + appendCommentNode(soapBodyElement, child); + } + else if (childType == Node.TEXT_NODE) + { + appendTextNode(soapBodyElement, child); + } + else if (childType == Node.CDATA_SECTION_NODE) + { + String nodeValue = child.getNodeValue(); + soapBodyElement.addTextNode(nodeValue); + } + else + { + log.warn("Ignore child type: " + childType); + } } + + return soapBodyElement; } + + private void appendCommentNode(SOAPElement soapElement, Node child) + { + String nodeValue = child.getNodeValue(); + Document ownerDoc = soapElement.getOwnerDocument(); + Comment comment = ownerDoc.createComment(nodeValue); + soapElement.appendChild(comment); + } + + private void appendTextNode(SOAPElement soapElement, Node child) throws SOAPException + { + String nodeValue = child.getNodeValue(); + soapElement.addTextNode(nodeValue); + } } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -40,6 +40,8 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; +import org.jboss.util.NotImplementedException; +import org.jboss.ws.core.jaxrpc.Style; import org.w3c.dom.Element; import com.ctc.wstx.stax.WstxInputFactory; @@ -469,4 +471,14 @@ return builder.toString(); } + + public Style getStyle() + { + throw new NotImplementedException(); + } + + public void setStyle(Style style) + { + throw new NotImplementedException(); + } } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -63,16 +63,29 @@ String bodyStr = DOMWriter.printNode(soapBody, true); log.debug("Begin processHRefs:\n" + bodyStr); - SOAPBodyElement bodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPBodyElement bodyElement = null; + + Iterator it = soapBody.getChildElements(); + while (it.hasNext() && bodyElement == null) + { + Object next = it.next(); + if (next instanceof SOAPBodyElement) + bodyElement = (SOAPBodyElement)next; + } + processElement(bodyElement); - - Iterator it = soapBody.getChildElements(); + + it = soapBody.getChildElements(); while (it.hasNext()) { - // Remove id elements - SOAPElement soapElement = (SOAPElement)it.next(); - if ((soapElement instanceof SOAPBodyElement) == false) - soapBody.removeChild(soapElement); + Object next = it.next(); + if (next instanceof SOAPElement) + { + // Remove id elements + SOAPElement soapElement = (SOAPElement)next; + if ((soapElement instanceof SOAPBodyElement) == false) + soapBody.removeChild(soapElement); + } } bodyStr = DOMWriter.printNode(soapBody, true); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -248,7 +248,8 @@ soapMessage.setAttachments(attachments); // Get the SOAPEnvelope builder - EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle()); + EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(); + envBuilder.setStyle(getStyle()); // Build the payload envBuilder.build(soapMessage, ins, ignoreParseError); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -552,6 +552,10 @@ { retNode = new TextImpl(node); } + else if (node instanceof org.w3c.dom.Comment) + { + retNode = new TextImpl(node); + } else { throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation not supported on this type of node: " + node); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -23,8 +23,8 @@ import java.io.Writer; +import javax.xml.namespace.QName; import javax.xml.rpc.JAXRPCException; -import javax.xml.soap.Name; import javax.xml.soap.SOAPBodyElement; import org.jboss.ws.core.utils.DOMWriter; @@ -39,7 +39,7 @@ */ public class SOAPBodyElementMessage extends SOAPElementImpl implements SOAPBodyElement { - public SOAPBodyElementMessage(Name name) + public SOAPBodyElementMessage(QName name) { super(name); } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -38,6 +38,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.core.utils.DOMUtils; +import org.w3c.dom.Comment; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; @@ -67,7 +68,7 @@ public SOAPElement addChildElement(SOAPElement child) throws SOAPException { log.trace("addChildElement: " + child.getElementName()); - + if ((child instanceof SOAPBodyElement) == false) child = convertToBodyElement(child); @@ -181,6 +182,19 @@ return getChildElements(new QName(getNamespaceURI(), "Fault")); } + public SOAPBodyElement getBodyElement() + { + SOAPBodyElement bodyElement = null; + Iterator it = getChildElements(); + while (bodyElement == null && it.hasNext()) + { + Object next = it.next(); + if (next instanceof SOAPBodyElement) + bodyElement = (SOAPBodyElement)next; + } + return bodyElement; + } + public Node appendChild(Node newChild) throws DOMException { log.trace("appendChild: " + newChild.getNodeName()); @@ -254,10 +268,10 @@ return newDocument; } - private static boolean needsConversionToBodyElement(Node node) + private static boolean needsConversionToBodyElement(Node newChild) { // JBCTS-440 #addTextNodeTest1 appends a Text node to a SOAPBody - return !(node instanceof SOAPBodyElement || node instanceof DocumentFragment || node instanceof Text); + return !(newChild instanceof SOAPBodyElement || newChild instanceof DocumentFragment || newChild instanceof Text || newChild instanceof Comment); } private static SOAPBodyElementDoc convertToBodyElement(Node node) Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -143,7 +143,7 @@ } public SOAPElement setElementQNameInternal(QName qname) throws SOAPException - { + { elementName = new NameImpl(qname); Document owner = domNode.getOwnerDocument(); @@ -153,7 +153,6 @@ return this.completeNamespaceDeclaration(); } - /** * Adds an attribute with the specified name and value to this SOAPElement object. * @@ -325,8 +324,17 @@ public SOAPElement addTextNode(String value) throws SOAPException { log.trace("addTextNode: " + value); - org.w3c.dom.Text domText = element.getOwnerDocument().createTextNode(value); - javax.xml.soap.Text soapText = new TextImpl(domText); + org.w3c.dom.Node domNode; + if (value.startsWith("<!--") && value.endsWith("-->")) + { + value = value.substring(4, value.length() - 3); + domNode = element.getOwnerDocument().createComment(value); + } + else + { + domNode = element.getOwnerDocument().createTextNode(value); + } + javax.xml.soap.Text soapText = new TextImpl(domNode); appendChild(soapText); return this; } @@ -465,9 +473,7 @@ } else if (node instanceof Text) { - String value = node.getNodeValue(); - if (value.trim().length() > 0) - list.add(node); + list.add(node); } } return list.iterator(); @@ -835,7 +841,7 @@ } else if (node instanceof TextImpl) { - out.write(node.getValue()); + ((TextImpl)node).writeNode(out); } else { Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -179,7 +179,10 @@ */ public SOAPElement addTextNode(String value) throws SOAPException { - throw new SOAPException("Cannot add Text node to SOAPEnvelope"); + if (value.trim().length() > 0) + throw new SOAPException("Cannot add Text node to SOAPEnvelope"); + + return super.addTextNode(value); } public Document getOwnerDocument() Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -110,7 +110,7 @@ if (domElement == null) throw new IllegalArgumentException("Source node cannot be null"); - if (domElement instanceof SOAPElement) + if (domElement instanceof SOAPElement && deep==true) return (SOAPElement)domElement; String localName = domElement.getLocalName(); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -68,7 +68,8 @@ if (wsaAction.equals(opAux.getSOAPAction())) { opMetaData = opAux; - if(log.isDebugEnabled()) log.debug("Use wsa:Action dispatch: " + wsaAction); + if (log.isDebugEnabled()) + log.debug("Use wsa:Action dispatch: " + wsaAction); break; } } @@ -80,15 +81,25 @@ QName xmlName = new QName(epMetaData.getPortName().getNamespaceURI(), "invoke"); opMetaData = epMetaData.getOperation(xmlName); } - - // Dispatch based on SOAPBodyElement name + + // Dispatch based on SOAPBodyElement name if (opMetaData == null) { SOAPBody soapBody = soapMessage.getSOAPBody(); + SOAPBodyElement soapBodyElement = null; Iterator bodyChildren = soapBody.getChildElements(); - if (bodyChildren.hasNext() == false) + while (bodyChildren.hasNext() && soapBodyElement == null) { + Object childNode = bodyChildren.next(); + if (childNode instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)childNode; + } + } + + if (soapBodyElement == null) + { if (epMetaData.getStyle() == Style.RPC) throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); @@ -97,7 +108,7 @@ { if (opAux.getParameters().size() == 0) { - if(log.isDebugEnabled()) log.debug ("Dispatching empty SOAP body"); + log.debug("Dispatching empty SOAP body"); opMetaData = opAux; break; } @@ -105,7 +116,6 @@ } else { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next(); Name soapName = soapBodyElement.getElementName(); QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName()); opMetaData = epMetaData.getOperation(xmlElementName); @@ -119,14 +129,16 @@ { if (opAux.isMessageEndpoint()) { - if(log.isDebugEnabled()) log.debug("Use generic message style dispatch"); + if (log.isDebugEnabled()) + log.debug("Use generic message style dispatch"); opMetaData = opAux; break; } } } - if(log.isDebugEnabled()) log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); + if (log.isDebugEnabled()) + log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); return opMetaData; } } \ No newline at end of file Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -172,7 +172,9 @@ else throw new SOAPException("Unsupported DOMSource node: " + node); - EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT); + EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(); + envBuilder.setStyle(Style.DOCUMENT); + envBuilder.build(soapMessage, domElement); } else if (source instanceof StreamSource) @@ -180,7 +182,9 @@ try { StreamSource streamSource = (StreamSource)source; - EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT); + EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(); + envBuilder.setStyle(Style.DOCUMENT); + InputStream stream = streamSource.getInputStream(); Reader reader = streamSource.getReader(); if (stream != null) Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/TextImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/TextImpl.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/TextImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,26 +1,29 @@ /* -* 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. -*/ + * 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.ws.core.soap; +import java.io.IOException; +import java.io.Writer; + import org.w3c.dom.DOMException; import org.w3c.dom.Text; @@ -42,8 +45,7 @@ */ public boolean isComment() { - String value = getNodeValue().trim(); - return value.startsWith("<!--") && value.endsWith("-->"); + return domNode.getNodeType() == org.w3c.dom.Node.COMMENT_NODE; } public String getValue() @@ -56,6 +58,14 @@ setNodeValue(value); } + public void writeNode(Writer out) throws IOException + { + String nodeValue = getNodeValue(); + if (isComment() && !nodeValue.startsWith("<!--")) + out.write("<!--" + nodeValue + "-->"); + else out.write(nodeValue); + } + /** * Breaks this node into two nodes at the specified <code>offset</code>, keeping both in the tree as siblings. * <p/> @@ -88,8 +98,7 @@ org.w3c.dom.Node sibling = getNextSibling(); if (sibling == null) parent.appendChild(txtNode); - else - parent.insertBefore(txtNode, sibling); + else parent.insertBefore(txtNode, sibling); } return txtNode; @@ -241,7 +250,7 @@ { setNodeValue(data); } - + // Stubbed out org.w3c.dom.Text methods ************************** /** @@ -318,8 +327,7 @@ * nodes being replaced is readonly. * @since DOM Level 3 */ - public Text replaceWholeText(String content) - throws DOMException + public Text replaceWholeText(String content) throws DOMException { return null; } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -54,6 +54,8 @@ import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.w3c.dom.Comment; +import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -321,6 +323,7 @@ container.setElementQNameInternal(xmlName); } + Document ownerDoc = container.getOwnerDocument(); // Copy attributes DOMUtils.copyAttributes(container, domElement); @@ -343,6 +346,12 @@ String nodeValue = child.getNodeValue(); container.addTextNode(nodeValue); } + else if (childType == Node.COMMENT_NODE) + { + String nodeValue = child.getNodeValue(); + Comment comment = ownerDoc.createComment(nodeValue); + container.appendChild(comment); + } else if (childType == Node.CDATA_SECTION_NODE) { String nodeValue = child.getNodeValue(); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -48,7 +48,6 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -72,8 +71,7 @@ // All elements created by the same thread are created by the same builder and belong to the same doc private static ThreadLocal documentThreadLocal = new ThreadLocal(); private static ThreadLocal builderThreadLocal = new ThreadLocal() { - protected Object initialValue() - { + protected Object initialValue() { try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -561,7 +559,7 @@ } else { - throw new WSException("Unsupported Node type: " + node.getClass().getName()); + throw new RuntimeException("Unsupported Node type: " + node.getClass().getName()); } } else if (source instanceof SAXSource) @@ -580,7 +578,7 @@ } else { - throw new WSException("Source type not implemented: " + source.getClass().getName()); + throw new RuntimeException("Source type not implemented: " + source.getClass().getName()); } } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -2453,6 +2453,40 @@ </metainf> </jar> + <!-- jbossws-jbws1647 RPC/Literal --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-rpclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + + <!-- jbossws-jbws1647 Document/Literal --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-doclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <!-- jaxrpc-marshall-doclit.war --> <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -25,18 +25,24 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.transform.stream.StreamSource; import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; +import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMWriter; import org.w3c.dom.Element; /** @@ -77,7 +83,9 @@ assertEquals("env:Envelope", env.getNodeName()); assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); - SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements().next(); + Name name = new NameImpl("businessList", null, "urn:uddi-org:api_v2"); + SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements(name).next(); + assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI()); } @@ -123,7 +131,7 @@ assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); } - public void testSetContentOnSOAPPart() throws Exception + public void testSetContentOnSOAPPart_StreamSource() throws Exception { String expMsg = "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + @@ -149,32 +157,108 @@ assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg)); } + public void testSetContentOnSOAPPart_DOMSource() throws Exception + { + String expMsg = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <soapenv:Header/>" + + " <soapenv:Body>" + + " <HelloResponse xmlns='http://helloservice.org/types\'>" + + " <argument>responseBean</argument>" + + " </HelloResponse>" + + " </soapenv:Body>" + + "</soapenv:Envelope>"; + + MessageFactory factory = new MessageFactoryImpl(); + + ByteArrayInputStream inputStream = new ByteArrayInputStream(expMsg.getBytes()); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + + SOAPMessage message = factory.createMessage(); + message.getSOAPPart().setContent(soapMsg.getSOAPPart().getContent()); + message.saveChanges(); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + message.writeTo(baos); + String wasMsg = new String(baos.toByteArray()); + + assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg)); + } + // [JBWS-1511] MessageFactory does not preserve comments public void testPreserveComments() throws Exception { String expMsg = - "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:ns1='http://somens.org'>" + - " <!-- header -->" + - " <soapenv:Header>" + - " <!-- header element -->" + + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:ns1='http://somens.org'>" + + " <env:Header>" + " <ns1:header>kermit</ns1:header>" + - " </soapenv:Header>" + - " <!-- body -->" + - " <soapenv:Body>" + - " <!-- body element -->" + + " </env:Header>" + + " <env:Body>" + + " <!-- pre body element -->" + " <Hello>" + - " <!-- element -->" + + " <!-- pre element -->" + " <argument>kermit</argument>" + + " <!-- post element -->" + " </Hello>" + - " </soapenv:Body>" + + " <!-- post body element -->" + + " </env:Body>" + + "</env:Envelope>"; + + // Verify that DOM parse/write do not modify the message + Element expEnv = DOMUtils.parse(expMsg); + assertEquals(expMsg, DOMWriter.printNode(expEnv, false)); + + doPreserveCommentsPerStyle(expMsg, Style.DOCUMENT); + doPreserveCommentsPerStyle(expMsg, Style.RPC); + doPreserveCommentsPerStyle(expMsg, null); + } + + private void doPreserveCommentsPerStyle(String expXML, Style style) throws IOException, SOAPException + { + MessageFactoryImpl factory = new MessageFactoryImpl(); + factory.setStyle(style); + + ByteArrayInputStream inputStream = new ByteArrayInputStream(expXML.getBytes()); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + SOAPEnvelope wasEnv = soapMsg.getSOAPPart().getEnvelope(); + + String wasXML = DOMWriter.printNode(wasEnv, false); + String wasBody = wasXML.substring(wasXML.indexOf("<env:Body>")); + wasBody = wasBody.substring(0, wasBody.indexOf("</env:Body>") + 11); + + String expBody = expXML.substring(expXML.indexOf("<env:Body>")); + expBody = expBody.substring(0, expBody.indexOf("</env:Body>") + 11); + + assertEquals(expBody, wasBody); + } + + public void testWriteToPreserveFormatting() throws Exception + { + String expMessage = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + "<soapenv:Header></soapenv:Header>" + + "<soapenv:Body>" + + " <!-- Comment One -->" + + " <typ:lookup xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " <!-- Comment Two -->" + + " <firstName>Joe</firstName>" + + " <surname>Bloggs</surname>" + + " <!-- Comment Three -->" + + " </typ:lookup>" + + "<!-- Comment Four -->" + + "</soapenv:Body>" + "</soapenv:Envelope>"; - MessageFactory factory = new MessageFactoryImpl(); - ByteArrayInputStream inputStream = new ByteArrayInputStream(expMsg.getBytes()); + MessageFactoryImpl factory = new MessageFactoryImpl(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(expMessage.getBytes()); SOAPMessage soapMsg = factory.createMessage(null, inputStream); - SOAPEnvelope env = soapMsg.getSOAPPart().getEnvelope(); - System.out.println("FIXME: [JBWS-1511] MessageFactory does not preserve comments"); - //assertEquals(DOMUtils.parse(expMsg), (Element)env); - } -} \ No newline at end of file + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + soapMsg.writeTo(outputStream); + + String actualMessage = new String(outputStream.toByteArray(), "UTF-8"); + + assertEquals(expMessage, actualMessage); + } + +} Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,24 +1,24 @@ /* - * 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. - */ + * 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.soap; import java.io.ByteArrayInputStream; @@ -52,15 +52,8 @@ { Name name = new NameImpl("Order", "tns", "http://someURI"); - String xmlFragment = - "<tns:Order xmlns:tns='http://someURI'>" + - "<OrderItem>Ferarri</OrderItem>" + - "<OrderItem>Lamborgini</OrderItem>" + - "<OrderItem>JBoss Support</OrderItem>" + - "<Customer>" + - "<Name>Thomas</Name>" + - "</Customer>" + - "</tns:Order>"; + String xmlFragment = "<tns:Order xmlns:tns='http://someURI'>" + "<OrderItem>Ferarri</OrderItem>" + "<OrderItem>Lamborgini</OrderItem>" + + "<OrderItem>JBoss Support</OrderItem>" + "<Customer>" + "<Name>Thomas</Name>" + "</Customer>" + "</tns:Order>"; SOAPContentElement soapEl = new SOAPContentElement(name); soapEl.setXMLFragment(new XMLFragment(xmlFragment) ); @@ -148,6 +141,7 @@ SOAPContentElement soapEl = new SOAPContentElement(name); soapEl.setAttribute("foo", "Kermit"); soapEl.setXMLFragment(new XMLFragment(xmlFragment) ); + assertEquals(name, soapEl.getElementName()); assertEquals("Kermit", soapEl.getAttributeValue(new NameImpl("foo"))); @@ -158,14 +152,8 @@ */ public void testTextNodeAccess() throws Exception { - String envStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - "<env:Body>" + - "<ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'>" + - "<String_1>world</String_1>" + - "</ns1:hello>" + - "</env:Body>" + - "</env:Envelope>"; + String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + "<env:Body>" + "<ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'>" + + "<String_1>world</String_1>" + "</ns1:hello>" + "</env:Body>" + "</env:Envelope>"; MessageFactory factory = MessageFactory.newInstance(); SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); @@ -185,6 +173,8 @@ soapMessage.writeTo(baos); String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>wo... header was added</String_1></ns1:hello></env:Body></env:Envelope>"; + System.out.println(expEnv); + System.out.println(baos.toString()); assertEquals(expEnv, baos.toString()); } } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -33,6 +33,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.core.soap.NameImpl; /** * Test the SOAPElement @@ -114,8 +115,10 @@ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(xml.getBytes())); SOAPFactory soapFactory = SOAPFactory.newInstance(); - SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + Name name = new NameImpl("bear", "np", "http://northpole.net"); + SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements(name).next(); + assertEquals(2, getIteratorCount(bearElement.getAllAttributes())); Iterator it = bearElement.getAllAttributes(); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -38,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; /** @@ -76,12 +77,16 @@ MessageFactory factory = MessageFactory.newInstance(); SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault = (SOAPFault)soapBody.getChildElements().next(); + + Name name = new NameImpl("Fault", "env", "http://schemas.xmlsoap.org/soap/envelope/"); + SOAPFault soapFault = (SOAPFault)soapBody.getChildElements(name).next(); + assertEquals("env:Client", soapFault.getFaultCode()); assertEquals("Some fault message", soapFault.getFaultString()); assertEquals("Some fault actor", soapFault.getFaultActor()); assertEquals(createDetailElement(), soapFault.getDetail()); - + assertEquals(createDetailElement(), soapFault.getDetail()); + SOAPFaultException faultEx = SOAPFaultHelperJAXRPC.getSOAPFaultException((SOAPFault)soapFault); assertEquals(Constants.SOAP11_FAULT_CODE_CLIENT, faultEx.getFaultCode()); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -61,9 +61,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertEquals("BradPitt", shElement.getActor()); @@ -86,9 +87,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertTrue(shElement.getMustUnderstand()); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -206,7 +206,7 @@ assertEquals("SomeHeaderValue", foo.getValue()); assertEquals("SomeOtherValue", bar.getValue()); - assertFalse(soapHeader.getChildElements().hasNext()); + assertFalse(soapHeader.examineAllHeaderElements().hasNext()); } public void testExtractHeaderElements() throws Exception @@ -234,7 +234,7 @@ assertEquals("SomeOtherValue", bar.getValue()); - Iterator childElements = soapHeader.getChildElements(); + Iterator childElements = soapHeader.examineAllHeaderElements(); SOAPHeaderElement foo = (SOAPHeaderElement)childElements.next(); Name fooName = new NameImpl("Foo", "ns1", "http://org.jboss.ws/header"); Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647 (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -import java.io.ByteArrayOutputStream; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public abstract class AbstractHandler extends GenericHandler -{ - - private static final Logger log = Logger.getLogger(AbstractHandler.class); - - public abstract String getExpectedMessage(); - - public boolean handleRequest(MessageContext msgContext) - { - log.info("handleRequest"); - - boolean valid = false; - - SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; - - SOAPMessage soapMessage = messageContext.getMessage(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - String receivedMessage = ""; - try - { - soapMessage.writeTo(baos); - receivedMessage = baos.toString(); - } - catch (Exception e) - { - throw new RuntimeException("Unable to process SOAPMessage", e); - } - - valid = getExpectedMessage().equals(receivedMessage); - if (valid == false) - { - log.error("Received message does not equal expected message."); - log.info("EXP - " + getExpectedMessage()); - log.info("ACT - " + receivedMessage); - - throw new RuntimeException("Received message does not equal expected message."); - } - - return valid; - } - - public QName[] getHeaders() - { - return null; - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.utils.DOMWriter; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class AbstractHandler extends GenericHandler +{ + private static final Logger log = Logger.getLogger(AbstractHandler.class); + + public abstract String getMessageBody(); + + public boolean handleRequest(MessageContext msgContext) + { + log.info("handleRequest"); + + SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; + SOAPMessage soapMessage = messageContext.getMessage(); + + try + { + SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); + String wasEnv = DOMWriter.printNode(soapEnv, false); + String wasBody = wasEnv.substring(wasEnv.indexOf("<env:Body>")); + wasBody = wasBody.substring(0, wasBody.indexOf("</env:Envelope>")); + if (wasBody.equals(getMessageBody()) == false) + { + log.error("Exp Body: " + getMessageBody()); + log.error("Was Body: " + wasBody); + throw new RuntimeException("Received message does not contain expected soap body."); + } + } + catch (Exception e) + { + throw new RuntimeException("Unable to process SOAPMessage", e); + } + return true; + } + + public QName[] getHeaders() + { + return null; + } +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class DocumentHandler extends AbstractHandler -{ - - public static final String MESSAGE = - "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " <!-- Comment Before Header -->" + - " <soapenv:Header></soapenv:Header>" + - " <!-- Comment After Header, Before Body -->" + - " <soapenv:Body>" + - " <!-- Comment After Body -->" + - " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " <!-- Comment After Wrapper -->" + - " <String_1>My Message</String_1>" + - " <!-- Comment After Parameter -->" + - " </typ:echoMessage>" + - " <!-- Comment Before Close Body -->" + - " </soapenv:Body>" + - " <!-- Comment Before Close Envelope -->" + - "</soapenv:Envelope>"; - - public String getExpectedMessage() - { - return MESSAGE; - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class DocumentHandler extends AbstractHandler +{ + + public static final String MESSAGE_BODY = + "<env:Body>" + + " <!-- Comment After Body -->" + + " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + + " <!-- Comment After Wrapper -->" + + " <String_1>My Message</String_1>" + + " <!-- Comment After Parameter -->" + + " </typ:echoMessage>" + + " <!-- Comment Before Close Body -->" + + "</env:Body>"; + + public String getMessageBody() + { + return MESSAGE_BODY; + } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class JBWS1647DocumentTestCase extends TestCaseBase -{ - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); - } - - public String getMessage() - { - return DocumentHandler.MESSAGE; - } - - public String getToUrl() - { - return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import org.jboss.test.ws.JBossWSTestSetup; + +import junit.framework.Test; + +/** + * Text Node Preservation For Messages Sent Across The Wire + * + * http://jira.jboss.org/jira/browse/JBWS-1647 + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class JBWS1647DocumentTestCase extends JBWS1647TestBase +{ + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); + } + + public String getMessage() + { + return "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + DocumentHandler.MESSAGE_BODY + "</env:Envelope>"; + } + + public String getEndpointAddress() + { + return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; + } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public class JBWS1647RPCTestCase extends TestCaseBase -{ - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); - } - - public String getMessage() - { - return RpcHandler.MESSAGE; - } - - public String getToUrl() - { - return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import org.jboss.test.ws.JBossWSTestSetup; + +import junit.framework.Test; + +/** + * Text Node Preservation For Messages Sent Across The Wire + * + * http://jira.jboss.org/jira/browse/JBWS-1647 + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public class JBWS1647RPCTestCase extends JBWS1647TestBase +{ + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); + } + + public String getMessage() + { + return "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + RpcHandler.MESSAGE_BODY + "</env:Envelope>"; + } + + public String getEndpointAddress() + { + return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; + } + +} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java (from rev 3726, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import java.io.ByteArrayInputStream; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.test.ws.JBossWSTest; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class JBWS1647TestBase extends JBossWSTest +{ + public abstract String getMessage(); + + public abstract String getEndpointAddress(); + + public void testCall() throws Exception + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); + + SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); + SOAPConnection con = conFactory.createConnection(); + SOAPMessage resMessage = con.call(soapMessage, getEndpointAddress()); + + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); + } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class RpcHandler extends AbstractHandler -{ - - public static final String MESSAGE = - "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <!-- Comment Before Header -->" + - " <soapenv:Header></soapenv:Header>" + - " <!-- Comment After Header, Before Body -->" + - " <soapenv:Body>" + - " <!-- Comment After Body -->" + - " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + - " <!-- Comment After Operation -->" + - " <String_1>My Message</String_1>" + - " <!-- Comment After Parameter -->" + - " </jbw:echoMessage>" + - " <!-- Comment Before Close Body -->" + - " </soapenv:Body>" + - " <!-- Comment Before Close Envelope -->" + - "</soapenv:Envelope>"; - - public String getExpectedMessage() - { - return MESSAGE; - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class RpcHandler extends AbstractHandler +{ + + public static final String MESSAGE_BODY = + "<env:Body>" + + " <!-- Comment After Body -->" + + " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + + " <!-- Comment After Operation -->" + + " <String_1>My Message</String_1>" + + " <!-- Comment After Parameter -->" + + " </jbw:echoMessage>" + + " <!-- Comment Before Close Body -->" + + "</env:Body>"; + + public String getMessageBody() + { + return MESSAGE_BODY; + } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -import java.io.ByteArrayInputStream; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.test.ws.JBossWSTest; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public abstract class TestCaseBase extends JBossWSTest -{ - - public abstract String getMessage(); - - public abstract String getToUrl(); - - public void testCall() throws Exception - { - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); - - SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); - SOAPConnection con = conFactory.createConnection(); - SOAPMessage resMessage = con.call(soapMessage, getToUrl()); - - SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import java.io.ByteArrayInputStream; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.test.ws.JBossWSTest; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class TestCaseBase extends JBossWSTest +{ + + public abstract String getMessage(); + + public abstract String getToUrl(); + + public void testCall() throws Exception + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); + + SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); + SOAPConnection con = conFactory.createConnection(); + SOAPMessage resMessage = con.call(soapMessage, getToUrl()); + + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); + } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public interface TestEndpoint extends Remote -{ - - public String echoMessage(final String message) throws RemoteException; - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public interface TestEndpoint extends Remote +{ + + public String echoMessage(final String message) throws RemoteException; + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jaxrpc.jbws1647; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - private static final Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echoMessage(final String message) - { - return message; - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.jaxrpc.jbws1647; + +import org.jboss.logging.Logger; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + private static final Logger log = Logger.getLogger(TestEndpointImpl.class); + + public String echoMessage(final String message) + { + return message; + } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 15 11:14:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1647; - - -public class TestEndpoint_echoMessage_RequestStruct -{ - -protected java.lang.String string_1; -public TestEndpoint_echoMessage_RequestStruct(){} - -public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){ -this.string_1=string_1; -} -public java.lang.String getString_1() { return string_1 ;} - -public void setString_1(java.lang.String string_1){ this.string_1=string_1; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 15 11:14:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1647; + + +public class TestEndpoint_echoMessage_RequestStruct +{ + +protected java.lang.String string_1; +public TestEndpoint_echoMessage_RequestStruct(){} + +public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){ +this.string_1=string_1; +} +public java.lang.String getString_1() { return string_1 ;} + +public void setString_1(java.lang.String string_1){ this.string_1=string_1; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 15 11:14:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1647; - - -public class TestEndpoint_echoMessage_ResponseStruct -{ - -protected java.lang.String result; -public TestEndpoint_echoMessage_ResponseStruct(){} - -public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){ -this.result=result; -} -public java.lang.String getResult() { return result ;} - -public void setResult(java.lang.String result){ this.result=result; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 15 11:14:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1647; + + +public class TestEndpoint_echoMessage_ResponseStruct +{ + +protected java.lang.String result; +public TestEndpoint_echoMessage_ResponseStruct(){} + +public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){ +this.result=result; +} +public java.lang.String getResult() { return result ;} + +public void setResult(java.lang.String result){ this.result=result; } + +} Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -28,6 +28,7 @@ import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; @@ -37,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -115,7 +117,7 @@ String xmlStr = "<?xml version='1.0' encoding='UTF-8' ?>" + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:tns='http://uri.jboss.org'>" + " <env:Body>" + - " <tns:testMessage><![CDATA[ Hello ]]></tns:testMessage>" + + " <tns:myMessage><![CDATA[ Hello ]]></tns:myMessage>" + " </env:Body>" + "</env:Envelope>"; @@ -185,8 +187,10 @@ SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next(); + Name name = new NameImpl("myMessage", "tns", "http://uri.jboss.org"); + SOAPElement soapElement = (SOAPElement)soapBody.getChildElements(name).next(); + StringBuffer builder = new StringBuffer(); NodeList nlist = soapElement.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,24 +1,24 @@ /* - * 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. - */ + * 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.jaxrpc.marshall; import java.math.BigDecimal; @@ -36,7 +36,7 @@ /** * Test standard JAX-RPC types. - * + * * @author Thomas.Diesler(a)jboss.org * @since 15-Feb-2005 */ @@ -227,8 +227,8 @@ { Calendar in = new GregorianCalendar(1968, 5, 16, 14, 23, 55); /** - * Will be a problem where the JVM is running in a TZ which - * has Daylight Saving Time influence. So offset the TZ to GMT. + * Will be a problem where the JVM is running in a TZ which has Daylight + * Saving Time influence. So offset the TZ to GMT. */ in.setTimeZone(TimeZone.getTimeZone("GMT-0")); Calendar out = calendarTest(in); @@ -607,6 +607,11 @@ String in = "one"; String out = stringTest(in); assertEquals(in, out); + + System.out.println("FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string"); + //in = " "; + //out = stringTest(in); + //assertEquals(in, out); } public void testStringSpecialChars() throws Exception Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -60,9 +60,13 @@ log.info("handleRequest"); QName[] headers = getHeaders(); - if (headers == null || headers.length != 3) - throw new IllegalStateException("Invalid number of headers"); + if (headers == null) + throw new IllegalStateException("Unable to retrieve headers"); + + if (headers.length != 3) + throw new IllegalStateException("Invalid number of headers expected=3, actual=" + headers.length); + try { SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -22,12 +22,14 @@ package org.jboss.test.ws.jaxws.handlerlifecycle; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -186,8 +188,31 @@ String testMethod; try { - SOAPElement soapElement = (SOAPElement)((SOAPMessageContext)msgContext).getMessage().getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); + SOAPMessage message = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = null; + Iterator it = message.getSOAPBody().getChildElements(); + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + + it = soapElement.getChildElements(); + soapElement = null; + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + testMethod = soapElement.getValue(); } catch (SOAPException e) Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -86,7 +86,7 @@ // Set the updated payload source = new DOMSource(root); - logicalContext.getMessage().setPayload(source); + logicalContext.getMessage().setPayload(source); return true; } Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -31,6 +31,7 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPEnvelope; @@ -45,6 +46,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.w3c.dom.Element; @@ -131,7 +133,9 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - Element child = (Element)resEnv.getBody().getChildElements().next(); + Name name = new NameImpl("user", "ns1", "http://org.jboss.ws/provider"); + Element child = (Element)resEnv.getBody().getChildElements(name).next(); + JAXBContext jc = JAXBContext.newInstance(new Class[]{UserType.class}); UserType user = (UserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-08-24 13:44:43 UTC (rev 4497) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-08-24 14:19:52 UTC (rev 4498) @@ -47,6 +47,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMWriter; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.w3c.dom.Element; @@ -87,6 +88,20 @@ assertEquals(DOMUtils.parse(resString), docElement); } + private Dispatch<Source> createDispatch(String target) throws MalformedURLException, JAXBException + { + String targetNS = "http://org.jboss.ws/provider"; + QName serviceName = new QName(targetNS, "ProviderService"); + QName portName = new QName(targetNS, "ProviderPort"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload/" + target + "?wsdl"); + + Service service = Service.create(serviceName); + service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); + + Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); + return dispatch; + } + public void testProviderMessage() throws Exception { String reqEnvStr = @@ -94,12 +109,6 @@ " <env:Body>" + reqString + "</env:Body>" + "</env:Envelope>"; - String resEnvString = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + resString + "</env:Body>" + - "</env:Envelope>"; - MessageFactory msgFactory = MessageFactory.newInstance(); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes())); @@ -108,20 +117,12 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - assertEquals(DOMUtils.parse(resEnvString), resEnv); + SOAPHeader soapHeader = resEnv.getHeader(); + if (soapHeader != null) + soapHeader.detachNode(); + + String resEnvStr = DOMWriter.printNode(resEnv, false); + assertTrue("Expected payload: " + resString, resEnvStr.indexOf(resString) > 0); } - private Dispatch<Source> createDispatch(String target) throws MalformedURLException, JAXBException - { - String targetNS = "http://org.jboss.ws/provider"; - QName serviceName = new QName(targetNS, "ProviderService"); - QName portName = new QName(targetNS, "ProviderPort"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload/" + target + "?wsdl"); - - Service service = Service.create(serviceName); - service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); - - Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); - return dispatch; - } } Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647 (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647) Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit) Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,56 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>string_1</java-variable-name> - <xml-element-name>String_1</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,56 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>string_1</java-variable-name> + <xml-element-name>String_1</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>result</java-variable-name> + <xml-element-name>result</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,21 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> - </handler> - - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,21 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> + </handler> + + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='echoMessage'> - <sequence> - <element name='String_1' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='echoMessageResponse'> - <sequence> - <element name='result' nillable='true' type='string'/> - </sequence> - </complexType> - <element name='echoMessage' type='tns:echoMessage'/> - <element name='echoMessageResponse' type='tns:echoMessageResponse'/> - </schema> - </types> - <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:echoMessage' name='echoMessage'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part element='ns1:echoMessageResponse' name='echoMessageResponse'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='echoMessage'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='echoMessage'> + <sequence> + <element name='String_1' nillable='true' type='string'/> + </sequence> + </complexType> + <complexType name='echoMessageResponse'> + <sequence> + <element name='result' nillable='true' type='string'/> + </sequence> + </complexType> + <element name='echoMessage' type='tns:echoMessage'/> + <element name='echoMessageResponse' type='tns:echoMessageResponse'/> + </schema> + </types> + <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:echoMessage' name='echoMessage'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part element='ns1:echoMessageResponse' name='echoMessageResponse'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoMessage' parameterOrder='echoMessage'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools.sh -cp ../../../../../output/classes -config wstools-config.xml ---> - -<!-- Add the following handler to the generated webservices.xml - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> - </handler> - ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools.sh -cp ../../../../../output/classes -config wstools-config.xml +--> + +<!-- Add the following handler to the generated webservices.xml + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> + </handler> + +--> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit) Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,21 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> - </handler> - - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,21 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> + </handler> + + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoMessage'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echoMessage'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoMessage' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools.sh -cp ../../../../../output/classes -config wstools-config.xml ---> - -<!-- Add the following handler to the generated webservices.xml - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> - </handler> - ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (from rev 3124, branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-08-24 14:19:52 UTC (rev 4498) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools.sh -cp ../../../../../output/classes -config wstools-config.xml +--> + +<!-- Add the following handler to the generated webservices.xml + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> + </handler> + +--> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration>