Author: darran.lofthouse(a)jboss.com Date: 2009-01-23 12:05:05 -0500 (Fri, 23 Jan 2009) New Revision: 9112 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java framework/trunk/testsuite/test/resources/jaxws/jbws2412/ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2412] WSDL schema imports do not published successfully. Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-01-23 15:58:59 UTC (rev 9111) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-01-23 17:05:05 UTC (rev 9112) @@ -594,6 +594,17 @@ </webinf> </war> + <!-- jaxws-jbws2412 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2412.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2412/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2412/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2412/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2412/WEB-INF"> + <include name="wsdl/*"/> + </webinf> + </war> + <!-- jaxws-jbws2449 --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2449.jar"> <fileset dir="${tests.output.dir}/test-classes"> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,66 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2009, 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.jbws2412; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test JBWS-2412 for the correct publising of imported schemas. + * + * @author darran.lofthouse(a)jboss.com + * @since 23rd January 2009 + */ +public class JBWS2412TestCase extends JBossWSTest +{ + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2412TestCase.class, "jaxws-jbws2412.war"); + } + + private TestEndpoint getPort() throws Exception + { + + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2412?wsdl"); + QName serviceName = new QName("http://org.jboss.test.ws/jbws2412", "TestEndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + + return service.getPort(TestEndpoint.class); + } + + public void testCall() throws Exception + { + String message = "Hi"; + String response = getPort().echo(message); + assertEquals(message, response); + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,37 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2009, 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.jbws2412; + +import javax.jws.WebService; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 23rd January 2009 + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2412") +public interface TestEndpoint +{ + + public String echo(final String message); + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,40 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2009, 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.jbws2412; + +import javax.jws.WebService; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 23rd January 2009 + */ +@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws2412", wsdlLocation="WEB-INF/wsdl/TestService.wsdl") +public class TestEndpointImpl implements TestEndpoint +{ + + public String echo(String message) + { + return message; + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-01-23 17:05:05 UTC (rev 9112) @@ -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.jbws2412.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: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,51 @@ +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws2412' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.test.ws/jbws2412' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + + <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema1" schemaLocation="./schema1.xsd"/> + <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema4" schemaLocation="./schema4.xsd"/> + + <xs:element name='echo' type='tns:echo'/> + <xs:element name='echoResponse' type='tns:echoResponse'/> + <xs:complexType name='echo'> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='echoResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='TestEndpoint_echoResponse'> + <part element='tns:echoResponse' name='echoResponse'></part> + </message> + <message name='TestEndpoint_echo'> + <part element='tns:echo' name='echo'></part> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='echo'> + <input message='tns:TestEndpoint_echo'></input> + <output message='tns:TestEndpoint_echoResponse'></output> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://127.0.0.1:8080/jaxws-jbws2412'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,5 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema1' + xmlns='http://www.w3.org/2001/XMLSchema'> + <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/> + <import namespace="http://org.jboss.test.ws/jbws2412/schema5" schemaLocation="./schema5.xsd"/> +</schema> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,4 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2' + xmlns='http://www.w3.org/2001/XMLSchema'> + +</schema> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,4 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema3' + xmlns='http://www.w3.org/2001/XMLSchema'> + +</schema> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,5 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema4' + xmlns='http://www.w3.org/2001/XMLSchema'> + <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/> + <import namespace="http://org.jboss.test.ws/jbws2412/schema3" schemaLocation="./schema3.xsd"/> +</schema> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-01-23 17:05:05 UTC (rev 9112) @@ -0,0 +1,4 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema5' + xmlns='http://www.w3.org/2001/XMLSchema'> + +</schema> \ No newline at end of file Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF