[jbossws-commits] JBossWS SVN: r15788 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 5 other directories.

Author: ropalka Date: 2012-02-29 07:54:42 -0500 (Wed, 29 Feb 2012) New Revision: 15788 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/ Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] enable appclient tests (WIP) 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 2012-02-29 10:01:09 UTC (rev 15787) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -859,19 +859,6 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-cl.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="jaxws-jbossws-client-config.xml" /> - <include name="jaxrpc-mapping.xml" /> - </metainf> - </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class" /> @@ -880,26 +867,38 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-cl.jar"> + <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> + </classes> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.class" /> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.wsaddressing.replyto.ApplicationClient" /> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core,org.jboss.ws.common" /> + </manifest> + <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/appclient/META-INF"> <include name="application-client.xml" /> <include name="jboss-client.xml" /> - <include name="jbossws-client-config.xml" /> <include name="jaxrpc-mapping.xml" /> </metainf> </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - </classes> - </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-wsaddressing-appclient.jar"/> + </fileset> + </jar> </target> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-02-29 12:54:42 UTC (rev 15788) @@ -21,19 +21,13 @@ */ package org.jboss.test.ws.jaxws.wsaddressing.replyto; -import java.io.ByteArrayInputStream; -import java.net.URL; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPMessage; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -46,122 +40,30 @@ */ public class AddressingReplyToTestCase extends JBossWSTest { - private static InitialEndpoint initial; - private static ReplyToEndpoint replyto; - private static FaultToEndpoint faultto; public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, - "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-cl.jar," + - "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-cl.jar," + + "jaxws-wsaddressing-initial.war," + + "jaxws-wsaddressing-replyto.war," + "jaxws-wsaddressing-faultto.war"); } - protected void setUp() throws Exception + public void testApplicationClient() throws Exception { - super.setUp(); - - if (initial == null) - { - Service initialService = (Service)getInitialContext("initial-client").lookup("java:comp/env/service/InitialService"); - initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); - Service replytoService = (Service)getInitialContext("replyto-client").lookup("java:comp/env/service/ReplyToService"); - replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); - - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"; - QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); - javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); - faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); + final String appclientArg = getServerHost();; + final OutputStream appclientOS = new ByteArrayOutputStream(); + JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", appclientOS, appclientArg); + // wait till appclient stops + String appclientLog = appclientOS.toString(); + while (!appclientLog.contains("stopped in")) { + Thread.sleep(100); + appclientLog = appclientOS.toString(); } + // assert appclient logs + assertTrue(!appclientLog.contains("APPCLIENT TEST FAILURE")); + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); } - public void testScenario() throws Exception - { - _testReplyToMessage(); - _testFaultToMessage(); - _testInital(); - _testReplyTo(); - _testFaultTo(); - } - - /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. - */ - public void _testReplyToMessage() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <ns1:addItemResponse xmlns:ns1='http://org.jboss.ws/addressing/replyto'>" + - " <result>Mars Bar</result>" + - " </ns1:addItemResponse>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-replyto/ReplyToService"); - con.call(reqMsg, epURL); - - assertEquals("Mars Bar", replyto.getLastItem()); - } - - /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. - */ - public void _testFaultToMessage() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <env:Fault>" + - " <faultcode>env:Client</faultcode>" + - " <faultstring>java.lang.IllegalArgumentException: Mars Bar</faultstring>" + - " </env:Fault>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"); - con.call(reqMsg, epURL); - - assertEquals("java.lang.IllegalArgumentException: Mars Bar", faultto.getLastFault()); - } - - public void _testInital() throws Exception - { - String item = initial.addItem("Ice Cream"); - assertNull("Expected null, but was: " + item, item); - - item = initial.addItem("Invalid Value"); - assertNull("Expected null, but was: " + item, item); - } - - public void _testReplyTo() throws Exception - { - String item = replyto.getLastItem(); - assertEquals("Ice Cream", item); - } - - public void _testFaultTo() throws Exception - { - String lastFault = faultto.getLastFault(); - - /* JAX-WS 10.2.2.3: the fields of the fault message are populated according to - * the following rules of precedence: - * - * faultstring - * 1. SOAPFaultException.getFault().getFaultString() - * 2. Exception.getMessage() - * 3. Exception.toString() - * - * this test used to expect the value returned by toString() */ - assertEquals("Invalid Value", lastFault); - } } Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,162 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.wsaddressing.replyto; + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; + + +/** + * Test endpoint using ws-addressing + * + * NOTE: This test uses a JAX-RPC client against a JAX-WS endpoint. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class ApplicationClient +{ + private static InitialEndpoint initial; + private static ReplyToEndpoint replyto; + private static FaultToEndpoint faultto; + + protected static void init(final String serverHost) throws Exception + { + InitialContext iniCtx = new InitialContext(); + Service initialService = (Service)iniCtx.lookup("java:comp/env/service/InitialService"); + initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); + Service replytoService = (Service)iniCtx.lookup("java:comp/env/service/ReplyToService"); + replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); + + String endpointAddress = "http://" + serverHost + ":8080/jaxws-wsaddressing-faultto/FaultToService"; + QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); + javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); + faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); + } + + public static void main(String[] args) throws Exception + { + System.out.println("TEST START"); + final String serverHost = args[0]; + init(serverHost); + _testReplyToMessage(serverHost); + _testFaultToMessage(serverHost); + _testInitial(); + _testReplyTo(); + _testFaultTo(); + System.out.println("TEST END"); + } + + /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. + */ + private static void _testReplyToMessage(final String serverHost) throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <ns1:addItemResponse xmlns:ns1='http://org.jboss.ws/addressing/replyto'>" + + " <result>Mars Bar</result>" + + " </ns1:addItemResponse>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + serverHost + ":8080/jaxws-wsaddressing-replyto/ReplyToService"); + con.call(reqMsg, epURL); + if (!"Mars Bar".equals(replyto.getLastItem())) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } + + /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. + */ + private static void _testFaultToMessage(final String serverHost) throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <env:Fault>" + + " <faultcode>env:Client</faultcode>" + + " <faultstring>java.lang.IllegalArgumentException: Mars Bar</faultstring>" + + " </env:Fault>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + serverHost + ":8080/jaxws-wsaddressing-faultto/FaultToService"); + con.call(reqMsg, epURL); + + if (!"java.lang.IllegalArgumentException: Mars Bar".equals(faultto.getLastFault())) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } + + private static void _testInitial() throws Exception + { + String item = initial.addItem("Ice Cream"); + if (item != null) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + + item = initial.addItem("Invalid Value"); + if (item != null) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + } + + private static void _testReplyTo() throws Exception + { + String item = replyto.getLastItem(); + + if (!"Ice Cream".equals(item)) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + } + + private static void _testFaultTo() throws Exception + { + String lastFault = faultto.getLastFault(); + + /* JAX-WS 10.2.2.3: the fields of the fault message are populated according to + * the following rules of precedence: + * + * faultstring + * 1. SOAPFaultException.getFault().getFaultString() + * 2. Exception.getMessage() + * 3. Exception.toString() + * + * this test used to expect the value returned by toString() */ + if (!"Invalid Value".equals(lastFault)) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } +} Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,37 @@ +<?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"> + + <service-ref> + <service-ref-name>service/InitialService</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.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> + </handler> + </service-ref> + + <service-ref> + <service-ref-name>service/ReplyToService</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.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,72 @@ +<?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.jaxws.wsaddressing.replyto</package-type> + <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:ReplyToEndpointService</wsdl-service-name> + <port-mapping> + <port-name>ReplyToEndpointPort</port-name> + <java-port-name>ReplyToEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:InitialEndpointService</wsdl-service-name> + <port-mapping> + <port-name>InitialEndpointPort</port-name> + <java-port-name>InitialEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:ReplyToEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:ReplyToEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>addItemResponse</java-method-name> + <wsdl-operation>addItemResponse</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.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_addItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>getLastItem</java-method-name> + <wsdl-operation>getLastItem</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_getLastItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:InitialEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:InitialEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>addItem</java-method-name> + <wsdl-operation>addItem</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.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItem</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.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItemResponse</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> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -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> + <service-ref> + <service-ref-name>service/InitialService</service-ref-name> + <config-name>Standard WSAddressing Client</config-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-initial/InitialService?wsdl</wsdl-override> + </service-ref> + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override> + </service-ref> +</jboss-client> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 10:01:09 UTC (rev 15787) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -1159,9 +1159,6 @@ <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- # [JBWS-3234] JNDI over RMI not available on AS7 --> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> - <!-- # Remote JNDI lookup & jaxrpc client issues --> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude> @@ -1247,7 +1244,6 @@ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> <!-- # webservices-description in jboss-web.xml / jboss.xml --> <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> @@ -1268,6 +1264,7 @@ <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes> </configuration> </plugin>