Author: mageshbk(a)jboss.com Date: 2008-02-22 00:50:09 -0500 (Fri, 22 Feb 2008) New Revision: 5763 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java stack/native/trunk/src/test/resources/jaxws/jbws1969/ stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/ stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/ stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/ stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml Log: [JBWS-1969] Added Testcase Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-22 05:44:23 UTC (rev 5762) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-22 05:50:09 UTC (rev 5763) @@ -625,6 +625,17 @@ </fileset> </jar> + <!-- jaxws-jbws1969 --> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1969.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxws-jbws2000 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar"> <fileset dir="${tests.output.dir}/classes"> Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2008-02-22 05:50:09 UTC (rev 5763) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1969; + +import java.net.URL; + +import junit.framework.Test; + +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Testcase for load/import of resources under nested directory + * other than toplevel "META-INF/wsdl" directory + * + * http://jira.jboss.org/jira/browse/JBWS-1969 + * + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + * @since 21-Feb-2008 + */ +public class JBWS1969TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1969TestCase.class, "jaxws-jbws1969.jar"); + } + + public void testSubDirectory() throws Exception + { + //wsdl and schema loaded from META-INF/wsdl/echo + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1969?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-02-22 05:50:09 UTC (rev 5763) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1969; + +import javax.jws.WebService; + +/** + * The SEI + * + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + * @since 21-Feb-2008 + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") +public interface TestEndpoint +{ + String echo(String input); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-02-22 05:50:09 UTC (rev 5763) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1969; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * The SEI implementation used by the JBWS1969TestCase + * + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + * @since 21-Feb-2008 + */ +@WebService(serviceName = "TestEndpointService", + name = "TestEndpoint", + targetNamespace = "http://org.jboss.ws/jbws1969", + wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl") +@Stateless +@WebContext(contextRoot="jaxws-jbws1969", urlPattern="/*") +public class TestEndpointImpl implements TestEndpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2008-02-22 05:50:09 UTC (rev 5763) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="TestEndpointService" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tns="http://org.jboss.ws/jbws1969" + targetNamespace="http://org.jboss.ws/jbws1969"> + + <types> + <xsd:schema> + <xsd:import namespace="http://org.jboss.ws/jbws1969" schemaLocation="TestService.xsd" /> + </xsd:schema> + </types> + + <message name='TestEndpoint_echo'> + <part element='tns:echo' name='echo'></part> + </message> + <message name='TestEndpoint_echoResponse'> + <part element='tns:echoResponse' name='echoResponse'></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-jbws1969'/> + </port> + </service> +</definitions> Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd 2008-02-22 05:50:09 UTC (rev 5763) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<schema version="1.0" xmlns="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" attributeFormDefault="unqualified" + targetNamespace="http://org.jboss.ws/jbws1969" + xmlns:tns="http://org.jboss.ws/jbws1969"> + + <element name='echo' type='tns:echo'/> + <element name='echoResponse' type='tns:echoResponse'/> + <complexType name='echo'> + <sequence> + <element minOccurs='0' name='arg0' type='string'/> + </sequence> + </complexType> + <complexType name='echoResponse'> + <sequence> + <element minOccurs='0' name='return' type='string'/> + </sequence> + </complexType> +</schema> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF