Author: darran.lofthouse(a)jboss.com
Date: 2010-06-25 07:26:36 -0400 (Fri, 25 Jun 2010)
New Revision: 12519
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
Modified:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
Added test case to reproduce issues with relative imports.
Modified:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-06-25
11:25:02 UTC (rev 12518)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-06-25
11:26:36 UTC (rev 12519)
@@ -644,6 +644,18 @@
</classes>
</war>
+ <!-- jaxws-jbws3070 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3070.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws3070/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3070/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3070/*TestCase*.class"
/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws3070/WEB-INF">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xsd"/>
+ </webinf>
+ </war>
+
<!-- jaxws-webserviceref -->
<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">
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java 2010-06-25
11:26:36 UTC (rev 12519)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, 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.jbws3070;
+
+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-3070 for the correct publising of imported schemas.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 24th June 2010
+ */
+public class JBWS3070TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3070TestCase.class,
"jaxws-jbws3070.war");
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+
+ URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-jbws3070?wsdl");
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws3070",
"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:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java 2010-06-25
11:26:36 UTC (rev 12519)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, 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.jbws3070;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 24th June 2010
+ */
+@WebService(name = "TestEndpoint", targetNamespace =
"http://org.jboss.test.ws/jbws3070")
+public interface TestEndpoint
+{
+
+ public String echo(final String message);
+
+}
Property changes on:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java 2010-06-25
11:26:36 UTC (rev 12519)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, 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.jbws3070;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 24th June 2010
+ */
+@WebService(name = "TestEndpoint", serviceName="TestEndpointService",
targetNamespace = "http://org.jboss.test.ws/jbws3070",
wsdlLocation="WEB-INF/wsdl/a/wsdl/b/TestService.wsdl")
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echo(String message)
+ {
+ return message;
+ }
+
+}
Property changes on:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml 2010-06-25
11:26:36 UTC (rev 12519)
@@ -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.jbws3070.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-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl 2010-06-25
11:26:36 UTC (rev 12519)
@@ -0,0 +1,50 @@
+<definitions name='TestEndpointService'
targetNamespace='http://org.jboss.test.ws/jbws3070'
xmlns='http://schemas.xmlsoap.org/wsdl/'
xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
xmlns:tns='http://org.jboss.test.ws/jbws3070'
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.test.ws/jbws3070'
version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws3070'
xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+
+ <xs:import namespace="http://org.jboss.test.ws/jbws3070/schema1"
schemaLocation="../../xsd/schema1.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-jbws3070'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd 2010-06-25
11:26:36 UTC (rev 12519)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3070/schema1'
+
xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws3070/schema2"
schemaLocation="../../b/schema2.xsd"/>
+</schema>
\ No newline at end of file
Property changes on:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
===================================================================
---
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
(rev 0)
+++
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd 2010-06-25
11:26:36 UTC (rev 12519)
@@ -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:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF