February 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2435 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 18:54:20 -0500 (Wed, 21 Feb 2007) New Revision: 2435 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java Log: Fix wrapped non-header OUT parameter initialization Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-02-21 23:46:45 UTC (rev 2434) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-02-21 23:54:20 UTC (rev 2435) @@ -307,7 +307,7 @@ if (opMetaData.isDocumentWrapped() && !paramMetaData.isInHeader()&& !paramMetaData.isSwA() && !paramMetaData.isMessageType()) { outParameters = ParameterWrapping.unwrapRequestParameters(paramMetaData, paramValue, payload); - syncOutWrappedParameters(targetParameterTypes); + syncOutWrappedParameters(targetParameterTypes, payload); } else { @@ -338,7 +338,7 @@ } } - private void syncOutWrappedParameters(Class[] targetParameterTypes) + private void syncOutWrappedParameters(Class[] targetParameterTypes, Object[] payload) { ParameterMetaData returnMetaData = opMetaData.getReturnParameter(); if (returnMetaData != null) @@ -347,8 +347,13 @@ { try { - if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex()) ) - outParameters.put(param.getIndex(), targetParameterTypes[param.getIndex()].newInstance()); + // only OUT parameters need to be initialized + if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex())) + { + Object holder = targetParameterTypes[param.getIndex()].newInstance(); + payload[param.getIndex()] = holder; + outParameters.put(param.getIndex(), holder); + } } catch (Exception e) {

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2434 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 18:46:45 -0500 (Wed, 21 Feb 2007) New Revision: 2434 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java Log: revert Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-02-21 18:58:24 UTC (rev 2433) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-02-21 23:46:45 UTC (rev 2434) @@ -97,10 +97,9 @@ private FaultMetaData getFaultMetaData(Class exType, OperationMetaData om) { String exname = WSDLUtils.getInstance().getJustClassName(exType); - QName xmlType = new QName(tmd.typeNamespace, exname); - QName xmlName = new QName(om.getQName().getNamespaceURI(), exname); + QName xmlName = new QName(tmd.typeNamespace, exname); - FaultMetaData fm = new FaultMetaData(om, xmlName, xmlType, exType.getName()); + FaultMetaData fm = new FaultMetaData(om, xmlName, xmlName, exType.getName()); return fm; }

17 years, 2 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)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> - * <complexType name="Address"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="city" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="state" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="street" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="zip" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@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> - * <complexType name="AlreadyRegisteredFault"> - * <complexContent> - * <extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}RegistrationFault"> - * <sequence> - * <element name="existingId" type="{http://www.w3.org/2001/XMLSchema}long"/> - * </sequence> - * </extension> - * </complexContent> - * </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; - } - -} 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 - * - */ -@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> - * <complexType name="BulkRegister"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="Customers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer" maxOccurs="unbounded" minOccurs="0"/> - * <element name="When" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="BulkRegisterResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="RegisteredIDs" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> - * <element name="result" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="Customer"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="address" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Address"/> - * <element name="contactNumbers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}PhoneNumber" maxOccurs="unbounded" minOccurs="0"/> - * <element name="id" type="{http://www.w3.org/2001/XMLSchema}long"/> - * <element name="name" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Name"/> - * <element name="referredCustomers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer" maxOccurs="unbounded" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(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 { - - @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> - * <complexType name="GetStatistics"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="Customer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="GetStatisticsResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="Statistics" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statistics"/> - * <element name="result" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statistics"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="InvoiceCustomer"> - * <complexContent> - * <extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"> - * <sequence> - * <element name="cycleDay" type="{http://www.w3.org/2001/XMLSchema}int"/> - * </sequence> - * </extension> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@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> - * <complexType name="Name"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="firstName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="lastName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="middleName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@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. - * - */ -@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> - * <complexType name="PhoneNumber"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="areaCode" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="exchange" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="line" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@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> - * <complexType name="Register"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="Customer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"/> - * <element name="When" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="RegisterForInvoice"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="InvoiceCustomer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}InvoiceCustomer"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="RegisterForInvoiceResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="done" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * <element name="result" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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> - * <complexType name="RegisterResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="RegisteredID" type="{http://www.w3.org/2001/XMLSchema}long"/> - * <element name="result" type="{http://www.w3.org/2001/XMLSchema}long"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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 - * - */ -@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> - * <complexType name="RegistrationFault"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="message" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * </restriction> - * </complexContent> - * </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; - } - -} 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 - * - */ -@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> - * <complexType name="ValidationFault"> - * <complexContent> - * <extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}RegistrationFault"> - * <sequence> - * <element name="failedCustomers" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> - * </sequence> - * </extension> - * </complexContent> - * </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; - } - -} 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 - * - */ -@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 @@ -(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.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 @@  -<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"/>

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2432 - in tags/jbossws-2.0.0.CR3/integration-jboss40: src/main/java and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 13:52:49 -0500 (Wed, 21 Feb 2007) New Revision: 2432 Added: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml Removed: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml Modified: tags/jbossws-2.0.0.CR3/integration-jboss40/.classpath tags/jbossws-2.0.0.CR3/integration-jboss40/build.xml tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml Log: Merge 2422 from jbossws-1.2.0 Modified: tags/jbossws-2.0.0.CR3/integration-jboss40/.classpath =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/.classpath 2007-02-21 18:48:09 UTC (rev 2431) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/.classpath 2007-02-21 18:52:49 UTC (rev 2432) @@ -30,5 +30,6 @@ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: tags/jbossws-2.0.0.CR3/integration-jboss40/build.xml =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/build.xml 2007-02-21 18:48:09 UTC (rev 2431) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/build.xml 2007-02-21 18:52:49 UTC (rev 2432) @@ -57,12 +57,17 @@  <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src location="${jboss42.java.dir}"/> + <src location="${jboss40.java.dir}"/> + <include name="org/jboss/ws/integration/jboss40/**"/> <include name="org/jboss/ws/integration/jboss42/**"/> <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> + <exclude name="org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java"/> + <exclude name="org/jboss/ws/integration/jboss42/ServiceRefHandler.java"/> <classpath refid="jboss40.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> @@ -70,8 +75,10 @@ </target> <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile,jboss40-check-ejb3-classes" if="jboss40.ejb3.available"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src location="${jboss42.java.dir}"/> + <src location="${jboss40.java.dir}"/> <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> @@ -146,6 +153,7 @@ <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <include name="org/jboss/ws/integration/jboss40/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> </jar> @@ -188,7 +196,7 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jboss40.resources.dir}/jbossws.sar/META-INF"> <include name="jboss-service*.xml"/> </metainf> </jar> @@ -225,6 +233,7 @@ <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <include name="org/jboss/ws/integration/jboss40/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> </jar> @@ -258,7 +267,7 @@ <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/> <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" - file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + file="${jboss40.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>  <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org) Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss) Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws) Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration) Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40 (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40) Deleted: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java 2007-02-21 12:53:59 UTC (rev 2421) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java 2007-02-21 18:52:49 UTC (rev 2432) @@ -1,107 +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.ws.integration.jboss40; - -// $Id$ - -import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; - -import javax.xml.namespace.QName; - -import org.jboss.webservice.metadata.serviceref.HandlerMetaData; -import org.jboss.webservice.metadata.serviceref.InitParamMetaData; -import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; -import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; - -/** - * Build container independent service ref meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ServiceRefMetaDataAdaptor -{ - public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException - { - UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(); - usrmd.setServiceRefName(srmd.getServiceRefName()); - usrmd.setServiceInterface(srmd.getServiceInterface()); - usrmd.setWsdlLocation(srmd.getWsdlURL()); - usrmd.setMappingLocation(udi.getMetaDataFileURL(srmd.getJaxrpcMappingFile())); - usrmd.setServiceQName(srmd.getServiceQName()); - - LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); - for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs()) - { - UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(); - upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); - upcmd.setPortComponentLink(pcmd.getPortComponentLink()); - upcmd.setCallProperties(pcmd.getCallProperties()); - pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd); - } - usrmd.setPortComponentRefs(pcrefs); - - ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - for (HandlerMetaData hmd : srmd.getHandlers()) - { - UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null); - uhmd.setHandlerName(hmd.getHandlerName()); - uhmd.setHandlerClass(hmd.getHandlerClass()); - - for(String portname : hmd.getPortNames()) - { - uhmd.addPortName(portname); - } - for (InitParamMetaData ipmd : hmd.getInitParams()) - { - HandlerInitParam ip = new HandlerInitParam(); - ip.setParamName(ipmd.getParamName()); - ip.setParamValue(ipmd.getParamValue()); - uhmd.addInitParam(ip); - } - for (QName soapHeader : hmd.getSoapHeaders()) - { - uhmd.addSoapHeader(soapHeader); - } - for (String soapRole : hmd.getSoapRoles()) - { - uhmd.addSoapRole(soapRole); - } - handlers.add(uhmd); - } - usrmd.setHandlers(handlers); - - usrmd.setConfigName(srmd.getConfigName()); - usrmd.setConfigFile(srmd.getConfigFile()); - usrmd.setWsdlOverride(srmd.getWsdlOverride()); - usrmd.setCallProperties(srmd.getCallProperties()); - - return usrmd; - } -} Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java 2007-02-21 18:52:49 UTC (rev 2432) @@ -0,0 +1,107 @@ +/* + * 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.ws.integration.jboss40; + +// $Id$ + +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +import javax.xml.namespace.QName; + +import org.jboss.webservice.metadata.serviceref.HandlerMetaData; +import org.jboss.webservice.metadata.serviceref.InitParamMetaData; +import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; +import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; + +/** + * Build container independent service ref meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ServiceRefMetaDataAdaptor +{ + public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException + { + UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(); + usrmd.setServiceRefName(srmd.getServiceRefName()); + usrmd.setServiceInterface(srmd.getServiceInterface()); + usrmd.setWsdlLocation(srmd.getWsdlURL()); + usrmd.setMappingLocation(udi.getMetaDataFileURL(srmd.getJaxrpcMappingFile())); + usrmd.setServiceQName(srmd.getServiceQName()); + + LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); + for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs()) + { + UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(); + upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); + upcmd.setPortComponentLink(pcmd.getPortComponentLink()); + upcmd.setCallProperties(pcmd.getCallProperties()); + pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd); + } + usrmd.setPortComponentRefs(pcrefs); + + ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); + for (HandlerMetaData hmd : srmd.getHandlers()) + { + UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null); + uhmd.setHandlerName(hmd.getHandlerName()); + uhmd.setHandlerClass(hmd.getHandlerClass()); + + for(String portname : hmd.getPortNames()) + { + uhmd.addPortName(portname); + } + for (InitParamMetaData ipmd : hmd.getInitParams()) + { + HandlerInitParam ip = new HandlerInitParam(); + ip.setParamName(ipmd.getParamName()); + ip.setParamValue(ipmd.getParamValue()); + uhmd.addInitParam(ip); + } + for (QName soapHeader : hmd.getSoapHeaders()) + { + uhmd.addSoapHeader(soapHeader); + } + for (String soapRole : hmd.getSoapRoles()) + { + uhmd.addSoapRole(soapRole); + } + handlers.add(uhmd); + } + usrmd.setHandlers(handlers); + + usrmd.setConfigName(srmd.getConfigName()); + usrmd.setConfigFile(srmd.getConfigFile()); + usrmd.setWsdlOverride(srmd.getWsdlOverride()); + usrmd.setCallProperties(srmd.getCallProperties()); + + return usrmd; + } +} Deleted: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-02-21 12:53:59 UTC (rev 2421) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-02-21 18:52:49 UTC (rev 2432) @@ -1,140 +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.ws.integration.jboss40; - -// $Id$ - -import java.net.URL; -import java.util.Iterator; - -import javax.naming.Context; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.xml.rpc.JAXRPCException; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.system.ServiceMBeanSupport; -import org.jboss.util.naming.Util; -import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.integration.jboss42.DeploymentInfoAdaptor; -import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; - -/** - * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the - * deployment descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class WebServiceClientDeployer extends ServiceMBeanSupport implements WebServiceClientDeployerMBean -{ - /** - * This binds a jaxrpc Service into the callers ENC for every service-ref element - * - * @param envCtx ENC to bind the javax.rpc.xml.Service object to - * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor - * @param di The client's deployment info - * @throws org.jboss.deployment.DeploymentException if it goes wrong - */ - public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException - { - try - { - while (serviceRefs.hasNext()) - { - ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); - String serviceRefName = serviceRef.getServiceRefName(); - - // Build the container independent deployment info - UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); - - UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); - - JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); - wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); - - Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); - wsServiceRef.setWsdlDefinition(wsdlDefinition); - - ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); - Util.bind(envCtx, serviceRefName, ref); - - log.debug("Webservice binding: java:comp/env/" + serviceRefName); - } - } - catch (Exception e) - { - throw new DeploymentException("Cannot bind webservice to client environment", e); - } - } - - private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) - { - JavaWsdlMapping javaWsdlMapping = null; - URL mappingURL = serviceRef.getMappingLocation(); - if (mappingURL != null) - { - try - { - // setup the XML binding Unmarshaller - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - javaWsdlMapping = mappingFactory.parse(mappingURL); - } - catch (Exception e) - { - throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); - } - } - return javaWsdlMapping; - } - - private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) - { - Definition wsdlDefinition = null; - { - URL wsdlOverride = serviceRef.getWsdlOverride(); - URL wsdlURL = serviceRef.getWsdlLocation(); - if (wsdlOverride == null && wsdlURL != null) - { - try - { - WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); - wsdlDefinition = factory.parse(wsdlURL); - } - catch (WSDLException e) - { - throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); - } - } - } - return wsdlDefinition; - } -} Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-02-21 18:52:49 UTC (rev 2432) @@ -0,0 +1,140 @@ +/* + * 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.ws.integration.jboss40; + +// $Id$ + +import java.net.URL; +import java.util.Iterator; + +import javax.naming.Context; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import javax.xml.rpc.JAXRPCException; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.system.ServiceMBeanSupport; +import org.jboss.util.naming.Util; +import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.jboss42.DeploymentInfoAdaptor; +import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; +import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; +import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; + +/** + * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the + * deployment descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class WebServiceClientDeployer extends ServiceMBeanSupport implements WebServiceClientDeployerMBean +{ + /** + * This binds a jaxrpc Service into the callers ENC for every service-ref element + * + * @param envCtx ENC to bind the javax.rpc.xml.Service object to + * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor + * @param di The client's deployment info + * @throws org.jboss.deployment.DeploymentException if it goes wrong + */ + public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException + { + try + { + while (serviceRefs.hasNext()) + { + ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); + String serviceRefName = serviceRef.getServiceRefName(); + + // Build the container independent deployment info + UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); + DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + + UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); + + JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); + wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); + + Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); + wsServiceRef.setWsdlDefinition(wsdlDefinition); + + ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); + Util.bind(envCtx, serviceRefName, ref); + + log.debug("Webservice binding: java:comp/env/" + serviceRefName); + } + } + catch (Exception e) + { + throw new DeploymentException("Cannot bind webservice to client environment", e); + } + } + + private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) + { + JavaWsdlMapping javaWsdlMapping = null; + URL mappingURL = serviceRef.getMappingLocation(); + if (mappingURL != null) + { + try + { + // setup the XML binding Unmarshaller + JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + javaWsdlMapping = mappingFactory.parse(mappingURL); + } + catch (Exception e) + { + throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); + } + } + return javaWsdlMapping; + } + + private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) + { + Definition wsdlDefinition = null; + { + URL wsdlOverride = serviceRef.getWsdlOverride(); + URL wsdlURL = serviceRef.getWsdlLocation(); + if (wsdlOverride == null && wsdlURL != null) + { + try + { + WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); + wsdlDefinition = factory.parse(wsdlURL); + } + catch (WSDLException e) + { + throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); + } + } + } + return wsdlDefinition; + } +} Deleted: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java 2007-02-21 12:53:59 UTC (rev 2421) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java 2007-02-21 18:52:49 UTC (rev 2432) @@ -1,38 +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.ws.integration.jboss40; - -import javax.management.ObjectName; - -import org.jboss.system.ServiceMBean; -import org.jboss.webservice.WebServiceClientDeployment; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface WebServiceClientDeployerMBean extends WebServiceClientDeployment, ServiceMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer"); -} Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java (from rev 2421, branches/jbossws-1.2.0/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployerMBean.java 2007-02-21 18:52:49 UTC (rev 2432) @@ -0,0 +1,38 @@ +/* +* 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.ws.integration.jboss40; + +import javax.management.ObjectName; + +import org.jboss.system.ServiceMBean; +import org.jboss.webservice.WebServiceClientDeployment; +import org.jboss.ws.core.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface WebServiceClientDeployerMBean extends WebServiceClientDeployment, ServiceMBean +{ + // default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer"); +} Modified: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-21 18:48:09 UTC (rev 2431) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-21 18:52:49 UTC (rev 2432) @@ -46,12 +46,6 @@ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property> </bean> -  -  <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar (from rev 2422, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.sar) Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF (from rev 2422, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.sar/META-INF) Deleted: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-02-21 12:59:06 UTC (rev 2422) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-02-21 18:52:49 UTC (rev 2432) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<server> - -  - <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss40.WebServiceClientDeployer"> - <depends>jboss:service=Naming</depends> - </mbean> - -  - <mbean name="jboss.ws:service=WebServiceDeployerJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> - <depends-list optional-attribute-name="Interceptables"> - <depends-list-element>jboss.web:service=WebServer</depends-list-element> - </depends-list> - </mbean> - -  - <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> - <depends-list optional-attribute-name="Interceptables"> - <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> - </depends-list> - </mbean> - -  - -  - <mbean name="jboss.ws:service=DeployerInterceptorNestedJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorNestedJSE"> - <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends> - <depends>jboss.ws:service=WebServiceDeployerJSE</depends> - </mbean> - -</server> Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml (from rev 2422, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-02-21 18:52:49 UTC (rev 2432) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<server> + +  + <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss40.WebServiceClientDeployer"> + <depends>jboss:service=Naming</depends> + </mbean> + +  + <mbean name="jboss.ws:service=WebServiceDeployerJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + +  + +  + <mbean name="jboss.ws:service=DeployerInterceptorNestedJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorNestedJSE"> + <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends> + <depends>jboss.ws:service=WebServiceDeployerJSE</depends> + </mbean> + +</server> Deleted: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-02-21 12:59:06 UTC (rev 2422) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-02-21 18:52:49 UTC (rev 2432) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<server> - -  - <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss40.WebServiceClientDeployer"> - <depends>jboss:service=Naming</depends> - </mbean> - -  - <mbean name="jboss.ws:service=WebServiceDeployerJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> - <depends-list optional-attribute-name="Interceptables"> - <depends-list-element>jboss.web:service=WebServer</depends-list-element> - </depends-list> - </mbean> - -  - <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> - <depends-list optional-attribute-name="Interceptables"> - <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> - </depends-list> - </mbean> - -  - <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3"> - <depends-list optional-attribute-name="Interceptables"> - <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> - </depends-list> - </mbean> - -  - <mbean name="jboss.ws:service=DeployerInterceptorNestedJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorNestedJSE"> - <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends> - <depends>jboss.ws:service=WebServiceDeployerJSE</depends> - </mbean> - -</server> Copied: tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml (from rev 2422, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-02-21 18:52:49 UTC (rev 2432) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<server> + +  + <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss40.WebServiceClientDeployer"> + <depends>jboss:service=Naming</depends> + </mbean> + +  + <mbean name="jboss.ws:service=WebServiceDeployerJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorNestedJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorNestedJSE"> + <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends> + <depends>jboss.ws:service=WebServiceDeployerJSE</depends> + </mbean> + +</server>

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2431 - in tags/jbossws-2.0.0.CR3/integration-jboss42/src/main: resources/jbossws.sar/META-INF and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 13:48:09 -0500 (Wed, 21 Feb 2007) New Revision: 2431 Added: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java Removed: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java Modified: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml Log: Merge 2421 from jbossws-1.2.0 (fixes 4.2 integration) Copied: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java (from rev 2421, branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java 2007-02-21 18:48:09 UTC (rev 2431) @@ -0,0 +1,139 @@ +/* + * 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.ws.integration.jboss42; + +// $Id$ + +import java.net.URL; +import java.util.Iterator; + +import javax.naming.Context; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import javax.xml.rpc.JAXRPCException; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.serviceref.ServiceRefMetaData; +import org.jboss.system.ServiceMBeanSupport; +import org.jboss.util.naming.Util; +import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; +import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; +import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; + +/** + * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the + * deployment descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class ServiceRefHandler extends ServiceMBeanSupport implements ServiceRefHandlerMBean +{ + /** + * This binds a jaxrpc Service into the callers ENC for every service-ref element + * + * @param envCtx ENC to bind the javax.rpc.xml.Service object to + * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor + * @param di The client's deployment info + * @throws org.jboss.deployment.DeploymentException if it goes wrong + */ + public void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException + { + try + { + while (serviceRefs.hasNext()) + { + ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); + String serviceRefName = serviceRef.getServiceRefName(); + + // Build the container independent deployment info + UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); + DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + + UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); + + JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); + wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); + + Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); + wsServiceRef.setWsdlDefinition(wsdlDefinition); + + ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); + Util.bind(envCtx, serviceRefName, ref); + + log.debug("Webservice binding: java:comp/env/" + serviceRefName); + } + } + catch (Exception e) + { + throw new DeploymentException("Cannot bind webservice to client environment", e); + } + } + + private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) + { + JavaWsdlMapping javaWsdlMapping = null; + URL mappingURL = serviceRef.getMappingLocation(); + if (mappingURL != null) + { + try + { + // setup the XML binding Unmarshaller + JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + javaWsdlMapping = mappingFactory.parse(mappingURL); + } + catch (Exception e) + { + throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); + } + } + return javaWsdlMapping; + } + + private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) + { + Definition wsdlDefinition = null; + { + URL wsdlOverride = serviceRef.getWsdlOverride(); + URL wsdlURL = serviceRef.getWsdlLocation(); + if (wsdlOverride == null && wsdlURL != null) + { + try + { + WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); + wsdlDefinition = factory.parse(wsdlURL); + } + catch (WSDLException e) + { + throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); + } + } + } + return wsdlDefinition; + } +} Copied: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java (from rev 2421, branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java) =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java (rev 0) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java 2007-02-21 18:48:09 UTC (rev 2431) @@ -0,0 +1,38 @@ +/* +* 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.ws.integration.jboss42; + +import javax.management.ObjectName; + +import org.jboss.system.ServiceMBean; +import org.jboss.metadata.serviceref.ServiceRefHandler; +import org.jboss.ws.core.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface ServiceRefHandlerMBean extends ServiceRefHandler, ServiceMBean +{ + // default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); +} Modified: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java 2007-02-21 18:28:03 UTC (rev 2430) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java 2007-02-21 18:48:09 UTC (rev 2431) @@ -29,10 +29,10 @@ import javax.xml.namespace.QName; -import org.jboss.webservice.metadata.serviceref.HandlerMetaData; -import org.jboss.webservice.metadata.serviceref.InitParamMetaData; -import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; -import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.metadata.serviceref.HandlerMetaData; +import org.jboss.metadata.serviceref.InitParamMetaData; +import org.jboss.metadata.serviceref.PortComponentRefMetaData; +import org.jboss.metadata.serviceref.ServiceRefMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; Deleted: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java 2007-02-21 18:28:03 UTC (rev 2430) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java 2007-02-21 18:48:09 UTC (rev 2431) @@ -1,139 +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.ws.integration.jboss42; - -// $Id$ - -import java.net.URL; -import java.util.Iterator; - -import javax.naming.Context; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.xml.rpc.JAXRPCException; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.system.ServiceMBeanSupport; -import org.jboss.util.naming.Util; -import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; - -/** - * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the - * deployment descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class WebServiceClientDeployer extends ServiceMBeanSupport implements WebServiceClientDeployerMBean -{ - /** - * This binds a jaxrpc Service into the callers ENC for every service-ref element - * - * @param envCtx ENC to bind the javax.rpc.xml.Service object to - * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor - * @param di The client's deployment info - * @throws org.jboss.deployment.DeploymentException if it goes wrong - */ - public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException - { - try - { - while (serviceRefs.hasNext()) - { - ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); - String serviceRefName = serviceRef.getServiceRefName(); - - // Build the container independent deployment info - UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); - - UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); - - JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); - wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); - - Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); - wsServiceRef.setWsdlDefinition(wsdlDefinition); - - ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); - Util.bind(envCtx, serviceRefName, ref); - - log.debug("Webservice binding: java:comp/env/" + serviceRefName); - } - } - catch (Exception e) - { - throw new DeploymentException("Cannot bind webservice to client environment", e); - } - } - - private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) - { - JavaWsdlMapping javaWsdlMapping = null; - URL mappingURL = serviceRef.getMappingLocation(); - if (mappingURL != null) - { - try - { - // setup the XML binding Unmarshaller - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - javaWsdlMapping = mappingFactory.parse(mappingURL); - } - catch (Exception e) - { - throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); - } - } - return javaWsdlMapping; - } - - private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) - { - Definition wsdlDefinition = null; - { - URL wsdlOverride = serviceRef.getWsdlOverride(); - URL wsdlURL = serviceRef.getWsdlLocation(); - if (wsdlOverride == null && wsdlURL != null) - { - try - { - WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); - wsdlDefinition = factory.parse(wsdlURL); - } - catch (WSDLException e) - { - throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); - } - } - } - return wsdlDefinition; - } -} Deleted: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java 2007-02-21 18:28:03 UTC (rev 2430) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java 2007-02-21 18:48:09 UTC (rev 2431) @@ -1,38 +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.ws.integration.jboss42; - -import javax.management.ObjectName; - -import org.jboss.system.ServiceMBean; -import org.jboss.webservice.WebServiceClientDeployment; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface WebServiceClientDeployerMBean extends WebServiceClientDeployment, ServiceMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer"); -} Modified: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-02-21 18:28:03 UTC (rev 2430) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service-no-ejb3.xml 2007-02-21 18:48:09 UTC (rev 2431) @@ -5,9 +5,9 @@ <server>  - <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss42.WebServiceClientDeployer"> + <mbean name="jboss.ws:service=ServiceRefHandler" code="org.jboss.ws.integration.jboss42.ServiceRefHandler"> <depends>jboss:service=Naming</depends> </mbean> Modified: tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml =================================================================== --- tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-02-21 18:28:03 UTC (rev 2430) +++ tags/jbossws-2.0.0.CR3/integration-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-02-21 18:48:09 UTC (rev 2431) @@ -5,9 +5,9 @@ <server>  - <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss42.WebServiceClientDeployer"> + <mbean name="jboss.ws:service=ServiceRefHandler" code="org.jboss.ws.integration.jboss42.ServiceRefHandler"> <depends>jboss:service=Naming</depends> </mbean>

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2430 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 13:28:03 -0500 (Wed, 21 Feb 2007) New Revision: 2430 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java Log: Merge correct fix for JBWS-1529 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:20:36 UTC (rev 2429) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:28:03 UTC (rev 2430) @@ -130,12 +130,13 @@ interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); + QName interfaceFaultRef = new QName(operation.getQName().getNamespaceURI(), fault.getXmlName().getLocalPart()); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(fault.getXmlName()); + outfault.setRef(interfaceFaultRef); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(fault.getXmlName()); + bindingFault.setRef(interfaceFaultRef); wsdlBinding.addFault(bindingFault); }

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2429 - branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-21 13:20:36 -0500 (Wed, 21 Feb 2007) New Revision: 2429 Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java Log: Refactor jaxws/complex test 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:07:32 UTC (rev 2428) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-02-21 18:20:36 UTC (rev 2429) @@ -53,7 +53,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, ""); //, "jaxws-jsr181-complex.war"); + return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, "jaxws-complex.war"); } protected void _setUp() throws Exception

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2428 - in branches/jbossws-1.2.0: integration-jboss42 and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-21 13:07:32 -0500 (Wed, 21 Feb 2007) New Revision: 2428 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl Removed: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/ Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml 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/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/JSR181ComplexTestCase.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/RegistrationServiceImpl.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/ObjectFactory.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/Statistics.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/package-info.java 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/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/WEB-INF/web.xml Log: Refactor jaxws/complex test Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -304,6 +304,12 @@  <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <delete file="${jboss40.home}/client/jbossws14-client.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -312,9 +318,11 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> +  <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> @@ -354,8 +362,13 @@  <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <delete file="${jboss40.home}/client/jbossws-client.jar"/> - <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -364,11 +377,8 @@ <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-client.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> </copy> + <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -157,6 +157,12 @@  <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws"> + <copy todir="${jboss42.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -164,9 +170,10 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -140,6 +140,12 @@  <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -147,9 +153,10 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> 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-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -64,6 +64,16 @@ </classes> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/complex/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -210,15 +220,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> - <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> -  <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex (from rev 2425, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex) Modified: 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/jsr181/complex/Address.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/AlreadyRegisteredFault.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/AlreadyRegisteredFault_Exception.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.ws.WebFault; @@ -51,7 +51,7 @@ /** * * @return - * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.AlreadyRegisteredFault + * returns fault bean: org.jboss.test.ws.jaxws.complex.AlreadyRegisteredFault */ public AlreadyRegisteredFault getFaultInfo() { return faultInfo; Modified: 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/jsr181/complex/BulkRegister.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: 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/jsr181/complex/BulkRegisterResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: 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/jsr181/complex/Customer.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: 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/jsr181/complex/GetStatistics.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/GetStatisticsResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,11 +1,11 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +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.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** Modified: 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/jsr181/complex/InvoiceCustomer.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; 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/jsr181/complex/JSR181ComplexTestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -19,7 +19,7 @@ * 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; +package org.jboss.test.ws.jaxws.complex; // $Id$ @@ -39,7 +39,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** * A complex JAX-WS test Modified: 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/jsr181/complex/Name.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/ObjectFactory.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; @@ -10,7 +10,7 @@ /** * 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. + * 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 @@ -37,7 +37,7 @@ 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 + * 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() { Modified: 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/jsr181/complex/PhoneNumber.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/Register.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/RegisterForInvoice.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/RegisterForInvoiceResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/RegisterResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/Registration.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.List; import javax.jws.WebMethod; @@ -9,7 +9,7 @@ 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; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** @@ -24,7 +24,7 @@ * JAX-WS Version: 2.0 * */ -@WebService(name = "Registration", targetNamespace = "http://org.jboss.ws/jaxws/complex") +@WebService(name = "Registration", targetNamespace = "http://types.complex.jaxws.ws.test.jboss.org") public interface Registration { @@ -38,8 +38,8 @@ * @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") + @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, @@ -59,8 +59,8 @@ * @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") + @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, @@ -79,8 +79,8 @@ * @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") + @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, @@ -102,8 +102,8 @@ * @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") + @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, Modified: 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/jsr181/complex/RegistrationFault.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: 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/jsr181/complex/RegistrationService.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.net.MalformedURLException; import java.net.URL; 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/jsr181/complex/RegistrationServiceImpl.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -19,7 +19,7 @@ * 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; +package org.jboss.test.ws.jaxws.complex; // $Id$ @@ -33,7 +33,7 @@ import javax.xml.ws.Holder; import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** * A mock registration service that exercises the use of complex types, arrays, inheritence, @@ -42,7 +42,7 @@ * @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") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.complex.Registration", name = "Registration", targetNamespace = "http://complex.jaxws.ws.test.jboss.org") public class RegistrationServiceImpl implements Registration { // Provide logging Modified: 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/jsr181/complex/ValidationFault.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: 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/jsr181/complex/ValidationFault_Exception.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.ws.WebFault; @@ -51,7 +51,7 @@ /** * * @return - * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.ValidationFault + * returns fault bean: org.jboss.test.ws.jaxws.complex.ValidationFault */ public ValidationFault getFaultInfo() { return faultInfo; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/ObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/ObjectFactory.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex.extra; +package org.jboss.test.ws.jaxws.complex.extra; import javax.xml.bind.annotation.XmlRegistry; @@ -7,7 +7,7 @@ /** * 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. + * generated in the org.jboss.test.ws.jaxws.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 @@ -23,7 +23,7 @@ /** - * 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 + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.complex.extra * */ public ObjectFactory() { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/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-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/Statistics.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex.extra; +package org.jboss.test.ws.jaxws.complex.extra; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/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 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/package-info.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,2 +1,2 @@ @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; +package org.jboss.test.ws.jaxws.complex.extra; Modified: 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/jsr181/complex/package-info.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,2 +1,2 @@ @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; +package org.jboss.test.ws.jaxws.complex; Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex (from rev 2425, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/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/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,327 +1,15 @@  -<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"> - - <jaxws:bindings> - <jaxws:package name="org.jboss.test.ws.jaxws.jsr181.complex"/> - </jaxws:bindings> - - <types> - <schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> - - <xsd:annotation> - <xsd:appinfo> - <jaxb:schemaBindings> - <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex"/> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"/> - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> - - <complexType name="AlreadyRegisteredFault"> - <complexContent> - <extension base="ns2:RegistrationFault"> - <sequence> - <element name="existingId" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="BulkRegister"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="ns2:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - - <complexType name="BulkRegisterResponse"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/> - <element maxOccurs="unbounded" minOccurs="0" name="result" type="long"/> - </sequence> - </complexType> - - <complexType name="GetStatistics"> - <sequence> - <element name="Customer" nillable="true" type="ns2:Customer"/> - </sequence> - </complexType> - - <complexType name="GetStatisticsResponse"> - <sequence> - <element name="Statistics" nillable="true" type="ns3:Statistics"/> - <element name="result" nillable="true" type="ns3:Statistics"/> - </sequence> - </complexType> - - <complexType name="Register"> - <sequence> - <element name="Customer" nillable="true" type="ns2:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - - <complexType name="RegisterForInvoice"> - <sequence> - <element name="InvoiceCustomer" nillable="true" type="ns2:InvoiceCustomer"/> - </sequence> - </complexType> - - <complexType name="RegisterForInvoiceResponse"> - <sequence> - <element name="done" type="boolean"/> - <element name="result" type="boolean"/> - </sequence> - </complexType> - - <complexType name="RegisterResponse"> - <sequence> - <element name="RegisteredID" type="long"/> - <element name="result" type="long"/> - </sequence> - </complexType> - - <complexType name="ValidationFault"> - <complexContent> - <extension base="ns2:RegistrationFault"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="failedCustomers" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="AlreadyRegisteredFault" type="tns:AlreadyRegisteredFault"/> - <element name="BulkRegister" type="tns:BulkRegister"/> - <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> - <element name="GetStatistics" type="tns:GetStatistics"/> - <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/> - <element name="Register" type="tns:Register"/> - <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> - <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> - <element name="RegisterResponse" type="tns:RegisterResponse"/> - <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" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> - - <xsd:annotation> - <xsd:appinfo> - <jaxb:schemaBindings> - <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex.extra"/> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> - - <complexType name="Statistics"> - <sequence> - <element name="activationTime" nillable="true" type="dateTime"/> - <element name="hits" type="long"/> - </sequence> - </complexType> - </schema> - - <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> - - <xsd:annotation> - <xsd:appinfo> - <jaxb:schemaBindings> - <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex"/> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"/> - - <complexType name="Address"> - <sequence> - <element name="city" nillable="true" type="string"/> - <element name="state" nillable="true" type="string"/> - <element name="street" nillable="true" type="string"/> - <element name="zip" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name="Customer"> - <sequence> - <element name="address" nillable="true" type="tns:Address"/> - <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> - <element name="id" type="long"/> - <element name="name" nillable="true" type="tns:Name"/> - <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> - </sequence> - </complexType> - - <complexType name="InvoiceCustomer"> - <complexContent> - <extension base="tns:Customer"> - <sequence> - <element name="cycleDay" type="int"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="Name"> - <sequence> - <element name="firstName" nillable="true" type="string"/> - <element name="lastName" nillable="true" type="string"/> - <element name="middleName" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name="PhoneNumber"> - <sequence> - <element name="areaCode" nillable="true" type="string"/> - <element name="exchange" nillable="true" type="string"/> - <element name="line" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name="RegistrationFault"> - <sequence> - <element name="message" nillable="true" type="string"/> - </sequence> - </complexType> - <element name="RegistrationFault" type="tns:RegistrationFault"/> - </schema> - </types> - - <message name="Registration_BulkRegister"> - <part element="tns:BulkRegister" name="parameters"/> - </message> - <message name="Registration_GetStatisticsResponse"> - <part element="tns:GetStatisticsResponse" name="result"/> - </message> - <message name="AlreadyRegisteredFault"> - <part element="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> - </message> - <message name="ValidationFault"> - <part element="tns:ValidationFault" name="ValidationFault"/> - </message> - <message name="Registration_RegisterForInvoice"> - <part element="tns:RegisterForInvoice" name="parameters"/> - </message> - <message name="Registration_RegisterResponse"> - <part element="tns:RegisterResponse" name="result"/> - </message> - <message name="Registration_RegisterForInvoiceResponse"> - <part element="tns:RegisterForInvoiceResponse" name="result"/> - </message> - <message name="Registration_BulkRegisterResponse"> - <part element="tns:BulkRegisterResponse" name="result"/> - </message> - <message name="Registration_GetStatistics"> - <part element="tns:GetStatistics" name="parameters"/> - </message> - <message name="Registration_Register"> - <part element="tns:Register" name="parameters"/> - </message> - <portType name="Registration"> - <operation name="BulkRegister"> - <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:Registration_GetStatistics"/> - <output message="tns:Registration_GetStatisticsResponse"/> - </operation> - <operation name="Register"> - <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:Registration_RegisterForInvoice"/> - <output message="tns:Registration_RegisterForInvoiceResponse"/> - <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> - <fault message="tns:ValidationFault" name="ValidationFault"/> - </operation> - </portType> - <binding name="RegistrationBinding" type="tns:Registration"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="BulkRegister"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="AlreadyRegisteredFault"> - <soap:fault name="AlreadyRegisteredFault" use="literal"/> - </fault> - <fault name="ValidationFault"> - <soap:fault name="ValidationFault" use="literal"/> - </fault> - </operation> - <operation name="GetStatistics"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="Register"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="AlreadyRegisteredFault"> - <soap:fault name="AlreadyRegisteredFault" use="literal"/> - </fault> - <fault name="ValidationFault"> - <soap:fault name="ValidationFault" use="literal"/> - </fault> - </operation> - <operation name="RegisterForInvoice"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="AlreadyRegisteredFault"> - <soap:fault name="AlreadyRegisteredFault" use="literal"/> - </fault> - <fault name="ValidationFault"> - <soap:fault name="ValidationFault" use="literal"/> - </fault> - </operation> - </binding> +<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"/> <service name="RegistrationService"> - <port binding="tns:RegistrationBinding" name="RegistrationPort"> - <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/Registration"/> + <port name="RegistrationPort" binding="ns1:RegistrationBinding"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService"/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Added: 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 (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2007-02-21 18:07:32 UTC (rev 2428) @@ -0,0 +1,249 @@ +<?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/"> + <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: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"/> + <xs:element name="GetStatistics" nillable="true" type="tns:GetStatistics"/> + <xs:element name="GetStatisticsResponse" nillable="true" type="tns:GetStatisticsResponse"/> + <xs:element name="Register" nillable="true" type="tns:Register"/> + <xs:element name="RegisterForInvoice" nillable="true" type="tns:RegisterForInvoice"/> + <xs:element name="RegisterForInvoiceResponse" nillable="true" type="tns:RegisterForInvoiceResponse"/> + <xs:element name="RegisterResponse" nillable="true" type="tns:RegisterResponse"/> + <xs:element name="ValidationFault" nillable="true" type="tns:ValidationFault"/> + <xs:complexType name="Register"> + <xs:sequence> + <xs:element name="Customer" nillable="true" type="ns1:Customer"/> + <xs:element name="When" nillable="true" type="xs:anySimpleType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegisterResponse"> + <xs:sequence> + <xs:element name="RegisteredID" type="xs:long"/> + <xs:element name="result" type="xs:long"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AlreadyRegisteredFault"> + <xs:complexContent> + <xs:extension base="ns1:RegistrationFault"> + <xs:sequence> + <xs:element name="existingId" type="xs:long"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="ValidationFault"> + <xs:complexContent> + <xs:extension base="ns1:RegistrationFault"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="failedCustomers" type="xs:long"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="GetStatistics"> + <xs:sequence> + <xs:element name="Customer" nillable="true" type="ns1:Customer"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="GetStatisticsResponse"> + <xs:sequence> + <xs:element name="Statistics" nillable="true" type="ns2:Statistics"/> + <xs:element name="result" nillable="true" type="ns2:Statistics"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="BulkRegister"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="ns1:Customer"/> + <xs:element name="When" nillable="true" type="xs:anySimpleType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="BulkRegisterResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="xs:long"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="result" type="xs:long"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegisterForInvoice"> + <xs:sequence> + <xs:element name="InvoiceCustomer" nillable="true" type="ns1:InvoiceCustomer"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegisterForInvoiceResponse"> + <xs:sequence> + <xs:element name="done" type="xs:boolean"/> + <xs:element name="result" type="xs:boolean"/> + </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:complexType name="Statistics"> + <xs:sequence> + <xs:element name="activationTime" nillable="true" type="xs:anySimpleType"/> + <xs:element name="hits" type="xs:long"/> + </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:complexType name="Customer"> + <xs:sequence> + <xs:element form="qualified" name="address" nillable="true" type="tns:Address"/> + <xs:element form="qualified" maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> + <xs:element form="qualified" name="id" type="xs:long"/> + <xs:element form="qualified" name="name" nillable="true" type="tns:Name"/> + <xs:element form="qualified" maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Address"> + <xs:sequence> + <xs:element form="qualified" name="city" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="state" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="street" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="zip" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="PhoneNumber"> + <xs:sequence> + <xs:element form="qualified" name="areaCode" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="exchange" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="line" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Name"> + <xs:sequence> + <xs:element form="qualified" name="firstName" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="lastName" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="middleName" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegistrationFault"> + <xs:sequence> + <xs:element form="qualified" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="InvoiceCustomer"> + <xs:complexContent> + <xs:extension base="tns:Customer"> + <xs:sequence> + <xs:element form="qualified" name="cycleDay" type="xs:int"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:schema> + </types> + <message name="Registration_RegisterForInvoiceResponse"> + <part name="RegisterForInvoiceResponse" element="ns1:RegisterForInvoiceResponse"/> + </message> + <message name="Registration_RegisterResponse"> + <part name="RegisterResponse" element="ns1:RegisterResponse"/> + </message> + <message name="Registration_GetStatistics"> + <part name="GetStatistics" element="ns1:GetStatistics"/> + </message> + <message name="Registration_BulkRegisterResponse"> + <part name="BulkRegisterResponse" element="ns1:BulkRegisterResponse"/> + </message> + <message name="Registration_BulkRegister"> + <part name="BulkRegister" element="ns1:BulkRegister"/> + </message> + <message name="AlreadyRegisteredFault"> + <part name="AlreadyRegisteredFault" element="ns1:AlreadyRegisteredFault"/> + </message> + <message name="Registration_RegisterForInvoice"> + <part name="RegisterForInvoice" element="ns1:RegisterForInvoice"/> + </message> + <message name="ValidationFault"> + <part name="ValidationFault" element="ns1:ValidationFault"/> + </message> + <message name="Registration_GetStatisticsResponse"> + <part name="GetStatisticsResponse" element="ns1:GetStatisticsResponse"/> + </message> + <message name="Registration_Register"> + <part name="Register" element="ns1:Register"/> + </message> + <portType name="Registration"> + <operation name="BulkRegister" parameterOrder="BulkRegister"> + <input message="ns1:Registration_BulkRegister"/> + <output message="ns1:Registration_BulkRegisterResponse"/> + <fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/> + <fault name="ValidationFault" message="ns1:ValidationFault"/> + </operation> + <operation name="GetStatistics" parameterOrder="GetStatistics"> + <input message="ns1:Registration_GetStatistics"/> + <output message="ns1:Registration_GetStatisticsResponse"/> + </operation> + <operation name="Register" parameterOrder="Register"> + <input message="ns1:Registration_Register"/> + <output message="ns1:Registration_RegisterResponse"/> + <fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/> + <fault name="ValidationFault" message="ns1:ValidationFault"/> + </operation> + <operation name="RegisterForInvoice" parameterOrder="RegisterForInvoice"> + <input message="ns1:Registration_RegisterForInvoice"/> + <output message="ns1:Registration_RegisterForInvoiceResponse"/> + <fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/> + <fault name="ValidationFault" message="ns1:ValidationFault"/> + </operation> + </portType> + <binding name="RegistrationBinding" type="ns1:Registration"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="BulkRegister"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> + </fault> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> + </fault> + </operation> + <operation name="GetStatistics"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + <operation name="Register"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> + </fault> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> + </fault> + </operation> + <operation name="RegisterForInvoice"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> + </fault> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> + </fault> + </operation> + </binding> +</definitions> Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/WEB-INF/web.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -7,7 +7,7 @@ <servlet> <servlet-name>RegistrationService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.complex.RegistrationServiceImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>RegistrationService</servlet-name>

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2427 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 13:03:24 -0500 (Wed, 21 Feb 2007) New Revision: 2427 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java Log: Merge correct fix for JBWS-1529 with no side effects Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:01:31 UTC (rev 2426) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:03:24 UTC (rev 2427) @@ -130,12 +130,13 @@ interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); + QName interfaceFaultRef = new QName(operation.getQName().getNamespaceURI(), fault.getXmlName().getLocalPart()); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(fault.getXmlName()); + outfault.setRef(interfaceFaultRef); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(fault.getXmlName()); + bindingFault.setRef(interfaceFaultRef); wsdlBinding.addFault(bindingFault); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 18:01:31 UTC (rev 2426) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 18:03:24 UTC (rev 2427) @@ -46,7 +46,6 @@ private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; private JBWS1529 proxy; -/* public static Test suite() { return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); @@ -63,7 +62,7 @@ Service service = Service.create(wsdlURL, serviceName); proxy = (JBWS1529)service.getPort(JBWS1529.class); } -*/ + public void testWSDLReader() throws Exception { File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); @@ -76,8 +75,7 @@ public void testEcho() throws Exception { - System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); - //String retStr = proxy.echo("hi there"); - //assertEquals("hi there", retStr); + String retStr = proxy.echo("hi there"); + assertEquals("hi there", retStr); } -} \ No newline at end of file +}

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2426 - in tags/jbossws-2.0.0.CR3: jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205 and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-21 13:01:31 -0500 (Wed, 21 Feb 2007) New Revision: 2426 Removed: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/resources/jaxrpc/samples-override/exception/META-INF/ Modified: tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java Log: Fix invalid release Modified: tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -130,12 +130,13 @@ interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); + QName interfaceFaultRef = new QName(operation.getQName().getNamespaceURI(), fault.getXmlName().getLocalPart()); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(fault.getXmlName()); + outfault.setRef(interfaceFaultRef); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(fault.getXmlName()); + bindingFault.setRef(interfaceFaultRef); wsdlBinding.addFault(bindingFault); } Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -61,6 +61,12 @@ public void testEndpoint() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } + port.performTest(); } } Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -76,6 +76,12 @@ public void testServletClient() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String retStr = br.readLine(); Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -48,6 +48,12 @@ */ public void testWebClient() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String res = br.readLine(); Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -46,7 +46,6 @@ private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; private JBWS1529 proxy; -/* public static Test suite() { return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); @@ -63,7 +62,7 @@ Service service = Service.create(wsdlURL, serviceName); proxy = (JBWS1529)service.getPort(JBWS1529.class); } -*/ + public void testWSDLReader() throws Exception { File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); @@ -76,8 +75,7 @@ public void testEcho() throws Exception { - System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); - //String retStr = proxy.echo("hi there"); - //assertEquals("hi there", retStr); + String retStr = proxy.echo("hi there"); + assertEquals("hi there", retStr); } -} \ No newline at end of file +}

17 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2007