[jbossws-commits] JBossWS SVN: r2379 - in branches/jbossws-1.2.0/jbossws-tests: src/main/java/org/jboss/test/ws/jaxws/jsr181/complex and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-16 06:12:20 -0500 (Fri, 16 Feb 2007) New Revision: 2379 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java Removed: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/client/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml Log: [JBWS-1525] Fix complex jsr181 test Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -180,6 +180,7 @@ <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jsr181/complex/*TestCase.class"/> </classes> </war> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,76 +1,146 @@ -/* -* 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.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * Represents a normal address. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for Address complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Address"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="city" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="state" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="street" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="zip" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class Address -{ - private String street; - private String city; - private String state; - private String zip; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Address", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "city", + "state", + "street", + "zip" +}) +public class Address { - public String getCity() - { - return city; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String city; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String state; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String street; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String zip; - public void setCity(String city) - { - this.city = city; - } + /** + * Gets the value of the city property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCity() { + return city; + } - public String getState() - { - return state; - } + /** + * Sets the value of the city property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCity(String value) { + this.city = value; + } - public void setState(String state) - { - this.state = state; - } + /** + * Gets the value of the state property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getState() { + return state; + } - public String getStreet() - { - return street; - } + /** + * Sets the value of the state property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setState(String value) { + this.state = value; + } - public void setStreet(String street) - { - this.street = street; - } + /** + * Gets the value of the street property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStreet() { + return street; + } - public String getZip() - { - return zip; - } + /** + * Sets the value of the street property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStreet(String value) { + this.street = value; + } - public void setZip(String zip) - { - this.zip = zip; - } -} \ No newline at end of file + /** + * Gets the value of the zip property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getZip() { + return zip; + } + + /** + * Sets the value of the zip property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setZip(String value) { + this.zip = value; + } + +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,50 +0,0 @@ -/* -* 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.jsr181.complex; - -/** - * Denotes that this customer already exists - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class AlreadyRegisteredException extends RegistrationException -{ - private long existingId; - - public AlreadyRegisteredException(String message, long existingId, Throwable cause) - { - super(message, cause); - this.existingId = existingId; - } - - public AlreadyRegisteredException(String message, long existingId) - { - super(message); - this.existingId = existingId; - } - - public long getExistingId() - { - return existingId; - } -} Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,54 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for AlreadyRegisteredFault complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="AlreadyRegisteredFault"> + * &lt;complexContent> + * &lt;extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}RegistrationFa... + * &lt;sequence> + * &lt;element name="existingId" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AlreadyRegisteredFault", propOrder = { + "existingId" +}) +public class AlreadyRegisteredFault + extends RegistrationFault +{ + + protected long existingId; + + /** + * Gets the value of the existingId property. + * + */ + public long getExistingId() { + return existingId; + } + + /** + * Sets the value of the existingId property. + * + */ + public void setExistingId(long value) { + this.existingId = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.ws.WebFault; + + +/** + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:41 CET 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. + * + * JAX-WS Version: 2.0 + * + */ +@WebFault(name = "AlreadyRegisteredFault", targetNamespace = "http://org.jboss.ws/jaxws/complex") +public class AlreadyRegisteredFault_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private AlreadyRegisteredFault faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public AlreadyRegisteredFault_Exception(String message, AlreadyRegisteredFault faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public AlreadyRegisteredFault_Exception(String message, AlreadyRegisteredFault faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.AlreadyRegisteredFault + */ + public AlreadyRegisteredFault getFaultInfo() { + return faultInfo; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,98 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * <p>Java class for BulkRegister complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="BulkRegister"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Customers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="When" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "BulkRegister", propOrder = { + "customers", + "when" +}) +public class BulkRegister { + + @XmlElement(name = "Customers", nillable = true) + protected List<Customer> customers; + @XmlElement(name = "When", required = true, nillable = true) + protected XMLGregorianCalendar when; + + /** + * Gets the value of the customers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the customers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getCustomers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Customer } + * + * + */ + public List<Customer> getCustomers() { + if (customers == null) { + customers = new ArrayList<Customer>(); + } + return this.customers; + } + + /** + * Gets the value of the when property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getWhen() { + return when; + } + + /** + * Sets the value of the when property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setWhen(XMLGregorianCalendar value) { + this.when = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,102 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for BulkRegisterResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="BulkRegisterResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="RegisteredIDs" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="result" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "BulkRegisterResponse", propOrder = { + "registeredIDs", + "result" +}) +public class BulkRegisterResponse { + + @XmlElement(name = "RegisteredIDs", type = Long.class) + protected List<Long> registeredIDs; + @XmlElement(type = Long.class) + protected List<Long> result; + + /** + * Gets the value of the registeredIDs property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the registeredIDs property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getRegisteredIDs().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Long } + * + * + */ + public List<Long> getRegisteredIDs() { + if (registeredIDs == null) { + registeredIDs = new ArrayList<Long>(); + } + return this.registeredIDs; + } + + /** + * Gets the value of the result property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the result property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getResult().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Long } + * + * + */ + public List<Long> getResult() { + if (result == null) { + result = new ArrayList<Long>(); + } + return this.result; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,99 +1,178 @@ -/* -* 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.jsr181.complex; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * Represents a customer. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for Customer complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Customer"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="address" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Address"/... + * &lt;element name="contactNumbers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}PhoneNumber" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;element name="name" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Name"/> + * &lt;element name="referredCustomers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class Customer -{ - private long id; - private Address address; - private Name name; - private PhoneNumber[] contactNumbers; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Customer", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "address", + "contactNumbers", + "id", + "name", + "referredCustomers" +}) +public class Customer { - // since there is no way to differentiate between a null array - // and an array with 1 element that is null - private Customer[] referredCustomers = new Customer[0]; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected Address address; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", nillable = true) + protected List<PhoneNumber> contactNumbers; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/") + protected long id; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected Name name; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", nillable = true) + protected List<Customer> referredCustomers; - public Address getAddress() - { - return address; - } + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link Address } + * + */ + public Address getAddress() { + return address; + } + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link Address } + * + */ + public void setAddress(Address value) { + this.address = value; + } - public void setAddress(Address address) - { - this.address = address; - } + /** + * Gets the value of the contactNumbers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the contactNumbers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getContactNumbers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link PhoneNumber } + * + * + */ + public List<PhoneNumber> getContactNumbers() { + if (contactNumbers == null) { + contactNumbers = new ArrayList<PhoneNumber>(); + } + return this.contactNumbers; + } + /** + * Gets the value of the id property. + * + */ + public long getId() { + return id; + } - public PhoneNumber[] getContactNumbers() - { - return contactNumbers; - } + /** + * Sets the value of the id property. + * + */ + public void setId(long value) { + this.id = value; + } + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link Name } + * + */ + public Name getName() { + return name; + } - public void setContactNumbers(PhoneNumber[] contactNumbers) - { - this.contactNumbers = contactNumbers; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link Name } + * + */ + public void setName(Name value) { + this.name = value; + } + /** + * Gets the value of the referredCustomers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the referredCustomers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getReferredCustomers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Customer } + * + * + */ + public List<Customer> getReferredCustomers() { + if (referredCustomers == null) { + referredCustomers = new ArrayList<Customer>(); + } + return this.referredCustomers; + } - public long getId() - { - return id; - } - - - public void setId(long id) - { - this.id = id; - } - - - public Name getName() - { - return name; - } - - - public void setName(Name name) - { - this.name = name; - } - - - public Customer[] getReferredCustomers() - { - return referredCustomers; - } - - - public void setReferredCustomers(Customer[] referredCustomers) - { - this.referredCustomers = referredCustomers; - } } Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for GetStatistics complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="GetStatistics"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Customer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"... + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "GetStatistics", propOrder = { + "customer" +}) +public class GetStatistics { + + @XmlElement(name = "Customer", required = true, nillable = true) + protected Customer customer; + + /** + * Gets the value of the customer property. + * + * @return + * possible object is + * {@link Customer } + * + */ + public Customer getCustomer() { + return customer; + } + + /** + * Sets the value of the customer property. + * + * @param value + * allowed object is + * {@link Customer } + * + */ + public void setCustomer(Customer value) { + this.customer = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,91 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; + + +/** + * <p>Java class for GetStatisticsResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="GetStatisticsResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Statistics" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statisti... + * &lt;element name="result" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statisti... + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "GetStatisticsResponse", propOrder = { + "statistics", + "result" +}) +public class GetStatisticsResponse { + + @XmlElement(name = "Statistics", required = true, nillable = true) + protected Statistics statistics; + @XmlElement(required = true, nillable = true) + protected Statistics result; + + /** + * Gets the value of the statistics property. + * + * @return + * possible object is + * {@link Statistics } + * + */ + public Statistics getStatistics() { + return statistics; + } + + /** + * Sets the value of the statistics property. + * + * @param value + * allowed object is + * {@link Statistics } + * + */ + public void setStatistics(Statistics value) { + this.statistics = value; + } + + /** + * Gets the value of the result property. + * + * @return + * possible object is + * {@link Statistics } + * + */ + public Statistics getResult() { + return result; + } + + /** + * Sets the value of the result property. + * + * @param value + * allowed object is + * {@link Statistics } + * + */ + public void setResult(Statistics value) { + this.result = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,43 +1,56 @@ -/* -* 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.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * An invoice customer that has an invoice cycle day. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for InvoiceCustomer complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="InvoiceCustomer"> + * &lt;complexContent> + * &lt;extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"... + * &lt;sequence> + * &lt;element name="cycleDay" type="{http://www.w3.org/2001/XMLSchema}int"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class InvoiceCustomer extends Customer +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "InvoiceCustomer", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "cycleDay" +}) +public class InvoiceCustomer + extends Customer { - private int cycleDay; - public int getCycleDay() - { - return cycleDay; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/") + protected int cycleDay; - public void setCycleDay(int cycleDay) - { - this.cycleDay = cycleDay; - } + /** + * Gets the value of the cycleDay property. + * + */ + public int getCycleDay() { + return cycleDay; + } + + /** + * Sets the value of the cycleDay property. + * + */ + public void setCycleDay(int value) { + this.cycleDay = value; + } + } Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,314 @@ +/* + * 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.jsr181.complex; + +// $Id$ + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.ws.Holder; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; + +/** + * A complex JAX-WS test + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +public class JSR181ComplexTestCase extends JBossWSTest +{ + private Registration port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, ""); //, "jaxws-jsr181-complex.war"); + } + + protected void _setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new File("resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); + QName serviceName = new QName("http://org.jboss.ws/jaxws/complex", "RegistrationService"); + Service service = Service.create(wsdlURL, serviceName); + port = (Registration)service.getPort(Registration.class); + } + + public void testRegistration() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + Customer customer = getFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + XMLGregorianCalendar cal = getCalendar(); + + Holder<Long> registeredID = new Holder<Long>(); + Holder<Long> result = new Holder<Long>(); + port.register(customer, cal, registeredID, result); + + customer = getAlCapone(); + try + { + port.register(customer, cal, registeredID, result); + fail("Expected AlreadyRegisteredFault"); + } + catch (AlreadyRegisteredFault_Exception e) + { + assertEquals(456, e.getFaultInfo().getExistingId()); + } + } + + public void testInvoiceRegistration() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + InvoiceCustomer customer = getInvoiceFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + Holder<Boolean> done = new Holder<Boolean>(); + Holder<Boolean> result = new Holder<Boolean>(); + port.registerForInvoice(customer, done, result); + assertTrue(result.value); + } + + public void testOtherPackage() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + Holder<Statistics> statistics = new Holder<Statistics>(); + Holder<Statistics> result = new Holder<Statistics>(); + port.getStatistics(getFredJackson(), statistics, result); + Statistics stats = statistics.value; + + System.out.println(stats.getActivationTime()); + + assertEquals(10, stats.getHits()); + } + + public void testBulkRegistration() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + List<Customer> customers = new ArrayList<Customer>(); + customers.add(getFredJackson()); + customers.add(getJohnDoe()); + + Holder<List<Long>> registeredIDs = new Holder<List<Long>>(); + Holder<List<Long>> result = new Holder<List<Long>>(); + port.bulkRegister(customers, getCalendar(), registeredIDs, result); + + assertEquals(123, result.value.get(0).longValue()); + assertEquals(124, result.value.get(1).longValue()); + + customers.clear(); + customers.add(getFredJackson()); + customers.add(getInvalid(754)); + customers.add(getInvalid(753)); + customers.add(getJohnDoe()); + customers.add(getInvalid(752)); + + try + { + port.bulkRegister(customers, getCalendar(), registeredIDs, result); + } + catch (ValidationFault_Exception e) + { + List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); + assertEquals(754, failedCustomers.get(0).longValue()); + assertEquals(753, failedCustomers.get(1).longValue()); + assertEquals(752, failedCustomers.get(2).longValue()); + } + } + + private Customer getFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + Customer customer = new Customer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + return customer; + } + + private InvoiceCustomer getInvoiceFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + InvoiceCustomer customer = new InvoiceCustomer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + customer.setCycleDay(10); + return customer; + } + + private Customer getJohnDoe() + { + Name name = new Name(); + name.setFirstName("John"); + name.setLastName("Doe"); + + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(124); + return customer; + } + + private Customer getInvalid(long id) + { + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(id); + return customer; + } + + private Customer getAlCapone() + { + Name name = new Name(); + name.setFirstName("Al"); + name.setLastName("Capone"); + + Address address = new Address(); + address.setCity("Chicago"); + address.setState("Illinois"); + address.setZip("60619"); + address.setStreet("7244 South Prairie Avenue."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("888"); + number1.setExchange("722"); + number1.setLine("7322"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(125); + return customer; + } + + private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } +} \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,73 +1,118 @@ -/* -* 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.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * A normal name. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for Name complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Name"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="firstName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="lastName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="middleName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class Name -{ - private String firstName; - private String middleName; - private String lastName; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Name", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "firstName", + "lastName", + "middleName" +}) +public class Name { - public String getFirstName() - { - return firstName; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String firstName; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String lastName; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String middleName; - public void setFirstName(String firstName) - { - this.firstName = firstName; - } + /** + * Gets the value of the firstName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFirstName() { + return firstName; + } - public String getLastName() - { - return lastName; - } + /** + * Sets the value of the firstName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFirstName(String value) { + this.firstName = value; + } - public void setLastName(String lastName) - { - this.lastName = lastName; - } + /** + * Gets the value of the lastName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLastName() { + return lastName; + } - public String getMiddleName() - { - return middleName; - } + /** + * Sets the value of the lastName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLastName(String value) { + this.lastName = value; + } - public void setMiddleName(String middleName) - { - this.middleName = middleName; - } + /** + * Gets the value of the middleName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMiddleName() { + return middleName; + } - public String toString() - { - if (middleName == null) - return firstName + " " + lastName; + /** + * Sets the value of the middleName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMiddleName(String value) { + this.middleName = value; + } - return firstName + " " + middleName + " " + lastName; - } -} \ No newline at end of file +} Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,273 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jsr181.complex package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetStatistics_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "GetStatistics"); + private final static QName _BulkRegisterResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "BulkRegisterResponse"); + private final static QName _RegisterForInvoiceResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterForInvoiceResponse"); + private final static QName _BulkRegister_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "BulkRegister"); + private final static QName _RegisterResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterResponse"); + private final static QName _RegistrationFault_QNAME = new QName("http://complex.jsr181.jaxws.ws.test.jboss.org/";, "RegistrationFault"); + private final static QName _AlreadyRegisteredFault_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "AlreadyRegisteredFault"); + private final static QName _GetStatisticsResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "GetStatisticsResponse"); + private final static QName _Register_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "Register"); + private final static QName _ValidationFault_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "ValidationFault"); + private final static QName _RegisterForInvoice_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterForInvoice"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jsr181.complex + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link InvoiceCustomer } + * + */ + public InvoiceCustomer createInvoiceCustomer() { + return new InvoiceCustomer(); + } + + /** + * Create an instance of {@link PhoneNumber } + * + */ + public PhoneNumber createPhoneNumber() { + return new PhoneNumber(); + } + + /** + * Create an instance of {@link RegistrationFault } + * + */ + public RegistrationFault createRegistrationFault() { + return new RegistrationFault(); + } + + /** + * Create an instance of {@link AlreadyRegisteredFault } + * + */ + public AlreadyRegisteredFault createAlreadyRegisteredFault() { + return new AlreadyRegisteredFault(); + } + + /** + * Create an instance of {@link RegisterForInvoice } + * + */ + public RegisterForInvoice createRegisterForInvoice() { + return new RegisterForInvoice(); + } + + /** + * Create an instance of {@link ValidationFault } + * + */ + public ValidationFault createValidationFault() { + return new ValidationFault(); + } + + /** + * Create an instance of {@link GetStatistics } + * + */ + public GetStatistics createGetStatistics() { + return new GetStatistics(); + } + + /** + * Create an instance of {@link BulkRegisterResponse } + * + */ + public BulkRegisterResponse createBulkRegisterResponse() { + return new BulkRegisterResponse(); + } + + /** + * Create an instance of {@link RegisterResponse } + * + */ + public RegisterResponse createRegisterResponse() { + return new RegisterResponse(); + } + + /** + * Create an instance of {@link Customer } + * + */ + public Customer createCustomer() { + return new Customer(); + } + + /** + * Create an instance of {@link RegisterForInvoiceResponse } + * + */ + public RegisterForInvoiceResponse createRegisterForInvoiceResponse() { + return new RegisterForInvoiceResponse(); + } + + /** + * Create an instance of {@link Register } + * + */ + public Register createRegister() { + return new Register(); + } + + /** + * Create an instance of {@link GetStatisticsResponse } + * + */ + public GetStatisticsResponse createGetStatisticsResponse() { + return new GetStatisticsResponse(); + } + + /** + * Create an instance of {@link Address } + * + */ + public Address createAddress() { + return new Address(); + } + + /** + * Create an instance of {@link Name } + * + */ + public Name createName() { + return new Name(); + } + + /** + * Create an instance of {@link BulkRegister } + * + */ + public BulkRegister createBulkRegister() { + return new BulkRegister(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetStatistics }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "GetStatistics") + public JAXBElement<GetStatistics> createGetStatistics(GetStatistics value) { + return new JAXBElement<GetStatistics>(_GetStatistics_QNAME, GetStatistics.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BulkRegisterResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "BulkRegisterResponse") + public JAXBElement<BulkRegisterResponse> createBulkRegisterResponse(BulkRegisterResponse value) { + return new JAXBElement<BulkRegisterResponse>(_BulkRegisterResponse_QNAME, BulkRegisterResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegisterForInvoiceResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "RegisterForInvoiceResponse") + public JAXBElement<RegisterForInvoiceResponse> createRegisterForInvoiceResponse(RegisterForInvoiceResponse value) { + return new JAXBElement<RegisterForInvoiceResponse>(_RegisterForInvoiceResponse_QNAME, RegisterForInvoiceResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BulkRegister }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "BulkRegister") + public JAXBElement<BulkRegister> createBulkRegister(BulkRegister value) { + return new JAXBElement<BulkRegister>(_BulkRegister_QNAME, BulkRegister.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegisterResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "RegisterResponse") + public JAXBElement<RegisterResponse> createRegisterResponse(RegisterResponse value) { + return new JAXBElement<RegisterResponse>(_RegisterResponse_QNAME, RegisterResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegistrationFault }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", name = "RegistrationFault") + public JAXBElement<RegistrationFault> createRegistrationFault(RegistrationFault value) { + return new JAXBElement<RegistrationFault>(_RegistrationFault_QNAME, RegistrationFault.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AlreadyRegisteredFault }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "AlreadyRegisteredFault") + public JAXBElement<AlreadyRegisteredFault> createAlreadyRegisteredFault(AlreadyRegisteredFault value) { + return new JAXBElement<AlreadyRegisteredFault>(_AlreadyRegisteredFault_QNAME, AlreadyRegisteredFault.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetStatisticsResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "GetStatisticsResponse") + public JAXBElement<GetStatisticsResponse> createGetStatisticsResponse(GetStatisticsResponse value) { + return new JAXBElement<GetStatisticsResponse>(_GetStatisticsResponse_QNAME, GetStatisticsResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Register }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "Register") + public JAXBElement<Register> createRegister(Register value) { + return new JAXBElement<Register>(_Register_QNAME, Register.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ValidationFault }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "ValidationFault") + public JAXBElement<ValidationFault> createValidationFault(ValidationFault value) { + return new JAXBElement<ValidationFault>(_ValidationFault_QNAME, ValidationFault.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegisterForInvoice }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "RegisterForInvoice") + public JAXBElement<RegisterForInvoice> createRegisterForInvoice(RegisterForInvoice value) { + return new JAXBElement<RegisterForInvoice>(_RegisterForInvoice_QNAME, RegisterForInvoice.class, null, value); + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,65 +1,118 @@ -/* -* 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.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * A typical phone number object. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for PhoneNumber complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="PhoneNumber"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="areaCode" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="exchange" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="line" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class PhoneNumber -{ - private String exchange; - private String areaCode; - private String line; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "PhoneNumber", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "areaCode", + "exchange", + "line" +}) +public class PhoneNumber { - public String getAreaCode() - { - return areaCode; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String areaCode; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String exchange; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String line; - public void setAreaCode(String areaCode) - { - this.areaCode = areaCode; - } + /** + * Gets the value of the areaCode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAreaCode() { + return areaCode; + } - public String getExchange() - { - return exchange; - } + /** + * Sets the value of the areaCode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAreaCode(String value) { + this.areaCode = value; + } - public void setExchange(String exchange) - { - this.exchange = exchange; - } + /** + * Gets the value of the exchange property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getExchange() { + return exchange; + } - public String getLine() - { - return line; - } + /** + * Sets the value of the exchange property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setExchange(String value) { + this.exchange = value; + } - public void setLine(String line) - { - this.line = line; - } + /** + * Gets the value of the line property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLine() { + return line; + } + + /** + * Sets the value of the line property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLine(String value) { + this.line = value; + } + } Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,91 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * <p>Java class for Register complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Register"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Customer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"... + * &lt;element name="When" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Register", propOrder = { + "customer", + "when" +}) +public class Register { + + @XmlElement(name = "Customer", required = true, nillable = true) + protected Customer customer; + @XmlElement(name = "When", required = true, nillable = true) + protected XMLGregorianCalendar when; + + /** + * Gets the value of the customer property. + * + * @return + * possible object is + * {@link Customer } + * + */ + public Customer getCustomer() { + return customer; + } + + /** + * Sets the value of the customer property. + * + * @param value + * allowed object is + * {@link Customer } + * + */ + public void setCustomer(Customer value) { + this.customer = value; + } + + /** + * Gets the value of the when property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getWhen() { + return when; + } + + /** + * Sets the value of the when property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setWhen(XMLGregorianCalendar value) { + this.when = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegisterForInvoice complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegisterForInvoice"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="InvoiceCustomer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}InvoiceCustome... + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegisterForInvoice", propOrder = { + "invoiceCustomer" +}) +public class RegisterForInvoice { + + @XmlElement(name = "InvoiceCustomer", required = true, nillable = true) + protected InvoiceCustomer invoiceCustomer; + + /** + * Gets the value of the invoiceCustomer property. + * + * @return + * possible object is + * {@link InvoiceCustomer } + * + */ + public InvoiceCustomer getInvoiceCustomer() { + return invoiceCustomer; + } + + /** + * Sets the value of the invoiceCustomer property. + * + * @param value + * allowed object is + * {@link InvoiceCustomer } + * + */ + public void setInvoiceCustomer(InvoiceCustomer value) { + this.invoiceCustomer = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegisterForInvoiceResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegisterForInvoiceResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="done" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;element name="result" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegisterForInvoiceResponse", propOrder = { + "done", + "result" +}) +public class RegisterForInvoiceResponse { + + protected boolean done; + protected boolean result; + + /** + * Gets the value of the done property. + * + */ + public boolean isDone() { + return done; + } + + /** + * Sets the value of the done property. + * + */ + public void setDone(boolean value) { + this.done = value; + } + + /** + * Gets the value of the result property. + * + */ + public boolean isResult() { + return result; + } + + /** + * Sets the value of the result property. + * + */ + public void setResult(boolean value) { + this.result = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,73 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegisterResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegisterResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="RegisteredID" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;element name="result" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegisterResponse", propOrder = { + "registeredID", + "result" +}) +public class RegisterResponse { + + @XmlElement(name = "RegisteredID") + protected long registeredID; + protected long result; + + /** + * Gets the value of the registeredID property. + * + */ + public long getRegisteredID() { + return registeredID; + } + + /** + * Sets the value of the registeredID property. + * + */ + public void setRegisteredID(long value) { + this.registeredID = value; + } + + /** + * Gets the value of the result property. + * + */ + public long getResult() { + return result; + } + + /** + * Sets the value of the result property. + * + */ + public void setResult(long value) { + this.result = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,62 +1,117 @@ -/* - * 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.jsr181.complex; -import java.util.Date; - +import java.util.List; import javax.jws.WebMethod; import javax.jws.WebParam; -import javax.jws.WebResult; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.ws.Holder; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; -@WebService -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -public interface Registration -{ - @WebMethod(operationName = "Register") - @WebResult(name = "RegisteredID") - public abstract long register( - @WebParam(name = "Customer") Customer customer, - @WebParam(name = "When") Date when) - throws ValidationException, AlreadyRegisteredException; - @WebMethod(operationName = "BulkRegister") - @WebResult(name = "RegisteredIDs") - public abstract long[] bulkRegister( - @WebParam(name = "Customers") Customer[] customers, - @WebParam(name = "When")Date when) - throws ValidationException, AlreadyRegisteredException; +/** + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:41 CET 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. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "Registration", targetNamespace = "http://org.jboss.ws/jaxws/complex") +public interface Registration { - @WebMethod(operationName = "RegisterForInvoice") - @WebResult(name = "done") - public abstract boolean registerForInvoice( - @WebParam(name = "InvoiceCustomer") InvoiceCustomer customer) - throws ValidationException, AlreadyRegisteredException; - @WebMethod(operationName = "GetStatistics") - @WebResult(name = "Statistics") - public abstract Statistics getStatistics( - @WebParam(name = "Customer") Customer customer); -} \ No newline at end of file + /** + * + * @param when + * @param customers + * @param result + * @param registeredIDs + * @throws AlreadyRegisteredFault_Exception + * @throws ValidationFault_Exception + */ + @WebMethod(operationName = "BulkRegister") + @RequestWrapper(localName = "BulkRegister", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.BulkRegister") + @ResponseWrapper(localName = "BulkRegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.BulkRegisterResponse") + public void bulkRegister( + @WebParam(name = "Customers", targetNamespace = "http://org.jboss.ws/jaxws/complex") + List<Customer> customers, + @WebParam(name = "When", targetNamespace = "http://org.jboss.ws/jaxws/complex") + XMLGregorianCalendar when, + @WebParam(name = "RegisteredIDs", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<List<Long>> registeredIDs, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<List<Long>> result) + throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + ; + + /** + * + * @param result + * @param statistics + * @param customer + */ + @WebMethod(operationName = "GetStatistics") + @RequestWrapper(localName = "GetStatistics", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.GetStatistics") + @ResponseWrapper(localName = "GetStatisticsResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.GetStatisticsResponse") + public void getStatistics( + @WebParam(name = "Customer", targetNamespace = "http://org.jboss.ws/jaxws/complex") + Customer customer, + @WebParam(name = "Statistics", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Statistics> statistics, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Statistics> result); + + /** + * + * @param registeredID + * @param when + * @param result + * @param customer + * @throws AlreadyRegisteredFault_Exception + * @throws ValidationFault_Exception + */ + @WebMethod(operationName = "Register") + @RequestWrapper(localName = "Register", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.Register") + @ResponseWrapper(localName = "RegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterResponse") + public void register( + @WebParam(name = "Customer", targetNamespace = "http://org.jboss.ws/jaxws/complex") + Customer customer, + @WebParam(name = "When", targetNamespace = "http://org.jboss.ws/jaxws/complex") + XMLGregorianCalendar when, + @WebParam(name = "RegisteredID", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Long> registeredID, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Long> result) + throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + ; + + /** + * + * @param result + * @param done + * @param invoiceCustomer + * @throws AlreadyRegisteredFault_Exception + * @throws ValidationFault_Exception + */ + @WebMethod(operationName = "RegisterForInvoice") + @RequestWrapper(localName = "RegisterForInvoice", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterForInvoice") + @ResponseWrapper(localName = "RegisterForInvoiceResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterForInvoiceResponse") + public void registerForInvoice( + @WebParam(name = "InvoiceCustomer", targetNamespace = "http://org.jboss.ws/jaxws/complex") + InvoiceCustomer invoiceCustomer, + @WebParam(name = "done", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Boolean> done, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Boolean> result) + throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + ; + +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,46 +0,0 @@ -/* -* 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.jsr181.complex; - -/** - * Represents a general registration failure - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class RegistrationException extends Exception -{ - public RegistrationException(String message, Throwable cause) - { - super(message, cause); - } - - public RegistrationException(String message) - { - super(message); - } - - public RegistrationException(Throwable cause) - { - super(cause); - } -} Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegistrationFault complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegistrationFault"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegistrationFault", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "message" +}) +public class RegistrationFault { + + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String message; + + /** + * Gets the value of the message property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * Sets the value of the message property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,114 +1,59 @@ -/* - * 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.jsr181.complex; -import java.util.Calendar; -import java.util.Date; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; -import javax.jws.WebService; -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; - /** - * A mock registration service that exercises the use of complex types, arrays, inheritence, - * and exceptions. Note that this test does not yet test polymorphic behavior. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:40 CET 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. + * + * JAX-WS Version: 2.0 + * */ -@WebService (endpointInterface = "org.jboss.test.ws.jaxws.jsr181.complex.Registration", serviceName="RegistrationService") -public class RegistrationService implements Registration +@WebServiceClient(name = "RegistrationService", targetNamespace = "http://org.jboss.ws/jaxws/complex", wsdlLocation = "file:/home/tdiesler/svn/jbossws/branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl") +public class RegistrationService + extends Service { - // Provide logging - private static Logger log = Logger.getLogger(RegistrationService.class); - public long register(Customer customer, Date when) throws ValidationException, AlreadyRegisteredException - { - Name name = customer.getName(); - if (name == null) - { - long[] ids = new long[1]; - ids[0] = customer.getId(); - throw new ValidationException("No name!", ids); - } + private final static URL REGISTRATIONSERVICE_WSDL_LOCATION; - if ("al".equalsIgnoreCase(name.getFirstName()) && "capone".equalsIgnoreCase(name.getLastName())) - throw new AlreadyRegisteredException("Al Capone is already registered", 456); + static { + URL url = null; + try { + url = new URL("file:/home/tdiesler/svn/jbossws/branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + REGISTRATIONSERVICE_WSDL_LOCATION = url; + } - for (Customer c : customer.getReferredCustomers()) - { - log.info("Refered customer: " + c.getName()); - } + public RegistrationService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } - log.info("registering customer: " + customer); - return customer.getId(); - } + public RegistrationService() { + super(REGISTRATIONSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/jaxws/complex", "RegistrationService")); + } - public long[] bulkRegister(Customer[] customers, Date when) throws ValidationException, AlreadyRegisteredException - { - long[] registered = new long[customers.length]; - long[] failed = new long[customers.length]; + /** + * + * @return + * returns Registration + */ + @WebEndpoint(name = "RegistrationPort") + public Registration getRegistrationPort() { + return (Registration)super.getPort(new QName("http://org.jboss.ws/jaxws/complex", "RegistrationPort"), Registration.class); + } - int x = 0; - int y = 0; - - for (Customer c : customers) - { - try - { - registered[x++] = register(c, when); - } - catch (ValidationException e) - { - failed[y++] = e.getFailiedCustomers()[0]; - } - } - - if (y > 0) - { - long[] newFailed = new long[y]; - System.arraycopy(failed, 0, newFailed, 0, y); - throw new ValidationException("Validation errors on bulk registering customers", newFailed); - } - - return registered; - } - - public boolean registerForInvoice(InvoiceCustomer customer) throws ValidationException, AlreadyRegisteredException - { - log.info("registerForInvoice: " + customer.getCycleDay()); - return true; - } - - public Statistics getStatistics(Customer customer) - { - Statistics stats = new Statistics(); - stats.hits = 10; - Calendar cal = Calendar.getInstance(); - cal.clear(); - cal.set(2006, 0, 26, 22, 59, 0); - stats.activationTime = cal; - - return stats; - } -} \ No newline at end of file +} Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,134 @@ +/* + * 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.jsr181.complex; + +// $Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.jws.WebService; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.ws.Holder; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; + +/** + * A mock registration service that exercises the use of complex types, arrays, inheritence, + * and exceptions. Note that this test does not yet test polymorphic behavior. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.complex.Registration", name = "Registration") +public class RegistrationServiceImpl implements Registration +{ + // Provide logging + private static Logger log = Logger.getLogger(RegistrationServiceImpl.class); + + public void register(Customer customer, XMLGregorianCalendar when, Holder<Long> registeredID, Holder<Long> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + Name name = customer.getName(); + if (name == null) + { + ValidationFault fault = new ValidationFault(); + fault.getFailedCustomers().add(customer.getId()); + throw new ValidationFault_Exception("No name!", fault); + } + + if ("al".equalsIgnoreCase(name.getFirstName()) && "capone".equalsIgnoreCase(name.getLastName())) + { + AlreadyRegisteredFault fault = new AlreadyRegisteredFault(); + fault.setExistingId(456); + throw new AlreadyRegisteredFault_Exception("Al Capone is already registered", fault); + } + + for (Customer c : customer.getReferredCustomers()) + { + log.info("Refered customer: " + c.getName()); + } + + log.info("registering customer: " + customer); + result.value = customer.getId(); + } + + public void bulkRegister(List<Customer> customers, XMLGregorianCalendar when, Holder<List<Long>> registeredIDs, Holder<List<Long>> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + List<Long> registered = new ArrayList<Long>(customers.size()); + List<Long> failed = new ArrayList<Long>(customers.size()); + + for (Customer c : customers) + { + try + { + Holder<Long> id = new Holder<Long>(); + Holder<Long> res = new Holder<Long>(); + register(c, when, id, res); + registered.add(res.value); + } + catch (ValidationFault_Exception e) + { + failed.add(e.getFaultInfo().getFailedCustomers().get(0)); + } + } + + if (failed.size() > 0) + { + ValidationFault fault = new ValidationFault(); + fault.getFailedCustomers().addAll(failed); + throw new ValidationFault_Exception("Validation errors on bulk registering customers", fault); + } + + result.value = registered; + } + + public void registerForInvoice(InvoiceCustomer invoiceCustomer, Holder<Boolean> done, Holder<Boolean> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + log.info("registerForInvoice: " + invoiceCustomer.getCycleDay()); + result.value = true; + } + + public void getStatistics(Customer customer, Holder<Statistics> statistics, Holder<Statistics> result) + { + Statistics stats = new Statistics(); + stats.setHits(10); + stats.setActivationTime(getCalendar()); + result.value = stats; + } + + private XMLGregorianCalendar getCalendar() + { + try + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } + catch (DatatypeConfigurationException e) + { + throw new RuntimeException(e); + } + } +} \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,50 +0,0 @@ -/* -* 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.jsr181.complex; - -/** - * Represents a validation error. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class ValidationException extends RegistrationException -{ - private long[] failiedCustomers; - - public ValidationException(String message, long[] failureCodes, Throwable cause) - { - super(message, cause); - this.failiedCustomers = failureCodes; - } - - public ValidationException(String message, long[] failureCodes) - { - super(message); - this.failiedCustomers = failureCodes; - } - - public long[] getFailiedCustomers() - { - return failiedCustomers; - } -} Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for ValidationFault complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="ValidationFault"> + * &lt;complexContent> + * &lt;extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}RegistrationFa... + * &lt;sequence> + * &lt;element name="failedCustomers" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ValidationFault", propOrder = { + "failedCustomers" +}) +public class ValidationFault + extends RegistrationFault +{ + + @XmlElement(type = Long.class) + protected List<Long> failedCustomers; + + /** + * Gets the value of the failedCustomers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the failedCustomers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getFailedCustomers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Long } + * + * + */ + public List<Long> getFailedCustomers() { + if (failedCustomers == null) { + failedCustomers = new ArrayList<Long>(); + } + return this.failedCustomers; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.ws.WebFault; + + +/** + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:41 CET 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. + * + * JAX-WS Version: 2.0 + * + */ +@WebFault(name = "ValidationFault", targetNamespace = "http://org.jboss.ws/jaxws/complex") +public class ValidationFault_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private ValidationFault faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public ValidationFault_Exception(String message, ValidationFault faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public ValidationFault_Exception(String message, ValidationFault faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.ValidationFault + */ + public ValidationFault getFaultInfo() { + return faultInfo; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,40 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex.extra; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jsr181.complex.extra package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jsr181.complex.extra + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Statistics } + * + */ + public Statistics createStatistics() { + return new Statistics(); + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,31 +1,82 @@ -/* -* 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.jsr181.complex.extra; -import java.util.Calendar; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; -public class Statistics -{ - public long hits; - public Calendar activationTime; +/** + * <p>Java class for Statistics complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Statistics"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="activationTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> + * &lt;element name="hits" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Statistics", propOrder = { + "activationTime", + "hits" +}) +public class Statistics { + + @XmlElement(required = true, nillable = true) + protected XMLGregorianCalendar activationTime; + protected long hits; + + /** + * Gets the value of the activationTime property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getActivationTime() { + return activationTime; + } + + /** + * Sets the value of the activationTime property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setActivationTime(XMLGregorianCalendar value) { + this.activationTime = value; + } + + /** + * Gets the value of the hits property. + * + */ + public long getHits() { + return hits; + } + + /** + * Sets the value of the hits property. + * + */ + public void setHits(long value) { + this.hits = value; + } + } Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://extra.complex.jsr181.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.jsr181.complex.extra; Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java 2007-02-16 11:12:20 UTC (rev 2379) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/jaxws/complex", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.jsr181.complex; Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,11 +1,11 @@ <!-- This wsdl is only used for client artifact generation -wsimport -keep -verbose -d ../../../java ./META-INF/wsdl/RegistrationService.wsdl +wsconsume -k -s src/main/java src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/Registration.wsdl $Id$ --> -<definitions name="RegistrationServiceService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" +<definitions name="RegistrationService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> @@ -30,9 +30,9 @@ <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> - <complexType name="AlreadyRegisteredException"> + <complexType name="AlreadyRegisteredFault"> <complexContent> - <extension base="ns2:RegistrationException"> + <extension base="ns2:RegistrationFault"> <sequence> <element name="existingId" type="long"/> </sequence> @@ -94,17 +94,17 @@ </sequence> </complexType> - <complexType name="ValidationException"> + <complexType name="ValidationFault"> <complexContent> - <extension base="ns2:RegistrationException"> + <extension base="ns2:RegistrationFault"> <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/> + <element maxOccurs="unbounded" minOccurs="0" name="failedCustomers" type="long"/> </sequence> </extension> </complexContent> </complexType> - <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/> + <element name="AlreadyRegisteredFault" type="tns:AlreadyRegisteredFault"/> <element name="BulkRegister" type="tns:BulkRegister"/> <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> <element name="GetStatistics" type="tns:GetStatistics"/> @@ -113,7 +113,7 @@ <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> <element name="RegisterResponse" type="tns:RegisterResponse"/> - <element name="ValidationException" type="tns:ValidationException"/> + <element name="ValidationFault" type="tns:ValidationFault"/> </schema> <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org... xmlns="http://www.w3.org/2001/XMLSchema" @@ -199,70 +199,70 @@ </sequence> </complexType> - <complexType name="RegistrationException"> + <complexType name="RegistrationFault"> <sequence> <element name="message" nillable="true" type="string"/> </sequence> </complexType> - <element name="RegistrationException" type="tns:RegistrationException"/> + <element name="RegistrationFault" type="tns:RegistrationFault"/> </schema> </types> - <message name="RegistrationService_BulkRegister"> + <message name="Registration_BulkRegister"> <part element="tns:BulkRegister" name="parameters"/> </message> - <message name="RegistrationService_GetStatisticsResponse"> + <message name="Registration_GetStatisticsResponse"> <part element="tns:GetStatisticsResponse" name="result"/> </message> - <message name="AlreadyRegisteredException"> - <part element="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> + <message name="AlreadyRegisteredFault"> + <part element="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> </message> - <message name="ValidationException"> - <part element="tns:ValidationException" name="ValidationException"/> + <message name="ValidationFault"> + <part element="tns:ValidationFault" name="ValidationFault"/> </message> - <message name="RegistrationService_RegisterForInvoice"> + <message name="Registration_RegisterForInvoice"> <part element="tns:RegisterForInvoice" name="parameters"/> </message> - <message name="RegistrationService_RegisterResponse"> + <message name="Registration_RegisterResponse"> <part element="tns:RegisterResponse" name="result"/> </message> - <message name="RegistrationService_RegisterForInvoiceResponse"> + <message name="Registration_RegisterForInvoiceResponse"> <part element="tns:RegisterForInvoiceResponse" name="result"/> </message> - <message name="RegistrationService_BulkRegisterResponse"> + <message name="Registration_BulkRegisterResponse"> <part element="tns:BulkRegisterResponse" name="result"/> </message> - <message name="RegistrationService_GetStatistics"> + <message name="Registration_GetStatistics"> <part element="tns:GetStatistics" name="parameters"/> </message> - <message name="RegistrationService_Register"> + <message name="Registration_Register"> <part element="tns:Register" name="parameters"/> </message> - <portType name="RegistrationService"> + <portType name="Registration"> <operation name="BulkRegister"> - <input message="tns:RegistrationService_BulkRegister"/> - <output message="tns:RegistrationService_BulkRegisterResponse"/> - <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> - <fault message="tns:ValidationException" name="ValidationException"/> + <input message="tns:Registration_BulkRegister"/> + <output message="tns:Registration_BulkRegisterResponse"/> + <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> + <fault message="tns:ValidationFault" name="ValidationFault"/> </operation> <operation name="GetStatistics"> - <input message="tns:RegistrationService_GetStatistics"/> - <output message="tns:RegistrationService_GetStatisticsResponse"/> + <input message="tns:Registration_GetStatistics"/> + <output message="tns:Registration_GetStatisticsResponse"/> </operation> <operation name="Register"> - <input message="tns:RegistrationService_Register"/> - <output message="tns:RegistrationService_RegisterResponse"/> - <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> - <fault message="tns:ValidationException" name="ValidationException"/> + <input message="tns:Registration_Register"/> + <output message="tns:Registration_RegisterResponse"/> + <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> + <fault message="tns:ValidationFault" name="ValidationFault"/> </operation> <operation name="RegisterForInvoice"> - <input message="tns:RegistrationService_RegisterForInvoice"/> - <output message="tns:RegistrationService_RegisterForInvoiceResponse"/> - <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> - <fault message="tns:ValidationException" name="ValidationException"/> + <input message="tns:Registration_RegisterForInvoice"/> + <output message="tns:Registration_RegisterForInvoiceResponse"/> + <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> + <fault message="tns:ValidationFault" name="ValidationFault"/> </operation> </portType> - <binding name="RegistrationServiceBinding" type="tns:RegistrationService"> + <binding name="RegistrationBinding" type="tns:Registration"> <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> <operation name="BulkRegister"> <soap:operation soapAction=""/> @@ -272,11 +272,11 @@ <output> <soap:body use="literal"/> </output> - <fault name="AlreadyRegisteredException"> - <soap:fault name="AlreadyRegisteredException" use="literal"/> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> </fault> - <fault name="ValidationException"> - <soap:fault name="ValidationException" use="literal"/> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> </fault> </operation> <operation name="GetStatistics"> @@ -296,11 +296,11 @@ <output> <soap:body use="literal"/> </output> - <fault name="AlreadyRegisteredException"> - <soap:fault name="AlreadyRegisteredException" use="literal"/> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> </fault> - <fault name="ValidationException"> - <soap:fault name="ValidationException" use="literal"/> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> </fault> </operation> <operation name="RegisterForInvoice"> @@ -311,17 +311,17 @@ <output> <soap:body use="literal"/> </output> - <fault name="AlreadyRegisteredException"> - <soap:fault name="AlreadyRegisteredException" use="literal"/> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> </fault> - <fault name="ValidationException"> - <soap:fault name="ValidationException" use="literal"/> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> </fault> </operation> </binding> - <service name="RegistrationServiceService"> - <port binding="tns:RegistrationServiceBinding" name="RegistrationServicePort"> - <soap:address location="http://tdvaio:8080/jaxws-jsr181-complex/RegistrationService"/> + <service name="RegistrationService"> + <port binding="tns:RegistrationBinding" name="RegistrationPort"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/Registration"/> </port> </service> </definitions> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -7,7 +7,7 @@ <servlet> <servlet-name>RegistrationService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationService</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationServiceImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>RegistrationService</servlet-name> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - -wscompile -import -keep -mapping jaxrpc-mapping.xml config.xml -Modify wrapper types to be DocWrappedService_(wrapper type name)_Request|ResponseStruct. ---> - -<configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> -<wsdl location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService?wsdl" packageName="org.jboss.test.ws.jaxws.jsr181.complex.client"/> -</configuration> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,377 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> -</package-mapping> -<package-mapping> -<package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> -</package-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Register</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>customer</java-variable-name> -<xml-element-name>Customer</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>when</java-variable-name> -<xml-element-name>When</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</java-type> -<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/&q... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>activationTime</java-variable-name> -<xml-element-name>activationTime</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>hits</java-variable-name> -<xml-element-name>hits</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>address</java-variable-name> -<xml-element-name>address</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>contactNumbers</java-variable-name> -<xml-element-name>contactNumbers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>id</java-variable-name> -<xml-element-name>id</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>name</java-variable-name> -<xml-element-name>name</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>referredCustomers</java-variable-name> -<xml-element-name>referredCustomers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>cycleDay</java-variable-name> -<xml-element-name>cycleDay</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegister</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>customers</java-variable-name> -<xml-element-name>Customers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>when</java-variable-name> -<xml-element-name>When</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>message</java-variable-name> -<xml-element-name>message</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>failiedCustomers</java-variable-name> -<xml-element-name>failiedCustomers</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Address</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>city</java-variable-name> -<xml-element-name>city</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>state</java-variable-name> -<xml-element-name>state</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>street</java-variable-name> -<xml-element-name>street</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>zip</java-variable-name> -<xml-element-name>zip</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Name</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<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>lastName</java-variable-name> -<xml-element-name>lastName</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>middleName</java-variable-name> -<xml-element-name>middleName</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>registeredIDs</java-variable-name> -<xml-element-name>RegisteredIDs</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.PhoneNumber</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<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>exchange</java-variable-name> -<xml-element-name>exchange</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>line</java-variable-name> -<xml-element-name>line</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoiceResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>done</java-variable-name> -<xml-element-name>done</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoice</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>invoiceCustomer</java-variable-name> -<xml-element-name>InvoiceCustomer</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>registeredID</java-variable-name> -<xml-element-name>RegisteredID</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatistics</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>customer</java-variable-name> -<xml-element-name>Customer</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatisticsResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>statistics</java-variable-name> -<xml-element-name>Statistics</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>address</java-variable-name> -<xml-element-name>address</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>contactNumbers</java-variable-name> -<xml-element-name>contactNumbers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>id</java-variable-name> -<xml-element-name>id</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>name</java-variable-name> -<xml-element-name>name</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>referredCustomers</java-variable-name> -<xml-element-name>referredCustomers</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>message</java-variable-name> -<xml-element-name>message</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>existingId</java-variable-name> -<xml-element-name>existingId</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegister&gt;Customers[0,unbounded]</anonymous-type-qname> -<qname-scope>complexType</qname-scope> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>long[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegisterResponse&gt;RegisteredIDs[0,unbounded]</anonymous-type-qname> -<qname-scope>complexType</qname-scope> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:Customer&gt;referredCustomers[0,unbounded]</anonymous-type-qname> -<qname-scope>complexType</qname-scope> -</java-xml-type-mapping> -<exception-mapping> -<exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&... -<constructor-parameter-order> -<element-name>message</element-name> -<element-name>failiedCustomers</element-name> -</constructor-parameter-order> -</exception-mapping> -<exception-mapping> -<exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&... -<constructor-parameter-order> -<element-name>message</element-name> -<element-name>existingId</element-name> -</constructor-parameter-order> -</exception-mapping> -<service-interface-mapping> -<service-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationServiceService</service-interface> -<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<port-mapping> -<port-name>RegistrationServicePort</port-name> -<java-port-name>RegistrationServicePort</java-port-name> -</port-mapping> -</service-interface-mapping> -<service-endpoint-interface-mapping> -<service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationService</service-endpoint-interface> -<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/&quo... -<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<service-endpoint-method-mapping> -<java-method-name>bulkRegister</java-method-name> -<wsdl-operation>BulkRegister</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Customers</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<method-param-parts-mapping> -<param-position>1</param-position> -<param-type>java.util.Calendar</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>When</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>long[]</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>RegisteredIDs</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -<service-endpoint-method-mapping> -<java-method-name>getStatistics</java-method-name> -<wsdl-operation>GetStatistics</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Customer</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.jaxws.jsr181.complex.client.Statistics</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Statistics</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -<service-endpoint-method-mapping> -<java-method-name>register</java-method-name> -<wsdl-operation>Register</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Customer</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<method-param-parts-mapping> -<param-position>1</param-position> -<param-type>java.util.Calendar</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>When</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>long</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>RegisteredID</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -<service-endpoint-method-mapping> -<java-method-name>registerForInvoice</java-method-name> -<wsdl-operation>RegisterForInvoice</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>InvoiceCustomer</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>boolean</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>done</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -</service-endpoint-interface-mapping> -</java-wsdl-mapping> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wscompile -cp ../../../../output/classes -gen:server -f:rpcliteral -mapping jaxrpc-mapping.xml config.xml ---> - -<configuration - xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> - - <service name="ActionRpcService" - targetNamespace="http://org.jboss.ws/addressing/action" - typeNamespace="http://org.jboss.ws/addressing/action" - packageName="org.jboss.test.ws.jaxws.wsaddressing.action"> - <interface name="org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint"/> - </service> - -</configuration> - Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,61 +0,0 @@ -<?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.jaxws.wsaddressing.action</package-type> - <namespaceURI>http://org.jboss.ws/addressing/action</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jaxws.wsaddressing.action</package-type> - <namespaceURI>http://org.jboss.ws/addressing/action</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.wsaddressing.action.ActionRpcService</service-interface> - <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/addressing/action">serviceNS:ActionRpcService</wsdl-service-name> - <port-mapping> - <port-name>ActionEndpointPort</port-name> - <java-port-name>ActionEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/addressing/action">portTypeNS:ActionEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/addressing/action">bindingNS:ActionEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>bar</java-method-name> - <wsdl-operation>bar</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/addressing/action">wsdlMsgNS:ActionEndpoint_bar</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/addressing/action">wsdlMsgNS:ActionEndpoint_barResponse</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>foo</java-method-name> - <wsdl-operation>foo</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/addressing/action">wsdlMsgNS:ActionEndpoint_foo</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/addressing/action">wsdlMsgNS:ActionEndpoint_fooResponse</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 Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jaxrpc-mapping.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jaxrpc-mapping.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,37 +0,0 @@ -<?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.jaxws.wsaddressing.replyto</package-type> - <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:InitialEndpointService</wsdl-service-name> - <port-mapping> - <port-name>InitialEndpointPort</port-name> - <java-port-name>InitialEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:InitialEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:InitialEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>addItem</java-method-name> - <wsdl-operation>addItem</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItem</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItemResponse</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 Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-config.xml ---> - -<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.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> - </global> - <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> \ No newline at end of file Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,41 +0,0 @@ -<?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.jaxws.wsaddressing.replyto</package-type> - <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:ReplyToEndpointService</wsdl-service-name> - <port-mapping> - <port-name>ReplyToEndpointPort</port-name> - <java-port-name>ReplyToEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:ReplyToEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:ReplyToEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>addItemResponse</java-method-name> - <wsdl-operation>addItemResponse</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_addItemResponse</wsdl-message> - <wsdl-message-part-name>result</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>getLastItem</java-method-name> - <wsdl-operation>getLastItem</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_getLastItemResponse</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 Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2007-02-16 09:12:39 UTC (rev 2378) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2007-02-16 11:12:20 UTC (rev 2379) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-config.xml ---> - -<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.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> - </global> - <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration>