2:48 a.m.
Author: mageshbk(a)jboss.com
Date: 2008-03-12 03:48:05 -0400 (Wed, 12 Mar 2008)
New Revision: 5929
Added:
stack/native/trunk/src/test/resources/tools/jbws2018/
stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
Removed:
stack/native/trunk/src/test/resources/tools/jbws-2018/
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java
Log:
[JBWS-2018] Fixed testcase folder name and included array types checking
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
===================================================================
---
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-03-12
07:43:46 UTC (rev 5928)
+++
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-03-12
07:48:05 UTC (rev 5929)
@@ -39,8 +39,8 @@
{
public final void testMultiplePackageNameSpace() throws Exception
{
- String resourceDir = "resources/tools/jbws-2018";
- String toolsDir = "tools/jbws-2018";
+ String resourceDir = "resources/tools/jbws2018";
+ String toolsDir = "tools/jbws2018";
String[] args = new String[] { "-dest", toolsDir, "-config",
resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java 2008-03-12
07:43:46 UTC (rev 5928)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/Test.java 2008-03-12
07:48:05 UTC (rev 5929)
@@ -34,4 +34,8 @@
{
public void testException() throws TestException, RemoteException;
+ public TestException getException() throws RemoteException;
+ public void setException(TestException error) throws RemoteException;
+ public TestException[] getExceptions() throws RemoteException;
+ public void getExceptions(TestException[] errors) throws RemoteException;
}
Added: stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
(rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl 2008-03-12
07:48:05 UTC (rev 5929)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService'
targetNamespace='http://org.jboss.test.ws.jbws2018'
xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base'
xmlns:ns2='http://com.other.exception'
xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
xmlns:tns='http://org.jboss.test.ws.jbws2018'
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://com.other.exception'
xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base'
xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
xmlns:tns='http://com.other.exception'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://com.other.base'/>
+ <complexType name='TestException'>
+ <complexContent>
+ <extension base='ns2:BaseException'>
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='TestException.Array'>
+ <sequence>
+ <element maxOccurs='unbounded' minOccurs='0' name='value'
nillable='true' type='tns:TestException'/>
+ </sequence>
+ </complexType>
+ <element name='TestException' type='tns:TestException'/>
+ </schema>
+ <schema targetNamespace='http://com.other.base'
xmlns='http://www.w3.org/2001/XMLSchema'
xmlns:ns1='http://com.other.exception'
xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
xmlns:tns='http://com.other.base'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://com.other.exception'/>
+ <complexType name='BaseException'>
+ <sequence/>
+ </complexType>
+ <element name='BaseException' type='tns:BaseException'/>
+ </schema>
+ </types>
+ <message name='Test_getException'
xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <message name='Test_getExceptionResponse'>
+ <part name='result' type='ns2:TestException'/>
+ </message>
+ <message name='Test_getExceptions'>
+ <part name='arrayOfTestException_1'
type='ns2:TestException.Array'/>
+ </message>
+ <message name='Test_getExceptionsResponse'/>
+ <message name='Test_getExceptions2'/>
+ <message name='Test_getExceptions2Response'>
+ <part name='result' type='ns2:TestException.Array'/>
+ </message>
+ <message name='Test_setException'>
+ <part name='TestException_1' type='ns2:TestException'/>
+ </message>
+ <message name='Test_setExceptionResponse'/>
+ <message name='Test_testException'/>
+ <message name='Test_testExceptionResponse'/>
+ <message name='TestException'>
+ <part element='ns2:TestException' name='TestException'/>
+ </message>
+ <portType name='Test'>
+ <operation name='getException'>
+ <input message='tns:Test_getException'/>
+ <output message='tns:Test_getExceptionResponse'/>
+ </operation>
+ <operation name='getExceptions'
parameterOrder='arrayOfTestException_1'>
+ <input message='tns:Test_getExceptions'/>
+ <output message='tns:Test_getExceptionsResponse'/>
+ </operation>
+ <operation name='getExceptions2'>
+ <input message='tns:Test_getExceptions2'/>
+ <output message='tns:Test_getExceptions2Response'/>
+ </operation>
+ <operation name='setException' parameterOrder='TestException_1'>
+ <input message='tns:Test_setException'/>
+ <output message='tns:Test_setExceptionResponse'/>
+ </operation>
+ <operation name='testException'>
+ <input message='tns:Test_testException'/>
+ <output message='tns:Test_testExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ </portType>
+ <binding name='TestBinding' type='tns:Test'>
+ <soap:binding style='rpc'
transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='getException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </output>
+ </operation>
+ <operation name='getExceptions'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </output>
+ </operation>
+ <operation name='getExceptions2'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </output>
+ </operation>
+ <operation name='setException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </output>
+ </operation>
+ <operation name='testException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws.jbws2018'
use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestBinding' name='TestPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on:
stack/native/trunk/src/test/resources/tools/jbws2018/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
(rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml 2008-03-12
07:48:05 UTC (rev 5929)
@@ -0,0 +1,89 @@
+<?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.jbws2018.exception</package-type>
+ <namespaceURI>http://com.other.exception</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws2018.base</package-type>
+ <namespaceURI>http://com.other.base</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws2018</package-type>
+ <namespaceURI>http://org.jboss.test.ws.jbws2018</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws2018.exception.TestException</java-type>
+ <root-type-qname
xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws2018.base.BaseException</java-type>
+ <root-type-qname
xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+
<exception-type>org.jboss.test.ws.jbws2018.exception.TestException</exception-type>
+ <wsdl-message
xmlns:exMsgNS='http://org.jboss.test.ws.jbws2018'>exMsgNS:TestException</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+
<service-interface>org.jboss.test.ws.jbws2018.TestService</service-interface>
+ <wsdl-service-name
xmlns:serviceNS='http://org.jboss.test.ws.jbws2018'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestPort</port-name>
+ <java-port-name>TestPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+
<service-endpoint-interface>org.jboss.test.ws.jbws2018.Test</service-endpoint-interface>
+ <wsdl-port-type
xmlns:portTypeNS='http://org.jboss.test.ws.jbws2018'>portTypeNS:Test</wsdl-port-type>
+ <wsdl-binding
xmlns:bindingNS='http://org.jboss.test.ws.jbws2018'>bindingNS:TestBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>getException</java-method-name>
+ <wsdl-operation>getException</wsdl-operation>
+ <wsdl-return-value-mapping>
+
<method-return-value>org.jboss.test.ws.jbws2018.exception.TestException</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testException</java-method-name>
+ <wsdl-operation>testException</wsdl-operation>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>setException</java-method-name>
+ <wsdl-operation>setException</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+
<param-type>org.jboss.test.ws.jbws2018.exception.TestException</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_setException</wsdl-message>
+ <wsdl-message-part-name>TestException_1</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>getExceptions</java-method-name>
+ <wsdl-operation>getExceptions</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+
<param-type>org.jboss.test.ws.jbws2018.exception.TestException[]</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message
xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptions</wsdl-message>
+ <wsdl-message-part-name>arrayOfTestException_1</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>getExceptions</java-method-name>
+ <wsdl-operation>getExceptions2</wsdl-operation>
+ <wsdl-return-value-mapping>
+
<method-return-value>org.jboss.test.ws.jbws2018.exception.TestException[]</method-return-value>
+ <wsdl-message
xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws2018'>wsdlMsgNS:Test_getExceptions2Response</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
Property changes on:
stack/native/trunk/src/test/resources/tools/jbws2018/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
(rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml 2008-03-12
07:48:05 UTC (rev 5929)
@@ -0,0 +1,16 @@
+<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">
+ <global>
+ <package-namespace package="org.jboss.test.ws.jbws2018.base"
namespace="http://com.other.base"/>
+ <package-namespace package="org.jboss.test.ws.jbws2018.exception"
namespace="http://com.other.exception"/>
+ </global>
+
+ <java-wsdl>
+ <service name="TestService" style="rpc"
endpoint="org.jboss.test.ws.jbws2018.Test"/>
+ <namespaces target-namespace="http://org.jboss.test.ws.jbws2018"
type-namespace="http://org.jboss.test.ws.jbws2018"/>
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices ejb-link="TestEJB"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
Property changes on:
stack/native/trunk/src/test/resources/tools/jbws2018/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF