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

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed Feb 21 13:58:24 EST 2007


Author: thomas.diesler at jboss.com
Date: 2007-02-21 13:58:24 -0500 (Wed, 21 Feb 2007)
New Revision: 2433

Removed:
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java
Modified:
   branches/jbossws-1.2.0/jbossws-tests/build.xml
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
   branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
Log:
Refactor jaxws/complex test

Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml	2007-02-21 18:58:24 UTC (rev 2433)
@@ -257,6 +257,7 @@
     <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
     <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
     <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
+    <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
     <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
   </target>
 

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,146 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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 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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "Address", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = {
-    "city",
-    "state",
-    "street",
-    "zip"
-})
-public class Address {
-
-    @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;
-
-    /**
-     * Gets the value of the city property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * Sets the value of the city property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCity(String value) {
-        this.city = value;
-    }
-
-    /**
-     * Gets the value of the state property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getState() {
-        return state;
-    }
-
-    /**
-     * Sets the value of the state property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setState(String value) {
-        this.state = value;
-    }
-
-    /**
-     * Gets the value of the street property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreet() {
-        return street;
-    }
-
-    /**
-     * Sets the value of the street property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreet(String value) {
-        this.street = value;
-    }
-
-    /**
-     * 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/complex/AlreadyRegisteredFault.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,54 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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/}RegistrationFault">
- *       &lt;sequence>
- *         &lt;element name="existingId" type="{http://www.w3.org/2001/XMLSchema}long"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,60 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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
- * 
- */
- at 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.complex.AlreadyRegisteredFault
-     */
-    public AlreadyRegisteredFault getFaultInfo() {
-        return faultInfo;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,98 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,102 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,178 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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 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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "Customer", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = {
-    "address",
-    "contactNumbers",
-    "id",
-    "name",
-    "referredCustomers"
-})
-public class Customer {
-
-    @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;
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,62 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,91 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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.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/}Statistics"/>
- *         &lt;element name="result" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statistics"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,56 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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 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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "InvoiceCustomer", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = {
-    "cycleDay"
-})
-public class InvoiceCustomer
-    extends Customer
-{
-
-    @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/")
-    protected int 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;
-    }
-
-}

Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -39,7 +39,6 @@
 
 import org.jboss.test.ws.JBossWSTest;
 import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.jaxws.complex.extra.Statistics;
 
 /**
  * A complex JAX-WS test
@@ -56,23 +55,17 @@
       return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, "jaxws-complex.war");
    }
 
-   protected void _setUp() throws Exception
+   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");
+      URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL();
+      QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "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());
@@ -97,12 +90,6 @@
 
    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());
@@ -115,12 +102,6 @@
 
    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);
@@ -133,12 +114,6 @@
 
    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());

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,118 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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 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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "Name", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = {
-    "firstName",
-    "lastName",
-    "middleName"
-})
-public class Name {
-
-    @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;
-
-    /**
-     * Gets the value of the firstName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFirstName() {
-        return firstName;
-    }
-
-    /**
-     * Sets the value of the firstName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFirstName(String value) {
-        this.firstName = value;
-    }
-
-    /**
-     * Gets the value of the lastName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLastName() {
-        return lastName;
-    }
-
-    /**
-     * Sets the value of the lastName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLastName(String value) {
-        this.lastName = value;
-    }
-
-    /**
-     * Gets the value of the middleName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMiddleName() {
-        return middleName;
-    }
-
-    /**
-     * Sets the value of the middleName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMiddleName(String value) {
-        this.middleName = value;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,273 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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.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.
- * 
- */
- at 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.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);
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,118 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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 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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PhoneNumber", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = {
-    "areaCode",
-    "exchange",
-    "line"
-})
-public class PhoneNumber {
-
-    @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;
-
-    /**
-     * Gets the value of the areaCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAreaCode() {
-        return areaCode;
-    }
-
-    /**
-     * Sets the value of the areaCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAreaCode(String value) {
-        this.areaCode = value;
-    }
-
-    /**
-     * Gets the value of the exchange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getExchange() {
-        return exchange;
-    }
-
-    /**
-     * Sets the value of the exchange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setExchange(String value) {
-        this.exchange = value;
-    }
-
-    /**
-     * 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,91 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,62 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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/}InvoiceCustomer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,71 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,73 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,117 +0,0 @@
-
-package org.jboss.test.ws.jaxws.complex;
-
-import java.util.List;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-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.complex.extra.Statistics;
-
-
-/**
- * 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
- * 
- */
- at WebService(name = "Registration", targetNamespace = "http://types.complex.jaxws.ws.test.jboss.org")
-public interface Registration {
-
-
-    /**
-     * 
-     * @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.complex.BulkRegister")
-    @ResponseWrapper(localName = "BulkRegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.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.complex.GetStatistics")
-    @ResponseWrapper(localName = "GetStatisticsResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.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.complex.Register")
-    @ResponseWrapper(localName = "RegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.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.complex.RegisterForInvoice")
-    @ResponseWrapper(localName = "RegisterForInvoiceResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.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/complex/RegistrationFault.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,62 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,59 +0,0 @@
-
-package org.jboss.test.ws.jaxws.complex;
-
-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;
-
-
-/**
- * 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
- * 
- */
- at 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
-{
-
-    private final static URL REGISTRATIONSERVICE_WSDL_LOCATION;
-
-    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;
-    }
-
-    public RegistrationService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public RegistrationService() {
-        super(REGISTRATIONSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/jaxws/complex", "RegistrationService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Registration
-     */
-    @WebEndpoint(name = "RegistrationPort")
-    public Registration getRegistrationPort() {
-        return (Registration)super.getPort(new QName("http://org.jboss.ws/jaxws/complex", "RegistrationPort"), Registration.class);
-    }
-
-}

Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -33,7 +33,6 @@
 import javax.xml.ws.Holder;
 
 import org.jboss.logging.Logger;
-import org.jboss.test.ws.jaxws.complex.extra.Statistics;
 
 /**
  * A mock registration service that exercises the use of complex types, arrays, inheritence,
@@ -48,7 +47,7 @@
    // 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
+   public void register(Customer customer, Object when, Holder<Long> registeredID, Holder<Long> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
    {
       Name name = customer.getName();
       if (name == null)
@@ -74,7 +73,7 @@
       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
+   public void bulkRegister(List<Customer> customers, Object 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());

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,71 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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/}RegistrationFault">
- *       &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>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at 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;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,60 +0,0 @@
-
-package org.jboss.test.ws.jaxws.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
- * 
- */
- at 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.complex.ValidationFault
-     */
-    public ValidationFault getFaultInfo() {
-        return faultInfo;
-    }
-
-}

Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,2 +0,0 @@
- at 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.complex;

Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,15 +1,15 @@
 <!--
 This wsdl is only used for client artifact generation
 
-wsconsume -k -s src/main/java src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl
+wsconsume -k -s output/wsconsume src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
 
 $Id$
 -->
-<definitions name="RegistrationService" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <import namespace="http://org.jboss.ws/jaxws/complex" location="Registration_PortType.wsdl"/>
+<definitions name="RegistrationService" targetNamespace="http://complex.jaxws.ws.test.jboss.org/" xmlns:tns="http://complex.jaxws.ws.test.jboss.org/" xmlns:ns1="http://types.complex.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <import namespace="http://types.complex.jaxws.ws.test.jboss.org/" location="Registration_PortType.wsdl"/>
   <service name="RegistrationService">
     <port name="RegistrationPort" binding="ns1:RegistrationBinding">
-      <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService"/>
+      <soap:address location="http://@jbosstest.host.name@:8080/jaxws-complex/RegistrationService"/>
     </port>
   </service>
 </definitions>

Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl	2007-02-21 18:52:49 UTC (rev 2432)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl	2007-02-21 18:58:24 UTC (rev 2433)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="RegistrationService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+<definitions name="RegistrationService" targetNamespace="http://types.complex.jaxws.ws.test.jboss.org/" xmlns:tns="http://complex.jaxws.ws.test.jboss.org/" xmlns:ns1="http://types.complex.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
   <types>
-    <xs:schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" version="1.0" 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:xs="http://www.w3.org/2001/XMLSchema">
-   <xs:import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/>
-   <xs:import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"/>
+    <xs:schema elementFormDefault="qualified" targetNamespace="http://types.complex.jaxws.ws.test.jboss.org/" version="1.0" xmlns:ns1="http://complex.jaxws.ws.test.jboss.org/" xmlns:ns2="http://extra.complex.jaxws.ws.test.jboss.org/" xmlns:tns="http://types.complex.jaxws.ws.test.jboss.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+   <xs:import namespace="http://complex.jaxws.ws.test.jboss.org/"/>
+   <xs:import namespace="http://extra.complex.jaxws.ws.test.jboss.org/"/>
    <xs:element name="AlreadyRegisteredFault" nillable="true" type="tns:AlreadyRegisteredFault"/>
    <xs:element name="BulkRegister" nillable="true" type="tns:BulkRegister"/>
    <xs:element name="BulkRegisterResponse" nillable="true" type="tns:BulkRegisterResponse"/>
@@ -79,7 +79,7 @@
     </xs:sequence>
    </xs:complexType>
   </xs:schema>
-    <xs:schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jaxws.ws.test.jboss.org/" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
    <xs:complexType name="Statistics">
     <xs:sequence>
      <xs:element name="activationTime" nillable="true" type="xs:anySimpleType"/>
@@ -87,7 +87,7 @@
     </xs:sequence>
    </xs:complexType>
   </xs:schema>
-    <xs:schema targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" version="1.0" xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:schema targetNamespace="http://complex.jaxws.ws.test.jboss.org/" version="1.0" xmlns:tns="http://complex.jaxws.ws.test.jboss.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
    <xs:complexType name="Customer">
     <xs:sequence>
      <xs:element form="qualified" name="address" nillable="true" type="tns:Address"/>




More information about the jbossws-commits mailing list