jbossws-commits July 2008

jbossws-commits@lists.jboss.org

1 participants
221 discussions

JBossWS SVN: r7892 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/jaxrpc and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-23 06:56:20 -0400 (Wed, 23 Jul 2008) New Revision: 7892 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java Log: [JBPAPP-997] SOAP 1.2 Endpoint sends SOAP 1.1 messages. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml 2008-07-23 09:48:21 UTC (rev 7891) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -2708,6 +2708,35 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws2234.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws2234/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws2234/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="custom-endpoint-config.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws2234-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jbws2234/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws2234/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws2234/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> +  <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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-07-23 09:48:21 UTC (rev 7891) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -341,7 +341,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/> </fileset> </jar> - +  <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -480,6 +480,18 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws2234.war" webxml="${tests.output.dir}/resources/jaxws/jbws2234/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws2234/*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws2234/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-23 09:48:21 UTC (rev 7891) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -33,26 +33,27 @@ import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.Detail; import javax.xml.soap.DetailEntry; -import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.CommonSOAPFaultException; +import org.jboss.ws.core.binding.AbstractDeserializerFactory; +import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; @@ -61,6 +62,7 @@ import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; @@ -191,7 +193,15 @@ } else { - QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + QName faultCode; + if (isSOAP12() == false) + { + faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + } + else + { + faultCode = SOAPConstants.SOAP_RECEIVER_FAULT; + } String faultString = (reqEx.getMessage() != null ? reqEx.getMessage() : reqEx.toString()); faultEx = new SOAPFaultException(faultCode, faultString, null, null); faultEx.initCause(reqEx); @@ -224,8 +234,7 @@ SerializationContext serContext = (msgContext != null ? msgContext.getSerializationContext() : new SerializationContextJAXRPC()); NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPEnvelopeImpl soapEnvelope = (SOAPEnvelopeImpl)soapMessage.getSOAPPart().getEnvelope(); SOAPBody soapBody = soapEnvelope.getBody(); @@ -298,6 +307,34 @@ return soapMessage; } + private static SOAPMessageImpl createSOAPMessage() throws SOAPException + { + MessageFactoryImpl factory = new MessageFactoryImpl(); + + if (isSOAP12() == true) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + return (SOAPMessageImpl)factory.createMessage(); + } + + private static boolean isSOAP12() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + EndpointMetaData emd = msgContext.getEndpointMetaData(); + String bindingId = emd.getBindingId(); + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + { + return true; + } + } + + return false; + } + private static String getValidFaultString(SOAPFaultException faultEx) { String faultString = faultEx.getFaultString(); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-23 09:48:21 UTC (rev 7891) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -23,6 +23,7 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; @@ -30,6 +31,7 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.WebServiceException; +import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; import org.jboss.logging.Logger; @@ -44,14 +46,18 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; +import com.ibm.wsdl.extensions.soap12.SOAP12Constants; + /** * Helper methods to translate between SOAPFault and SOAPFaultException * as well as between Exception and SOAPMessage containing a fault. @@ -133,7 +139,8 @@ throw new WebServiceException(e); } } - else log.debug("Cannot find fault meta data for: " + xmlName); + else + log.debug("Cannot find fault meta data for: " + xmlName); } } @@ -172,8 +179,7 @@ private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx) throws SOAPException { - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); populateSOAPFault(soapBody, faultEx); @@ -228,8 +234,7 @@ private static SOAPMessageImpl toSOAPMessage(Exception ex) throws SOAPException { - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPFault soapFault; @@ -268,17 +273,53 @@ SOAPElement detailEntry = toDetailEntry(faultBean, serContext, faultMetaData); detail.addChildElement(detailEntry); } - else log.debug("Cannot obtain fault meta data for: " + exClass); + else + log.debug("Cannot obtain fault meta data for: " + exClass); return soapMessage; } + private static SOAPMessageImpl createSOAPMessage() throws SOAPException + { + MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + + if (isSOAP12() == true) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + return (SOAPMessageImpl)factory.createMessage(); + } + + private static boolean isSOAP12() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + EndpointMetaData emd = msgContext.getEndpointMetaData(); + String bindingId = emd.getBindingId(); + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + { + return true; + } + } + + return false; + } + private static Name getFallbackFaultCode() { /* faultcode * X. SOAPFaultException.getFault().getFaultCodeAsQName() * 2. env:Server (Subcode omitted for SOAP 1.2) */ - return new NameImpl(Constants.SOAP11_FAULT_CODE_SERVER); + if (isSOAP12() == false) + { + return new NameImpl(Constants.SOAP11_FAULT_CODE_SERVER); + } + else + { + return new NameImpl(SOAPConstants.SOAP_RECEIVER_FAULT); + } } private static String getFallbackFaultString(Exception ex) Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2008-07-23 09:48:21 UTC (rev 7891) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -91,7 +91,7 @@ private final static Logger log = Logger.getLogger(MetaDataBuilder.class); /** Inititialize the endpoint binding */ - protected void initEndpointBinding(WSDLEndpoint wsdlEndpoint, ClientEndpointMetaData epMetaData) + protected void initEndpointBinding(WSDLEndpoint wsdlEndpoint, EndpointMetaData epMetaData) { WSDLDefinitions wsdlDefinitions = wsdlEndpoint.getWsdlService().getWsdlDefinitions(); WSDLInterface wsdlInterface = wsdlEndpoint.getInterface(); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2008-07-23 09:48:21 UTC (rev 7891) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -145,6 +145,7 @@ initEndpointEncodingStyle(sepMetaData); initEndpointAddress(dep, sepMetaData); + initEndpointBinding(wsdlEndpoint, sepMetaData); EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); JSEArchiveMetaData webMetaData = dep.getAttachment(JSEArchiveMetaData.class); Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234 (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages - * - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - * @see https://jira.jboss.org/jira/browse/JBWS-2234 - */ -public class JBWS2234TestCase extends JBossWSTest -{ - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - public void testCall() throws Exception - { - final String message = "Hello!!"; - String response = port.echo(message); - - assertEquals(message, response); - } - - public void testCheckedException() throws Exception - { - try - { - port.echo(TestEndpointImpl.TEST_EXCEPTION); - fail("Excpected TestException not thrown."); - } - catch (TestException te) - { - } - } - - public void testRuntimeException() - { - try - { - port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); - fail("Excpected Exception not thrown."); - } - catch (Exception e) - { - assertEquals("Simulated failure", e.getCause().getMessage()); - } - } -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + * @see https://jira.jboss.org/jira/browse/JBWS-2234 + */ +public class JBWS2234TestCase extends JBossWSTest +{ + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); + } + + public void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + + public void testCall() throws Exception + { + final String message = "Hello!!"; + String response = port.echo(message); + + assertEquals(message, response); + } + + public void testCheckedException() throws Exception + { + try + { + port.echo(TestEndpointImpl.TEST_EXCEPTION); + fail("Excpected TestException not thrown."); + } + catch (TestException te) + { + } + } + + public void testRuntimeException() + { + try + { + port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); + fail("Excpected Exception not thrown."); + } + catch (Exception e) + { + assertEquals("Simulated failure", e.getCause().getMessage()); + } + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public interface TestEndpoint extends Remote -{ - - public String echo(final String message) throws TestException, RemoteException; - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public interface TestEndpoint extends Remote +{ + + public String echo(final String message) throws TestException, RemoteException; + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public static final String TEST_EXCEPTION = "TestException"; - - public static final String RUNTIME_EXCEPTION = "RuntimeException"; - - public String echo(String message) throws TestException - { - if (TEST_EXCEPTION.equals(message)) - { - throw new TestException(); - } - else if (RUNTIME_EXCEPTION.equals(message)) - { - throw new RuntimeException("Simulated failure"); - } - return message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public static final String TEST_EXCEPTION = "TestException"; + + public static final String RUNTIME_EXCEPTION = "RuntimeException"; + + public String echo(String message) throws TestException + { + if (TEST_EXCEPTION.equals(message)) + { + throw new TestException(); + } + else if (RUNTIME_EXCEPTION.equals(message)) + { + throw new RuntimeException("Simulated failure"); + } + return message; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestException extends Exception -{ - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestException extends Exception +{ + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -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.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestHandler extends GenericHandler -{ - - private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; - - @Override - public QName[] getHeaders() - { - return null; - } - - public boolean handleMessage(final MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPPart part = soapMessage.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - - String namespace = envelope.getNamespaceURI(); - if (SOAP_1_2.equals(namespace) == false) - { - throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); - } - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - return true; - } - - @Override - public boolean handleFault(final MessageContext msgContext) - { - return handleMessage(msgContext); - } - - @Override - public boolean handleRequest(MessageContext msgContext) - { - return handleMessage(msgContext); - } - - @Override - public boolean handleResponse(MessageContext msgContext) - { - return handleMessage(msgContext); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +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.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestHandler extends GenericHandler +{ + + private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; + + @Override + public QName[] getHeaders() + { + return null; + } + + public boolean handleMessage(final MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPPart part = soapMessage.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + + String namespace = envelope.getNamespaceURI(); + if (SOAP_1_2.equals(namespace) == false) + { + throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); + } + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + return true; + } + + @Override + public boolean handleFault(final MessageContext msgContext) + { + return handleMessage(msgContext); + } + + @Override + public boolean handleRequest(MessageContext msgContext) + { + return handleMessage(msgContext); + } + + @Override + public boolean handleResponse(MessageContext msgContext) + { + return handleMessage(msgContext); + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234 (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages - * - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - * @see https://jira.jboss.org/jira/browse/JBWS-2234 - */ -public class JBWS2234TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2234?wsdl"); - QName serviceName = new QName("http://org.jboss.test.ws/jbws2234", "TestService"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(TestEndpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - List<Handler> handlerChain = new ArrayList<Handler>(); - handlerChain.add(new TestHandler()); - bindingProvider.getBinding().setHandlerChain(handlerChain); - } - - public void testCall() throws Exception - { - final String message = "Hello!!"; - String response = port.echo(message); - - assertEquals(message, response); - } - - public void testCheckedException() throws Exception - { - try - { - port.echo(TestEndpointImpl.TEST_EXCEPTION); - fail("Excpected TestException not thrown."); - } - catch (TestException_Exception te) - { - } - } - - public void testRuntimeException() - { - try - { - port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); - fail("Excpected Exception not thrown."); - } - catch (Exception e) - { - assertEquals("Simulated failure", e.getMessage()); - } - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.handler.Handler; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + * @see https://jira.jboss.org/jira/browse/JBWS-2234 + */ +public class JBWS2234TestCase extends JBossWSTest +{ + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2234?wsdl"); + QName serviceName = new QName("http://org.jboss.test.ws/jbws2234", "TestService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(TestEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.add(new TestHandler()); + bindingProvider.getBinding().setHandlerChain(handlerChain); + } + + public void testCall() throws Exception + { + final String message = "Hello!!"; + String response = port.echo(message); + + assertEquals(message, response); + } + + public void testCheckedException() throws Exception + { + try + { + port.echo(TestEndpointImpl.TEST_EXCEPTION); + fail("Excpected TestException not thrown."); + } + catch (TestException_Exception te) + { + } + } + + public void testRuntimeException() + { + try + { + port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); + fail("Excpected Exception not thrown."); + } + catch (Exception e) + { + assertEquals("Simulated failure", e.getMessage()); + } + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.jbws2234 package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _TestException_QNAME = new QName("http://org.jboss.test.ws/jbws2234/types", "TestException"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws2234 - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link TestException } - * - */ - public TestException createTestException() { - return new TestException(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://org.jboss.test.ws/jbws2234/types", name = "TestException") - public JAXBElement<TestException> createTestException(TestException value) { - return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jbws2234 package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _TestException_QNAME = new QName("http://org.jboss.test.ws/jbws2234/types", "TestException"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws2234 + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link TestException } + * + */ + public TestException createTestException() { + return new TestException(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.test.ws/jbws2234/types", name = "TestException") + public JAXBElement<TestException> createTestException(TestException value) { + return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.BindingType; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.3-b02- - * Generated source version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2234") -@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param string1 - * @return - * returns java.lang.String - * @throws TestException_Exception - */ - @WebMethod - @WebResult(name = "result", partName = "result") - public String echo( - @WebParam(name = "String_1", partName = "String_1") - String string1) - throws TestException_Exception - ; - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2234") +@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param string1 + * @return + * returns java.lang.String + * @throws TestException_Exception + */ + @WebMethod + @WebResult(name = "result", partName = "result") + public String echo( + @WebParam(name = "String_1", partName = "String_1") + String string1) + throws TestException_Exception + ; + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.jws.WebService; -import javax.xml.ws.BindingType; - -/** - * Test Endpoint implementation. - * - * @author darran.lofthouse(a)jboss.com - * @since July 22, 2008 - */ -@WebService(name = "TestEndpoint", portName="TestEndpointPort", targetNamespace = "http://org.jboss.test.ws/jbws2234", endpointInterface = "org.jboss.test.ws.jaxws.jbws2234.TestEndpoint", wsdlLocation="WEB-INF/wsdl/TestService.wsdl") -@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") -public class TestEndpointImpl implements TestEndpoint -{ - - public static final String TEST_EXCEPTION = "TestException"; - - public static final String RUNTIME_EXCEPTION = "RuntimeException"; - - public String echo(String message) throws TestException_Exception - { - if (TEST_EXCEPTION.equals(message)) - { - TestException te = new TestException(); - throw new TestException_Exception(message, te); - } - else if (RUNTIME_EXCEPTION.equals(message)) - { - throw new RuntimeException("Simulated failure"); - } - return message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +/** + * Test Endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since July 22, 2008 + */ +@WebService(name = "TestEndpoint", portName="TestEndpointPort", targetNamespace = "http://org.jboss.test.ws/jbws2234", endpointInterface = "org.jboss.test.ws.jaxws.jbws2234.TestEndpoint", wsdlLocation="WEB-INF/wsdl/TestService.wsdl") +@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") +public class TestEndpointImpl implements TestEndpoint +{ + + public static final String TEST_EXCEPTION = "TestException"; + + public static final String RUNTIME_EXCEPTION = "RuntimeException"; + + public String echo(String message) throws TestException_Exception + { + if (TEST_EXCEPTION.equals(message)) + { + TestException te = new TestException(); + throw new TestException_Exception(message, te); + } + else if (RUNTIME_EXCEPTION.equals(message)) + { + throw new RuntimeException("Simulated failure"); + } + return message; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for TestException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="TestException"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TestException") -public class TestException { - - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for TestException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TestException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TestException") +public class TestException { + + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.ws.WebFault; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.3-b02- - * Generated source version: 2.0 - * - */ -@WebFault(name = "TestException", targetNamespace = "http://org.jboss.test.ws/jbws2234/types") -public class TestException_Exception - extends Exception -{ - - /** - * Java type that goes as soapenv:Fault detail element. - * - */ - private TestException faultInfo; - - /** - * - * @param faultInfo - * @param message - */ - public TestException_Exception(String message, TestException faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * - * @param faultInfo - * @param message - * @param cause - */ - public TestException_Exception(String message, TestException faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * - * @return - * returns fault bean: org.jboss.test.ws.jaxws.jbws2234.TestException - */ - public TestException getFaultInfo() { - return faultInfo; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebFault(name = "TestException", targetNamespace = "http://org.jboss.test.ws/jbws2234/types") +public class TestException_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private TestException faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public TestException_Exception(String message, TestException faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public TestException_Exception(String message, TestException faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jbws2234.TestException + */ + public TestException getFaultInfo() { + return faultInfo; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestHandler implements Handler -{ - - private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; - - public void close(MessageContext context) - { - } - - public boolean handleFault(MessageContext context) - { - return handleMessage(context); - } - - public boolean handleMessage(MessageContext context) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); - SOAPPart part = soapMessage.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - - String namespace = envelope.getNamespaceURI(); - if (SOAP_1_2.equals(namespace) == false) - { - throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); - } - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - return true; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestHandler implements Handler +{ + + private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; + + public void close(MessageContext context) + { + } + + public boolean handleFault(MessageContext context) + { + return handleMessage(context); + } + + public boolean handleMessage(MessageContext context) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); + SOAPPart part = soapMessage.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + + String namespace = envelope.getNamespaceURI(); + if (SOAP_1_2.equals(namespace) == false) + { + throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); + } + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + return true; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,24 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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. - */ - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.test.ws/jbws2234/types") -package org.jboss.test.ws.jaxws.jbws2234; Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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. + */ + +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.test.ws/jbws2234/types") +package org.jboss.test.ws.jaxws.jbws2234; Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234 (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client 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/application-client_1_4.xsd" + version="1.4"> + + <display-name>TestService</display-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,46 +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.jbws2234</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type> - <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>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.jbws2234.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echo</java-method-name> - <wsdl-operation>echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,46 @@ +<?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.jbws2234</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type> + <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>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.jbws2234.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echo</java-method-name> + <wsdl-operation>echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -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.jbws2234.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -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.jbws2234.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,19 +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/jbws2234'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.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.jbws2234.TestHandler</handler-class> - </handler> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,19 @@ +<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/jbws2234'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.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.jbws2234.TestHandler</handler-class> + </handler> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='TestException'> - <sequence/> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - </types> - <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <message name='TestException'> - <part element='ns1:TestException' name='TestException'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap12:operation soapAction=''/> - <input> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </input> - <output> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </output> - <fault name='TestException'> - <soap12:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='TestException'> + <sequence/> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + </types> + <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <message name='TestException'> + <part element='ns1:TestException' name='TestException'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap12:operation soapAction=''/> + <input> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </input> + <output> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </output> + <fault name='TestException'> + <soap12:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<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.jbws2234.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<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.jbws2234.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234 (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - <context-root>/jaxws-jbws2234</context-root> -</jboss-web> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws2234</context-root> +</jboss-web> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" 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"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2234.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2234.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 19:02:47 UTC (rev 7888) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-23 10:56:20 UTC (rev 7892) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='TestException'> - <sequence/> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - </types> - <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <message name='TestException'> - <part element='ns1:TestException' name='TestException'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap12:operation soapAction=''/> - <input> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </input> - <output> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </output> - <fault name='TestException'> - <soap12:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl (from rev 7888, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-23 10:56:20 UTC (rev 7892) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='TestException'> + <sequence/> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + </types> + <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <message name='TestException'> + <part element='ns1:TestException' name='TestException'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap12:operation soapAction=''/> + <input> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </input> + <output> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </output> + <fault name='TestException'> + <soap12:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7891 - in stack/native/trunk: modules/resources/src/main/resources/resources and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-07-23 05:48:21 -0400 (Wed, 23 Jul 2008) New Revision: 7891 Modified: stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2263] container integration lives in AS code base, don't replace it (WIP) Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/modules/management/pom.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -45,7 +45,7 @@ <artifactId>jbossws-jboss424x</artifactId> <scope>runtime</scope> </dependency> - <dependency> +  <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -307,14 +307,16 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-(a){jbossid}.jar"/> +  +   </fileset> </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> +  +  </sequential> </macrodef> @@ -322,7 +324,8 @@   - <macrodef name="macro-deploy-jbossws-deploy50"> +  +    @@ -366,7 +369,8 @@ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> +  +  <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> @@ -384,7 +388,7 @@   - <macrodef name="macro-undeploy-jbossws"> + <macrodef name="macro-undeploy-jbossws42"> <attribute name="defaultconf"/> <attribute name="targetdir"/> <sequential> @@ -419,5 +423,43 @@ </sequential> </macrodef> + + <macrodef name="macro-undeploy-jbossws50"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + +  +  +  + +  + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + +  + <delete dir="@{targetdir}"/> + +  + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + </project> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -47,7 +47,7 @@ <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target>  @@ -69,7 +69,7 @@ <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target>  @@ -91,7 +91,7 @@ <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424"> <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> - <macro-undeploy-jbossws targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target>  @@ -128,7 +128,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>  <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>  @@ -154,7 +154,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target>  Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -106,7 +106,7 @@ <include>*:jbossws-jboss424x:jar</include> </includes> </dependencySet> - <dependencySet> +  </dependencySets> </binaries> </moduleSet>

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7890 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-23 05:35:00 -0400 (Wed, 23 Jul 2008) New Revision: 7890 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java Log: [JBWS-2234] Fix test regression. Switch to use org.jboss.ws.core.soap.MessageFactoryImpl directly. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-23 07:27:22 UTC (rev 7889) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-23 09:35:00 UTC (rev 7890) @@ -33,7 +33,6 @@ import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.Detail; import javax.xml.soap.DetailEntry; -import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPConstants; @@ -50,11 +49,11 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.AbstractDeserializerFactory; +import org.jboss.ws.core.binding.AbstractSerializerFactory; +import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; @@ -310,7 +309,7 @@ private static SOAPMessageImpl createSOAPMessage() throws SOAPException { - MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + MessageFactoryImpl factory = new MessageFactoryImpl(); if (isSOAP12() == true) {

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7889 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-07-23 03:27:22 -0400 (Wed, 23 Jul 2008) New Revision: 7889 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: fix native 424 bin dist regression Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-07-22 19:02:47 UTC (rev 7888) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-07-23 07:27:22 UTC (rev 7889) @@ -17,15 +17,15 @@ <target name="tests-prepare" depends="prepare">  - <condition property="jboss.home" value="${jboss421.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - </condition> <condition property="jboss.home" value="${jboss422.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> </condition> <condition property="jboss.home" value="${jboss423.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> </condition> + <condition property="jboss.home" value="${jboss424.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss424"/> + </condition> <condition property="jboss.home" value="${jboss500.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> </condition> @@ -168,9 +168,9 @@ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss421.jar"/> <pathelement location="${jboss.client}/jbossws-jboss422.jar"/> <pathelement location="${jboss.client}/jbossws-jboss423.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss424.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/>

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7888 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/jaxws and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-22 15:02:47 -0400 (Tue, 22 Jul 2008) New Revision: 7888 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-22 18:03:52 UTC (rev 7887) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -36,12 +36,14 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.Constants; @@ -61,6 +63,7 @@ import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; @@ -191,7 +194,15 @@ } else { - QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + QName faultCode; + if (isSOAP12() == false) + { + faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + } + else + { + faultCode = SOAPConstants.SOAP_RECEIVER_FAULT; + } String faultString = (reqEx.getMessage() != null ? reqEx.getMessage() : reqEx.toString()); faultEx = new SOAPFaultException(faultCode, faultString, null, null); faultEx.initCause(reqEx); @@ -224,8 +235,7 @@ SerializationContext serContext = (msgContext != null ? msgContext.getSerializationContext() : new SerializationContextJAXRPC()); NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPEnvelopeImpl soapEnvelope = (SOAPEnvelopeImpl)soapMessage.getSOAPPart().getEnvelope(); SOAPBody soapBody = soapEnvelope.getBody(); @@ -298,6 +308,34 @@ return soapMessage; } + private static SOAPMessageImpl createSOAPMessage() throws SOAPException + { + MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + + if (isSOAP12() == true) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + return (SOAPMessageImpl)factory.createMessage(); + } + + private static boolean isSOAP12() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + EndpointMetaData emd = msgContext.getEndpointMetaData(); + String bindingId = emd.getBindingId(); + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + { + return true; + } + } + + return false; + } + private static String getValidFaultString(SOAPFaultException faultEx) { String faultString = faultEx.getFaultString(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-22 18:03:52 UTC (rev 7887) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -23,6 +23,7 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; @@ -30,6 +31,7 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.WebServiceException; +import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; import org.jboss.logging.Logger; @@ -44,14 +46,18 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; +import com.ibm.wsdl.extensions.soap12.SOAP12Constants; + /** * Helper methods to translate between SOAPFault and SOAPFaultException * as well as between Exception and SOAPMessage containing a fault. @@ -136,7 +142,8 @@ throw new WebServiceException(e); } } - else log.debug("Cannot find fault meta data for: " + xmlName); + else + log.debug("Cannot find fault meta data for: " + xmlName); } } @@ -185,8 +192,7 @@ private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx) throws SOAPException { - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); populateSOAPFault(soapBody, faultEx); @@ -241,8 +247,7 @@ private static SOAPMessageImpl toSOAPMessage(Exception ex) throws SOAPException { - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -266,17 +271,53 @@ SOAPElement detailEntry = toDetailEntry(faultBean, serContext, faultMetaData); detail.addChildElement(detailEntry); } - else log.debug("Cannot obtain fault meta data for: " + exClass); + else + log.debug("Cannot obtain fault meta data for: " + exClass); return soapMessage; } + private static SOAPMessageImpl createSOAPMessage() throws SOAPException + { + MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + + if (isSOAP12() == true) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + return (SOAPMessageImpl)factory.createMessage(); + } + + private static boolean isSOAP12() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + EndpointMetaData emd = msgContext.getEndpointMetaData(); + String bindingId = emd.getBindingId(); + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + { + return true; + } + } + + return false; + } + private static Name getFallbackFaultCode() { /* faultcode * X. SOAPFaultException.getFault().getFaultCodeAsQName() * 2. env:Server (Subcode omitted for SOAP 1.2) */ - return new NameImpl(Constants.SOAP11_FAULT_CODE_SERVER); + if (isSOAP12() == false) + { + return new NameImpl(Constants.SOAP11_FAULT_CODE_SERVER); + } + else + { + return new NameImpl(SOAPConstants.SOAP_RECEIVER_FAULT); + } } private static String getFallbackFaultString(Exception ex) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-07-22 18:03:52 UTC (rev 7887) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -2694,6 +2694,34 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="custom-endpoint-config.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-client.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jbws2234/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-22 18:03:52 UTC (rev 7887) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -339,6 +339,18 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2234/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2234/*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2234/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234 (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages - * - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - * @see https://jira.jboss.org/jira/browse/JBWS-2234 - */ -public class JBWS2234TestCase extends JBossWSTest -{ - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - public void testCall() throws Exception - { - final String message = "Hello!!"; - String response = port.echo(message); - - assertEquals(message, response); - } - - public void testCheckedException() throws Exception - { - try - { - port.echo(TestEndpointImpl.TEST_EXCEPTION); - fail("Excpected TestException not thrown."); - } - catch (TestException te) - { - } - } - - public void testRuntimeException() - { - try - { - port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); - fail("Excpected Exception not thrown."); - } - catch (Exception e) - { - assertEquals("Simulated failure", e.getCause().getMessage()); - } - } -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + * @see https://jira.jboss.org/jira/browse/JBWS-2234 + */ +public class JBWS2234TestCase extends JBossWSTest +{ + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); + } + + public void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + + public void testCall() throws Exception + { + final String message = "Hello!!"; + String response = port.echo(message); + + assertEquals(message, response); + } + + public void testCheckedException() throws Exception + { + try + { + port.echo(TestEndpointImpl.TEST_EXCEPTION); + fail("Excpected TestException not thrown."); + } + catch (TestException te) + { + } + } + + public void testRuntimeException() + { + try + { + port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); + fail("Excpected Exception not thrown."); + } + catch (Exception e) + { + assertEquals("Simulated failure", e.getCause().getMessage()); + } + } +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public interface TestEndpoint extends Remote -{ - - public String echo(final String message) throws TestException, RemoteException; - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public interface TestEndpoint extends Remote +{ + + public String echo(final String message) throws TestException, RemoteException; + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public static final String TEST_EXCEPTION = "TestException"; - - public static final String RUNTIME_EXCEPTION = "RuntimeException"; - - public String echo(String message) throws TestException - { - if (TEST_EXCEPTION.equals(message)) - { - throw new TestException(); - } - else if (RUNTIME_EXCEPTION.equals(message)) - { - throw new RuntimeException("Simulated failure"); - } - return message; - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public static final String TEST_EXCEPTION = "TestException"; + + public static final String RUNTIME_EXCEPTION = "RuntimeException"; + + public String echo(String message) throws TestException + { + if (TEST_EXCEPTION.equals(message)) + { + throw new TestException(); + } + else if (RUNTIME_EXCEPTION.equals(message)) + { + throw new RuntimeException("Simulated failure"); + } + return message; + } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestException extends Exception -{ - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestException extends Exception +{ + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -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.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestHandler extends GenericHandler -{ - - private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; - - @Override - public QName[] getHeaders() - { - return null; - } - - public boolean handleMessage(final MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPPart part = soapMessage.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - - String namespace = envelope.getNamespaceURI(); - if (SOAP_1_2.equals(namespace) == false) - { - throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); - } - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - return true; - } - - @Override - public boolean handleFault(final MessageContext msgContext) - { - return handleMessage(msgContext); - } - - @Override - public boolean handleRequest(MessageContext msgContext) - { - return handleMessage(msgContext); - } - - @Override - public boolean handleResponse(MessageContext msgContext) - { - return handleMessage(msgContext); - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +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.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestHandler extends GenericHandler +{ + + private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; + + @Override + public QName[] getHeaders() + { + return null; + } + + public boolean handleMessage(final MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPPart part = soapMessage.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + + String namespace = envelope.getNamespaceURI(); + if (SOAP_1_2.equals(namespace) == false) + { + throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); + } + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + return true; + } + + @Override + public boolean handleFault(final MessageContext msgContext) + { + return handleMessage(msgContext); + } + + @Override + public boolean handleRequest(MessageContext msgContext) + { + return handleMessage(msgContext); + } + + @Override + public boolean handleResponse(MessageContext msgContext) + { + return handleMessage(msgContext); + } + +} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234 (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages - * - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - * @see https://jira.jboss.org/jira/browse/JBWS-2234 - */ -public class JBWS2234TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2234?wsdl"); - QName serviceName = new QName("http://org.jboss.test.ws/jbws2234", "TestService"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(TestEndpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - List<Handler> handlerChain = new ArrayList<Handler>(); - handlerChain.add(new TestHandler()); - bindingProvider.getBinding().setHandlerChain(handlerChain); - } - - public void testCall() throws Exception - { - final String message = "Hello!!"; - String response = port.echo(message); - - assertEquals(message, response); - } - - public void testCheckedException() throws Exception - { - try - { - port.echo(TestEndpointImpl.TEST_EXCEPTION); - fail("Excpected TestException not thrown."); - } - catch (TestException_Exception te) - { - } - } - - public void testRuntimeException() - { - try - { - port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); - fail("Excpected Exception not thrown."); - } - catch (Exception e) - { - assertEquals("Simulated failure", e.getMessage()); - } - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.handler.Handler; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + * @see https://jira.jboss.org/jira/browse/JBWS-2234 + */ +public class JBWS2234TestCase extends JBossWSTest +{ + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2234?wsdl"); + QName serviceName = new QName("http://org.jboss.test.ws/jbws2234", "TestService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(TestEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.add(new TestHandler()); + bindingProvider.getBinding().setHandlerChain(handlerChain); + } + + public void testCall() throws Exception + { + final String message = "Hello!!"; + String response = port.echo(message); + + assertEquals(message, response); + } + + public void testCheckedException() throws Exception + { + try + { + port.echo(TestEndpointImpl.TEST_EXCEPTION); + fail("Excpected TestException not thrown."); + } + catch (TestException_Exception te) + { + } + } + + public void testRuntimeException() + { + try + { + port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); + fail("Excpected Exception not thrown."); + } + catch (Exception e) + { + assertEquals("Simulated failure", e.getMessage()); + } + } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.jbws2234 package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _TestException_QNAME = new QName("http://org.jboss.test.ws/jbws2234/types", "TestException"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws2234 - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link TestException } - * - */ - public TestException createTestException() { - return new TestException(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://org.jboss.test.ws/jbws2234/types", name = "TestException") - public JAXBElement<TestException> createTestException(TestException value) { - return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value); - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jbws2234 package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _TestException_QNAME = new QName("http://org.jboss.test.ws/jbws2234/types", "TestException"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws2234 + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link TestException } + * + */ + public TestException createTestException() { + return new TestException(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.test.ws/jbws2234/types", name = "TestException") + public JAXBElement<TestException> createTestException(TestException value) { + return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value); + } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.BindingType; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.3-b02- - * Generated source version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2234") -@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param string1 - * @return - * returns java.lang.String - * @throws TestException_Exception - */ - @WebMethod - @WebResult(name = "result", partName = "result") - public String echo( - @WebParam(name = "String_1", partName = "String_1") - String string1) - throws TestException_Exception - ; - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2234") +@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param string1 + * @return + * returns java.lang.String + * @throws TestException_Exception + */ + @WebMethod + @WebResult(name = "result", partName = "result") + public String echo( + @WebParam(name = "String_1", partName = "String_1") + String string1) + throws TestException_Exception + ; + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.jws.WebService; -import javax.xml.ws.BindingType; - -/** - * Test Endpoint implementation. - * - * @author darran.lofthouse(a)jboss.com - * @since July 22, 2008 - */ -@WebService(name = "TestEndpoint", portName="TestEndpointPort", targetNamespace = "http://org.jboss.test.ws/jbws2234", endpointInterface = "org.jboss.test.ws.jaxws.jbws2234.TestEndpoint", wsdlLocation="WEB-INF/wsdl/TestService.wsdl") -@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") -public class TestEndpointImpl implements TestEndpoint -{ - - public static final String TEST_EXCEPTION = "TestException"; - - public static final String RUNTIME_EXCEPTION = "RuntimeException"; - - public String echo(String message) throws TestException_Exception - { - if (TEST_EXCEPTION.equals(message)) - { - TestException te = new TestException(); - throw new TestException_Exception(message, te); - } - else if (RUNTIME_EXCEPTION.equals(message)) - { - throw new RuntimeException("Simulated failure"); - } - return message; - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +/** + * Test Endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since July 22, 2008 + */ +@WebService(name = "TestEndpoint", portName="TestEndpointPort", targetNamespace = "http://org.jboss.test.ws/jbws2234", endpointInterface = "org.jboss.test.ws.jaxws.jbws2234.TestEndpoint", wsdlLocation="WEB-INF/wsdl/TestService.wsdl") +@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") +public class TestEndpointImpl implements TestEndpoint +{ + + public static final String TEST_EXCEPTION = "TestException"; + + public static final String RUNTIME_EXCEPTION = "RuntimeException"; + + public String echo(String message) throws TestException_Exception + { + if (TEST_EXCEPTION.equals(message)) + { + TestException te = new TestException(); + throw new TestException_Exception(message, te); + } + else if (RUNTIME_EXCEPTION.equals(message)) + { + throw new RuntimeException("Simulated failure"); + } + return message; + } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for TestException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="TestException"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TestException") -public class TestException { - - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for TestException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TestException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TestException") +public class TestException { + + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.ws.WebFault; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.3-b02- - * Generated source version: 2.0 - * - */ -@WebFault(name = "TestException", targetNamespace = "http://org.jboss.test.ws/jbws2234/types") -public class TestException_Exception - extends Exception -{ - - /** - * Java type that goes as soapenv:Fault detail element. - * - */ - private TestException faultInfo; - - /** - * - * @param faultInfo - * @param message - */ - public TestException_Exception(String message, TestException faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * - * @param faultInfo - * @param message - * @param cause - */ - public TestException_Exception(String message, TestException faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * - * @return - * returns fault bean: org.jboss.test.ws.jaxws.jbws2234.TestException - */ - public TestException getFaultInfo() { - return faultInfo; - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebFault(name = "TestException", targetNamespace = "http://org.jboss.test.ws/jbws2234/types") +public class TestException_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private TestException faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public TestException_Exception(String message, TestException faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public TestException_Exception(String message, TestException faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jbws2234.TestException + */ + public TestException getFaultInfo() { + return faultInfo; + } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.ws.jaxws.jbws2234; - -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestHandler implements Handler -{ - - private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; - - public void close(MessageContext context) - { - } - - public boolean handleFault(MessageContext context) - { - return handleMessage(context); - } - - public boolean handleMessage(MessageContext context) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); - SOAPPart part = soapMessage.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - - String namespace = envelope.getNamespaceURI(); - if (SOAP_1_2.equals(namespace) == false) - { - throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); - } - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - return true; - } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestHandler implements Handler +{ + + private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; + + public void close(MessageContext context) + { + } + + public boolean handleFault(MessageContext context) + { + return handleMessage(context); + } + + public boolean handleMessage(MessageContext context) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); + SOAPPart part = soapMessage.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + + String namespace = envelope.getNamespaceURI(); + if (SOAP_1_2.equals(namespace) == false) + { + throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); + } + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + return true; + } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,24 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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. - */ - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.test.ws/jbws2234/types") -package org.jboss.test.ws.jaxws.jbws2234; Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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. + */ + +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.test.ws/jbws2234/types") +package org.jboss.test.ws.jaxws.jbws2234; Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234 (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234) Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client 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/application-client_1_4.xsd" + version="1.4"> + + <display-name>TestService</display-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,46 +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.jbws2234</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type> - <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>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.jbws2234.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echo</java-method-name> - <wsdl-operation>echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,46 @@ +<?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.jbws2234</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type> + <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>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.jbws2234.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echo</java-method-name> + <wsdl-operation>echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -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.jbws2234.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -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.jbws2234.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,19 +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/jbws2234'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.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.jbws2234.TestHandler</handler-class> - </handler> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,19 @@ +<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/jbws2234'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.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.jbws2234.TestHandler</handler-class> + </handler> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='TestException'> - <sequence/> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - </types> - <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <message name='TestException'> - <part element='ns1:TestException' name='TestException'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap12:operation soapAction=''/> - <input> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </input> - <output> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </output> - <fault name='TestException'> - <soap12:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='TestException'> + <sequence/> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + </types> + <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <message name='TestException'> + <part element='ns1:TestException' name='TestException'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap12:operation soapAction=''/> + <input> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </input> + <output> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </output> + <fault name='TestException'> + <soap12:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<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.jbws2234.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<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.jbws2234.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234 (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234) Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - <context-root>/jaxws-jbws2234</context-root> -</jboss-web> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws2234</context-root> +</jboss-web> \ No newline at end of file Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" 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"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2234.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2234.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 18:00:38 UTC (rev 7886) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 19:02:47 UTC (rev 7888) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='TestException'> - <sequence/> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - </types> - <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <message name='TestException'> - <part element='ns1:TestException' name='TestException'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap12:operation soapAction=''/> - <input> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </input> - <output> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </output> - <fault name='TestException'> - <soap12:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl (from rev 7886, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 19:02:47 UTC (rev 7888) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='TestException'> + <sequence/> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + </types> + <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <message name='TestException'> + <part element='ns1:TestException' name='TestException'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap12:operation soapAction=''/> + <input> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </input> + <output> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </output> + <fault name='TestException'> + <soap12:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7887 - stack/native/branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-22 14:03:52 -0400 (Tue, 22 Jul 2008) New Revision: 7887 Removed: stack/native/branches/dlofthouse/X/ Log: Delete old branch.

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7886 - in stack/native/branches/dlofthouse/JBWS-2234/modules: testsuite/native-tests/scripts and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-22 14:00:38 -0400 (Tue, 22 Jul 2008) New Revision: 7886 Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java Log: Added JAX-WS test and further JAX-WS fixes. Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-22 15:36:18 UTC (rev 7885) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -23,6 +23,7 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; @@ -55,6 +56,8 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; +import com.ibm.wsdl.extensions.soap12.SOAP12Constants; + /** * Helper methods to translate between SOAPFault and SOAPFaultException * as well as between Exception and SOAPMessage containing a fault. @@ -278,6 +281,16 @@ { MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + if (isSOAP12() == true) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + return (SOAPMessageImpl)factory.createMessage(); + } + + private static boolean isSOAP12() + { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext != null) { @@ -285,12 +298,11 @@ String bindingId = emd.getBindingId(); if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) { - factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + return true; } - } - return (SOAPMessageImpl)factory.createMessage(); + return false; } private static Name getFallbackFaultCode() @@ -298,7 +310,14 @@ /* faultcode * X. SOAPFaultException.getFault().getFaultCodeAsQName() * 2. env:Server (Subcode omitted for SOAP 1.2) */ - return new NameImpl(Constants.SOAP11_FAULT_CODE_SERVER); + if (isSOAP12() == false) + { + return new NameImpl(Constants.SOAP11_FAULT_CODE_SERVER); + } + else + { + return new NameImpl(SOAPConstants.SOAP_RECEIVER_FAULT); + } } private static String getFallbackFaultString(Exception ex) Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-22 15:36:18 UTC (rev 7885) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-22 18:00:38 UTC (rev 7886) @@ -339,6 +339,18 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2234/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2234/*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2234/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 15:36:18 UTC (rev 7885) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -31,8 +31,11 @@ import org.jboss.wsf.test.JBossWSTestSetup; /** + * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages + * * @author darran.lofthouse(a)jboss.com * @since June 21, 2008 + * @see https://jira.jboss.org/jira/browse/JBWS-2234 */ public class JBWS2234TestCase extends JBossWSTest { Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.handler.Handler; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2234] SOAP 1.2 Endpoint sends SOAP 1.1 messages + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + * @see https://jira.jboss.org/jira/browse/JBWS-2234 + */ +public class JBWS2234TestCase extends JBossWSTest +{ + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2234?wsdl"); + QName serviceName = new QName("http://org.jboss.test.ws/jbws2234", "TestService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(TestEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.add(new TestHandler()); + bindingProvider.getBinding().setHandlerChain(handlerChain); + } + + public void testCall() throws Exception + { + final String message = "Hello!!"; + String response = port.echo(message); + + assertEquals(message, response); + } + + public void testCheckedException() throws Exception + { + try + { + port.echo(TestEndpointImpl.TEST_EXCEPTION); + fail("Excpected TestException not thrown."); + } + catch (TestException_Exception te) + { + } + } + + public void testRuntimeException() + { + try + { + port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); + fail("Excpected Exception not thrown."); + } + catch (Exception e) + { + assertEquals("Simulated failure", e.getMessage()); + } + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jbws2234 package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _TestException_QNAME = new QName("http://org.jboss.test.ws/jbws2234/types", "TestException"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws2234 + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link TestException } + * + */ + public TestException createTestException() { + return new TestException(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.test.ws/jbws2234/types", name = "TestException") + public JAXBElement<TestException> createTestException(TestException value) { + return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value); + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2234") +@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param string1 + * @return + * returns java.lang.String + * @throws TestException_Exception + */ + @WebMethod + @WebResult(name = "result", partName = "result") + public String echo( + @WebParam(name = "String_1", partName = "String_1") + String string1) + throws TestException_Exception + ; + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +/** + * Test Endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since July 22, 2008 + */ +@WebService(name = "TestEndpoint", portName="TestEndpointPort", targetNamespace = "http://org.jboss.test.ws/jbws2234", endpointInterface = "org.jboss.test.ws.jaxws.jbws2234.TestEndpoint", wsdlLocation="WEB-INF/wsdl/TestService.wsdl") +@BindingType("http://www.w3.org/2003/05/soap/bindings/HTTP/") +public class TestEndpointImpl implements TestEndpoint +{ + + public static final String TEST_EXCEPTION = "TestException"; + + public static final String RUNTIME_EXCEPTION = "RuntimeException"; + + public String echo(String message) throws TestException_Exception + { + if (TEST_EXCEPTION.equals(message)) + { + TestException te = new TestException(); + throw new TestException_Exception(message, te); + } + else if (RUNTIME_EXCEPTION.equals(message)) + { + throw new RuntimeException("Simulated failure"); + } + return message; + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for TestException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TestException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TestException") +public class TestException { + + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebFault(name = "TestException", targetNamespace = "http://org.jboss.test.ws/jbws2234/types") +public class TestException_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private TestException faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public TestException_Exception(String message, TestException faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public TestException_Exception(String message, TestException faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jbws2234.TestException + */ + public TestException getFaultInfo() { + return faultInfo; + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestException_Exception.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.jaxws.jbws2234; + +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestHandler implements Handler +{ + + private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; + + public void close(MessageContext context) + { + } + + public boolean handleFault(MessageContext context) + { + return handleMessage(context); + } + + public boolean handleMessage(MessageContext context) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); + SOAPPart part = soapMessage.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + + String namespace = envelope.getNamespaceURI(); + if (SOAP_1_2.equals(namespace) == false) + { + throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); + } + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + return true; + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/TestHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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. + */ + +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.test.ws/jbws2234/types") +package org.jboss.test.ws.jaxws.jbws2234; Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws2234</context-root> +</jboss-web> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2234.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 18:00:38 UTC (rev 7886) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='TestException'> + <sequence/> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + </types> + <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <message name='TestException'> + <part element='ns1:TestException' name='TestException'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap12:operation soapAction=''/> + <input> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </input> + <output> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </output> + <fault name='TestException'> + <soap12:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2234/WEB-INF/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7885 - in stack/native/branches/dlofthouse/JBWS-2234/modules: core/src/main/java/org/jboss/ws/core/jaxws and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-22 11:36:18 -0400 (Tue, 22 Jul 2008) New Revision: 7885 Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java Log: Use MessageContext to identify binding. Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-22 14:44:31 UTC (rev 7884) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2008-07-22 15:36:18 UTC (rev 7885) @@ -36,12 +36,14 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.Constants; @@ -61,6 +63,7 @@ import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; @@ -191,7 +194,15 @@ } else { - QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + QName faultCode; + if (isSOAP12() == false) + { + faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + } + else + { + faultCode = SOAPConstants.SOAP_RECEIVER_FAULT; + } String faultString = (reqEx.getMessage() != null ? reqEx.getMessage() : reqEx.toString()); faultEx = new SOAPFaultException(faultCode, faultString, null, null); faultEx.initCause(reqEx); @@ -224,8 +235,7 @@ SerializationContext serContext = (msgContext != null ? msgContext.getSerializationContext() : new SerializationContextJAXRPC()); NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPEnvelopeImpl soapEnvelope = (SOAPEnvelopeImpl)soapMessage.getSOAPPart().getEnvelope(); SOAPBody soapBody = soapEnvelope.getBody(); @@ -298,6 +308,34 @@ return soapMessage; } + private static SOAPMessageImpl createSOAPMessage() throws SOAPException + { + MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + + if (isSOAP12() == true) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + return (SOAPMessageImpl)factory.createMessage(); + } + + private static boolean isSOAP12() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + EndpointMetaData emd = msgContext.getEndpointMetaData(); + String bindingId = emd.getBindingId(); + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + { + return true; + } + } + + return false; + } + private static String getValidFaultString(SOAPFaultException faultEx) { String faultString = faultEx.getFaultString(); Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-22 14:44:31 UTC (rev 7884) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2008-07-22 15:36:18 UTC (rev 7885) @@ -30,6 +30,7 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.WebServiceException; +import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; import org.jboss.logging.Logger; @@ -44,10 +45,12 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; @@ -136,7 +139,8 @@ throw new WebServiceException(e); } } - else log.debug("Cannot find fault meta data for: " + xmlName); + else + log.debug("Cannot find fault meta data for: " + xmlName); } } @@ -185,8 +189,7 @@ private static SOAPMessageImpl toSOAPMessage(SOAPFaultException faultEx) throws SOAPException { - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); populateSOAPFault(soapBody, faultEx); @@ -241,8 +244,7 @@ private static SOAPMessageImpl toSOAPMessage(Exception ex) throws SOAPException { - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); + SOAPMessageImpl soapMessage = createSOAPMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -266,11 +268,31 @@ SOAPElement detailEntry = toDetailEntry(faultBean, serContext, faultMetaData); detail.addChildElement(detailEntry); } - else log.debug("Cannot obtain fault meta data for: " + exClass); + else + log.debug("Cannot obtain fault meta data for: " + exClass); return soapMessage; } + private static SOAPMessageImpl createSOAPMessage() throws SOAPException + { + MessageFactoryImpl factory = (MessageFactoryImpl)MessageFactory.newInstance(); + + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + EndpointMetaData emd = msgContext.getEndpointMetaData(); + String bindingId = emd.getBindingId(); + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + { + factory.setEnvNamespace(Constants.NS_SOAP12_ENV); + } + + } + + return (SOAPMessageImpl)factory.createMessage(); + } + private static Name getFallbackFaultCode() { /* faultcode Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2008-07-22 14:44:31 UTC (rev 7884) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2008-07-22 15:36:18 UTC (rev 7885) @@ -69,7 +69,7 @@ { Detail detail = createDetailElement(); SOAPFaultException faultEx = new SOAPFaultException(Constants.SOAP11_FAULT_CODE_CLIENT, "Some fault message", "Some fault actor", detail); - SOAPEnvelope soapEnv = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(faultEx, null).getSOAPPart().getEnvelope(); + SOAPEnvelope soapEnv = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(faultEx).getSOAPPart().getEnvelope(); assertEquals(DOMUtils.parse(envStr), soapEnv); } Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 14:44:31 UTC (rev 7884) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 15:36:18 UTC (rev 7885) @@ -83,7 +83,7 @@ } catch (Exception e) { - assertEquals(TestEndpointImpl.RUNTIME_EXCEPTION, e.getMessage()); + assertEquals("Simulated failure", e.getCause().getMessage()); } } }

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7884 - in stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/common/soap and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-07-22 10:44:31 -0400 (Tue, 22 Jul 2008) New Revision: 7884 Added: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml Removed: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java Log: The tests. Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-07-22 14:15:08 UTC (rev 7883) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -2694,6 +2694,34 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="custom-endpoint-config.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-client.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jbws2234/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2008-07-22 14:15:08 UTC (rev 7883) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -69,7 +69,7 @@ { Detail detail = createDetailElement(); SOAPFaultException faultEx = new SOAPFaultException(Constants.SOAP11_FAULT_CODE_CLIENT, "Some fault message", "Some fault actor", detail); - SOAPEnvelope soapEnv = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(faultEx).getSOAPPart().getEnvelope(); + SOAPEnvelope soapEnv = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(faultEx, null).getSOAPPart().getEnvelope(); assertEquals(DOMUtils.parse(envStr), soapEnv); } Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234 (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234) Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class JBWS2234TestCase extends JBossWSTest -{ - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - public void testCall() throws Exception - { - final String message = "Hello!!"; - String response = port.echo(message); - - assertEquals(message, response); - } - - public void testCheckedException() throws Exception - { - try - { - port.echo(TestEndpointImpl.TEST_EXCEPTION); - fail("Excpected TestException not thrown."); - } - catch (TestException te) - { - } - } - - public void testRuntimeException() - { - try - { - port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); - fail("Excpected Exception not thrown."); - } - catch (Exception e) - { - assertEquals(TestEndpointImpl.RUNTIME_EXCEPTION, e.getMessage()); - } - } -} Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class JBWS2234TestCase extends JBossWSTest +{ + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); + } + + public void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + + public void testCall() throws Exception + { + final String message = "Hello!!"; + String response = port.echo(message); + + assertEquals(message, response); + } + + public void testCheckedException() throws Exception + { + try + { + port.echo(TestEndpointImpl.TEST_EXCEPTION); + fail("Excpected TestException not thrown."); + } + catch (TestException te) + { + } + } + + public void testRuntimeException() + { + try + { + port.echo(TestEndpointImpl.RUNTIME_EXCEPTION); + fail("Excpected Exception not thrown."); + } + catch (Exception e) + { + assertEquals(TestEndpointImpl.RUNTIME_EXCEPTION, e.getMessage()); + } + } +} Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public interface TestEndpoint extends Remote -{ - - public String echo(final String message) throws TestException, RemoteException; - -} Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public interface TestEndpoint extends Remote +{ + + public String echo(final String message) throws TestException, RemoteException; + +} Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public static final String TEST_EXCEPTION = "TestException"; - - public static final String RUNTIME_EXCEPTION = "RuntimeException"; - - public String echo(String message) throws TestException - { - if (TEST_EXCEPTION.equals(message)) - { - throw new TestException(); - } - else if (RUNTIME_EXCEPTION.equals(message)) - { - throw new RuntimeException("Simulated failure"); - } - return message; - } - -} Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestEndpointImpl.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public static final String TEST_EXCEPTION = "TestException"; + + public static final String RUNTIME_EXCEPTION = "RuntimeException"; + + public String echo(String message) throws TestException + { + if (TEST_EXCEPTION.equals(message)) + { + throw new TestException(); + } + else if (RUNTIME_EXCEPTION.equals(message)) + { + throw new RuntimeException("Simulated failure"); + } + return message; + } + +} Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestException extends Exception -{ - -} Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestException.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestException extends Exception +{ + +} Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, 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.jbws2234; - -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.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; - -/** - * @author darran.lofthouse(a)jboss.com - * @since June 21, 2008 - */ -public class TestHandler extends GenericHandler -{ - - private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; - - @Override - public QName[] getHeaders() - { - return null; - } - - public boolean handleMessage(final MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPPart part = soapMessage.getSOAPPart(); - SOAPEnvelope envelope = part.getEnvelope(); - - String namespace = envelope.getNamespaceURI(); - if (SOAP_1_2.equals(namespace) == false) - { - throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); - } - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - return true; - } - - @Override - public boolean handleFault(final MessageContext msgContext) - { - return handleMessage(msgContext); - } - - @Override - public boolean handleRequest(MessageContext msgContext) - { - return handleMessage(msgContext); - } - - @Override - public boolean handleResponse(MessageContext msgContext) - { - return handleMessage(msgContext); - } - -} Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/TestHandler.java 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, 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.jbws2234; + +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.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; + +/** + * @author darran.lofthouse(a)jboss.com + * @since June 21, 2008 + */ +public class TestHandler extends GenericHandler +{ + + private static final String SOAP_1_2 = "http://www.w3.org/2003/05/soap-envelope"; + + @Override + public QName[] getHeaders() + { + return null; + } + + public boolean handleMessage(final MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPPart part = soapMessage.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + + String namespace = envelope.getNamespaceURI(); + if (SOAP_1_2.equals(namespace) == false) + { + throw new RuntimeException("Expected '" + SOAP_1_2 + "' namespace, actual '" + namespace + "'"); + } + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + return true; + } + + @Override + public boolean handleFault(final MessageContext msgContext) + { + return handleMessage(msgContext); + } + + @Override + public boolean handleRequest(MessageContext msgContext) + { + return handleMessage(msgContext); + } + + @Override + public boolean handleResponse(MessageContext msgContext) + { + return handleMessage(msgContext); + } + +} Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234 (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234) Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF) Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client 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/application-client_1_4.xsd" + version="1.4"> + + <display-name>TestService</display-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF) Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,46 +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.jbws2234</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type> - <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>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.jbws2234.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echo</java-method-name> - <wsdl-operation>echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/jaxrpc-mapping.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,46 @@ +<?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.jbws2234</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws2234/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws2234/types'>typeNS:TestException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jaxrpc.jbws2234.TestException</exception-type> + <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws2234'>exMsgNS:TestException</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws2234.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws2234'>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.jbws2234.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws2234'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws2234'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echo</java-method-name> + <wsdl-operation>echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echo</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/jbws2234'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -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.jbws2234.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/web.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -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.jbws2234.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,19 +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/jbws2234'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.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.jbws2234.TestHandler</handler-class> - </handler> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/webservices.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,19 @@ +<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/jbws2234'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws2234.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.jbws2234.TestHandler</handler-class> + </handler> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl) Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='TestException'> - <sequence/> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - </types> - <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <message name='TestException'> - <part element='ns1:TestException' name='TestException'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap12:operation soapAction=''/> - <input> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </input> - <output> - <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> - </output> - <fault name='TestException'> - <soap12:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/WEB-INF/wsdl/TestService.wsdl 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws2234' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws2234/types' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.test.ws/jbws2234' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws2234/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws2234/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='TestException'> + <sequence/> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + </types> + <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <message name='TestException'> + <part element='ns1:TestException' name='TestException'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap12:operation soapAction=''/> + <input> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </input> + <output> + <soap12:body namespace='http://org.jboss.test.ws/jbws2234' use='literal'/> + </output> + <fault name='TestException'> + <soap12:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap12:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-06-27 14:35:33 UTC (rev 7755) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<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.jbws2234.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (from rev 7755, stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml) =================================================================== --- stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2234/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/wstools-config.xml 2008-07-22 14:44:31 UTC (rev 7884) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<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.jbws2234.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws2234" type-namespace="http://org.jboss.test.ws/jbws2234/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration>

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r7883 - container/jboss50/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-07-22 10:15:08 -0400 (Tue, 22 Jul 2008) New Revision: 7883 Modified: container/jboss50/trunk/pom.xml Log: sync with AS component matrix Modified: container/jboss50/trunk/pom.xml =================================================================== --- container/jboss50/trunk/pom.xml 2008-07-22 14:03:11 UTC (rev 7882) +++ container/jboss50/trunk/pom.xml 2008-07-22 14:15:08 UTC (rev 7883) @@ -32,10 +32,10 @@ http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma... --> <jboss.version>5.0.0-SNAPSHOT</jboss.version> - <jboss.ejb3.version>0.1.7</jboss.ejb3.version> + <jboss.ejb3.version>0.1.8</jboss.ejb3.version> <jboss.deployers.version>2.0.0.Beta18</jboss.deployers.version> <jboss.jbossxb.version>2.0.0.CR11</jboss.jbossxb.version> - <jboss.metadata.version>1.0.0.Beta28</jboss.metadata.version> + <jboss.metadata.version>1.0.0.Beta30</jboss.metadata.version> <jboss.microcontainer.version>2.0.0.Beta16</jboss.microcontainer.version> <jboss.reflect.version>2.0.0.Beta12</jboss.reflect.version> <jboss.security.version>2.0.2.CR6</jboss.security.version>

16 years, 5 months

1
0
0 / 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2008