[jbossws-commits] JBossWS SVN: r3470 - in branches/jbossws-2.0/jbossws-core/src: test/java/org/jboss/test/ws/tools and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 6 09:30:09 EDT 2007
Author: darran.lofthouse at jboss.com
Date: 2007-06-06 09:30:09 -0400 (Wed, 06 Jun 2007)
New Revision: 3470
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
Log:
JBWS-1698 - WSDL To Java - If fault name contains 'Fault' the generated Exception does not match the throws clause on the SEI.
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 13:01:08 UTC (rev 3469)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -327,7 +327,7 @@
if (cl == null)
{
String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart();
- buf.append(seiPkgName + "." + cleanUpFaultName(faultTypeName));
+ buf.append(seiPkgName + "." + JavaUtils.capitalize(faultTypeName));
}
else buf.append(cl.getName());
buf.append(",");
@@ -441,10 +441,10 @@
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
-
+
// Replace the xt with the real type from the schema.
xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
-
+
if (buf.length() > 0)
{
buf.append(", ");
@@ -754,33 +754,6 @@
return cls.getName() + arraySuffix;
}
- /**
- * WSDL may have appended the Faults with 'Fault' or 'Error'
- * @param faultname
- * @return
- */
- private String cleanUpFaultName(String faultname)
- {
- //Clean up the faultname from Error and Fault
- boolean endsfault = faultname.endsWith("Fault");
-
- if (endsfault)
- {
- int index = faultname.lastIndexOf("Fault");
- faultname = faultname.substring(0, index);
- }
- else
- {
- boolean endsError = faultname.endsWith("Error");
- if (endsError)
- {
- int index = faultname.lastIndexOf("Error");
- faultname = faultname.substring(0, index);
- }
- }
- return JavaUtils.capitalize(faultname);
- }
-
private void checkTypeMapping()
{
if (typeMapping == null)
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.tools.jbws1698;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1698
+ *
+ * WSDL To Java does not use the correct name in the throws
+ * clause for faults that end in 'Fault'
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since Jun 6, 2007
+ */
+public class JBWS1698TestCase extends WSToolsTest
+{
+
+ /**
+ * Test WSDL to Java with a fault called PhoneBookFault
+ */
+ public void testGenerateFault() throws Exception
+ {
+ generateScenario("fault");
+ }
+
+ /**
+ * Test WSDL to Java with a fault called PhoneBookError
+ */
+ public void testGenerateError() throws Exception
+ {
+ generateScenario("error");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1698/" + scenario;
+ String toolsDir = "tools/jbws1698/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1698/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1698");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1698;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1698'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1698/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1698'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1698/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1698/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='PhoneBookError'>
+ <sequence/>
+ </complexType>
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='PhoneBookError' type='tns:PhoneBookError'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part element='ns1:lookup' name='lookup'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='lookupResponse'/>
+ </message>
+ <message name='PhoneBookError'>
+ <part element='ns1:PhoneBookError' name='PhoneBookError'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ <fault message='tns:PhoneBookError' name='PhoneBookError'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ <fault name='PhoneBookError'>
+ <soap:fault name='PhoneBookError' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1698;
+
+
+public class PhoneBookError
+ extends Exception{
+public PhoneBookError(){
+}
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1698;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1698.TelephoneNumber lookup(org.jboss.test.ws.jbws1698.Person lookup) throws org.jboss.test.ws.jbws1698.PhoneBookError, java.rmi.RemoteException;
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1698;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,76 @@
+<?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.jbws1698</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1698/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1698</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1698</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1698.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1698.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1698.PhoneBookError</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:PhoneBookError</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>org.jboss.test.ws.jbws1698.PhoneBookError</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://test.jboss.org/ws/jbws1698'>exMsgNS:PhoneBookError</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1698.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1698'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1698.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1698'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1698'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1698.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1698.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>lookupResponse</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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1698/error/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1698;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1698'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1698/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1698'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1698/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1698/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='PhoneBookFault'>
+ <sequence/>
+ </complexType>
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='PhoneBookFault' type='tns:PhoneBookFault'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part element='ns1:lookup' name='lookup'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='lookupResponse'/>
+ </message>
+ <message name='PhoneBookFault'>
+ <part element='ns1:PhoneBookFault' name='PhoneBookFault'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ <fault message='tns:PhoneBookFault' name='PhoneBookFault'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ <fault name='PhoneBookFault'>
+ <soap:fault name='PhoneBookFault' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1698;
+
+
+public class PhoneBookFault
+ extends Exception{
+public PhoneBookFault(){
+}
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1698;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1698.TelephoneNumber lookup(org.jboss.test.ws.jbws1698.Person lookup) throws org.jboss.test.ws.jbws1698.PhoneBookFault, java.rmi.RemoteException;
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 14:58:58 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1698;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,76 @@
+<?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.jbws1698</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1698/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1698</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1698</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1698.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1698.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1698.PhoneBookFault</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:PhoneBookFault</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>org.jboss.test.ws.jbws1698.PhoneBookFault</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://test.jboss.org/ws/jbws1698'>exMsgNS:PhoneBookFault</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1698.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1698'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1698.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1698'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1698'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1698.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1698.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>lookupResponse</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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml 2007-06-06 13:30:09 UTC (rev 3470)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1698/fault/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbossws-commits
mailing list