JBossWS SVN: r3287 - trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-29 10:57:05 -0400 (Tue, 29 May 2007)
New Revision: 3287
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
Log:
Revert thomas changes (xop transitions)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-05-29 14:56:43 UTC (rev 3286)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-05-29 14:57:05 UTC (rev 3287)
@@ -76,16 +76,16 @@
public static final QName GENERIC_PARAM_NAME = new QName("genericParam");
public static final QName GENERIC_RETURN_NAME = new QName("genericReturn");
-
+
// The associated parameter
private ParameterMetaData paramMetaData;
- // SOAP content
+
+ // content soapContent
private SOAPContent soapContent;
- // While transitioning DOM expansion
- private boolean lockDOMExpansion;
- // While transitioning MTOM expansion
- private boolean lockMTOMTransition;
+ // while transitioning DOM expansion needs to be locked
+ private boolean lockDOMExpansion = false;
+
/** Construct a SOAPContentElement
*/
public SOAPContentElement(Name name)
@@ -144,13 +144,13 @@
}
}
- /** Get the payload as source.
+ /** Get the payload as source.
*/
public Source getPayload()
{
if (soapContent.getState() == State.OBJECT_VALID)
transitionTo(State.DOM_VALID);
-
+
return soapContent.getPayload();
}
@@ -498,10 +498,7 @@
private void expandToDOM()
{
if (!lockDOMExpansion)
- {
- handleMTOMTransitions();
transitionTo(State.DOM_VALID);
- }
}
public void setValue(String value)
@@ -524,9 +521,7 @@
// END Node interface ***********************************************************************************************
public void writeElement(Writer writer) throws IOException
- {
- handleMTOMTransitions();
-
+ {
if (soapContent instanceof DOMContent)
{
new DOMWriter(writer).print(this);
@@ -556,45 +551,37 @@
// JMS transport hot fix. Can be removed once we got a immutabe object model
if (MessageContextAssociation.peekMessageContext() == null)
return;
-
+
// MTOM processing is only required on XOP parameters
- if (lockMTOMTransition || !isXOPParameter())
+ if (!isXOPParameter())
return;
- try
+ boolean domContentState = (soapContent instanceof DOMContent);
+
+ if (!XOPContext.isMTOMEnabled())
{
- lockMTOMTransition = true;
- boolean domContentState = (soapContent instanceof DOMContent);
+ // If MTOM is disabled, we force dom expansion on XOP parameters.
+ // This will inline any XOP include element and remove the attachment part.
+ // See SOAPFactoryImpl for details.
- if (!XOPContext.isMTOMEnabled())
- {
- // If MTOM is disabled, we force dom expansion on XOP parameters.
- // This will inline any XOP include element and remove the attachment part.
- // See SOAPFactoryImpl for details.
+ log.debug("MTOM disabled: Force inline XOP data");
- log.debug("MTOM disabled: Force inline XOP data");
+ // TODO: This property must be reset, otherwise you negate its purpose
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE);
+ if (msgContext instanceof MessageContextJAXWS)
+ ((MessageContextJAXWS)msgContext).setScope(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Scope.APPLICATION);
- // TODO: This property must be reset, otherwise you negate its purpose
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE);
- if (msgContext instanceof MessageContextJAXWS)
- ((MessageContextJAXWS)msgContext).setScope(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Scope.APPLICATION);
-
- expandToDOM();
- }
- else if (domContentState && XOPContext.isMTOMEnabled())
- {
- // When the DOM representation is valid,
- // but MTOM is enabled we need to convert the inlined
- // element back to an xop:Include element and create the attachment part
-
- log.debug("MTOM enabled: Restore XOP data");
- XOPContext.restoreXOPDataDOM(this);
- }
+ expandToDOM();
}
- finally
+ else if (domContentState && XOPContext.isMTOMEnabled())
{
- lockMTOMTransition = false;
+ // When the DOM representation is valid,
+ // but MTOM is enabled we need to convert the inlined
+ // element back to an xop:Include element and create the attachment part
+
+ log.debug("MTOM enabled: Restore XOP data");
+ XOPContext.restoreXOPDataDOM(this);
}
}
16 years, 11 months
- 1
- 0
JBossWS SVN: r3286 - trunk/jbossws-core/src/main/java/javax/xml/ws.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-29 10:56:43 -0400 (Tue, 29 May 2007)
New Revision: 3286
Modified:
trunk/jbossws-core/src/main/java/javax/xml/ws/Service.java
Log:
Fix typo
Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/Service.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/ws/Service.java 2007-05-29 14:55:55 UTC (rev 3285)
+++ trunk/jbossws-core/src/main/java/javax/xml/ws/Service.java 2007-05-29 14:56:43 UTC (rev 3286)
@@ -710,7 +710,7 @@
* The specified WSDL document location and service qualified name MUST
* uniquely identify a <code>wsdl:service</code> element.
*
- * @param wsdlDocumentLocation URL for the WSDL document location
+ * @param wsdlLocation URL for the WSDL document location
* for the service
* @param serviceName QName for the service
* @throws WebServiceException If any error in creation of the
16 years, 11 months
- 1
- 0
JBossWS SVN: r3285 - in branches/dlofthouse/JBWS-1597/jbossws-tests/src: resources/tools/jbws1597 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-29 10:55:55 -0400 (Tue, 29 May 2007)
New Revision: 3285
Added:
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
Log:
Doc/Lit INOUT example
Modified: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 14:46:34 UTC (rev 3284)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 14:55:55 UTC (rev 3285)
@@ -47,6 +47,11 @@
generateScenario("doclit_out");
}
+ public void testGenerateDocLitInOut() throws Exception
+ {
+ generateScenario("doclit_inout");
+ }
+
protected void generateScenario(final String scenario) throws Exception
{
String resourceDir = "resources/tools/jbws1597/" + scenario;
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+ public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+ public BillingAccountHolder()
+ {
+ this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+ }
+
+ public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+ {
+ this.value = value;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1597'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='BillingAccount'>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ <part element='ns1:billingAccount' name='header'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ <part element='ns1:billingAccount' name='header'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters' />
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </input>
+ <output>
+ <soap:body use='literal' parts='result' />
+ <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1597</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1597</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2007-05-29 14:55:55 UTC (rev 3285)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
- 1
- 0
JBossWS SVN: r3284 - in trunk: integration/sunri/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-29 10:46:34 -0400 (Tue, 29 May 2007)
New Revision: 3284
Modified:
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
Log:
Fix classpath issues
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-05-29 14:43:37 UTC (rev 3283)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-05-29 14:46:34 UTC (rev 3284)
@@ -40,6 +40,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/thirdparty/policy.jar"/>
</path>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-29 14:43:37 UTC (rev 3283)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-29 14:46:34 UTC (rev 3284)
@@ -50,6 +50,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
</path>
</target>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-29 14:43:37 UTC (rev 3283)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-29 14:46:34 UTC (rev 3284)
@@ -70,6 +70,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
</path>
</target>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-29 14:43:37 UTC (rev 3283)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-29 14:46:34 UTC (rev 3284)
@@ -27,7 +27,6 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
@@ -36,6 +35,7 @@
</path>
<path id="tests.extra.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
<pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/>
16 years, 11 months
- 1
- 0
JBossWS SVN: r3283 - in branches/dlofthouse/JBWS-1597: jbossws-core/src/java/org/jboss/ws/tools and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-29 10:43:37 -0400 (Tue, 29 May 2007)
New Revision: 3283
Added:
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
Log:
Doc/Lit Out header test and implementation.
Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-05-29 14:35:48 UTC (rev 3282)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -189,6 +189,11 @@
WSDLInterfaceOperationOutput opOutput = (WSDLInterfaceOperationOutput)outputs.get(qname);
return opOutput;
}
+
+ public void removeOutput(QName element)
+ {
+ outputs.remove(element);
+ }
public WSDLInterfaceOperationOutput getOutputByPartName(String partName)
{
Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 14:35:48 UTC (rev 3282)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -25,7 +25,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -46,11 +45,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.core.utils.JavaUtils;
-import org.jboss.ws.metadata.wsdl.WSDLBinding;
-import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
-import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput;
-import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLException;
import org.jboss.ws.metadata.wsdl.WSDLInterface;
@@ -418,22 +413,36 @@
for (WSDLSOAPHeader currentInput : inputHeaders)
{
boolean holder = HeaderUtil.containsMatchingPart(outputHeaders, currentInput);
- QName elementName = currentInput.getElement();
+ appendHeaderParameter(buf, currentInput, holder);
+ }
- JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
- XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
- XSTypeDefinition xt = xe.getTypeDefinition();
- QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ for (WSDLSOAPHeader currentOutput : outputHeaders)
+ {
+ boolean input = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput);
- if (buf.length() > 0)
- {
- buf.append(", ");
- }
+ if (input == true)
+ continue;
- generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder);
- buf.append(" ").append(currentInput.getPartName());
+ appendHeaderParameter(buf, currentOutput, true);
}
+ }
+ private void appendHeaderParameter(StringBuilder buf, WSDLSOAPHeader header, boolean holder) throws IOException
+ {
+ QName elementName = header.getElement();
+
+ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
+ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+ XSTypeDefinition xt = xe.getTypeDefinition();
+ QName xmlType = new QName(xt.getNamespace(), xt.getName());
+
+ if (buf.length() > 0)
+ {
+ buf.append(", ");
+ }
+
+ generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder);
+ buf.append(" ").append(header.getPartName());
}
private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException
Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 14:35:48 UTC (rev 3282)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -347,20 +347,56 @@
for (WSDLSOAPHeader currentInput : inputHeaders)
{
- QName elementName = currentInput.getElement();
+ boolean inOutput = HeaderUtil.containsMatchingPart(outputHeaders, currentInput);
+ String mode = getMode(true, inOutput);
- JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
- XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
- XSTypeDefinition xt = xe.getTypeDefinition();
- QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ constructHeaderParameter(semm, currentInput, paramPosition++, wsdlMessageName, mode);
+ }
- String partName = currentInput.getPartName();
+ for (WSDLSOAPHeader currentOutput : outputHeaders)
+ {
+ boolean inInput = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput);
- MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition++, wsdlMessageName, "IN", partName, false, true);
- semm.addMethodParamPartsMapping(mpin);
+ if (inInput == true)
+ continue;
+
+ constructHeaderParameter(semm, currentOutput, paramPosition++, wsdlMessageName, "OUT");
}
}
+ private void constructHeaderParameter(ServiceEndpointMethodMapping semm, WSDLSOAPHeader header, int paramPosition, String wsdlMessageName, String mode)
+ {
+ QName elementName = header.getElement();
+
+ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+ XSTypeDefinition xt = xe.getTypeDefinition();
+ QName xmlType = new QName(xt.getNamespace(), xt.getName());
+
+ String partName = header.getPartName();
+
+ MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
+ semm.addMethodParamPartsMapping(mpin);
+ }
+
+ private String getMode(final boolean input, final boolean output)
+ {
+ if (input == true & output == true)
+ {
+ return "INOUT";
+ }
+ else if (input == true)
+ {
+ return "IN";
+ }
+ else if (output == true)
+ {
+ return "OUT";
+ }
+
+ return "";
+ }
+
private String getMode(WSDLInterfaceOperation op, String name)
{
WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op);
@@ -827,10 +863,8 @@
if (javaType == null)
{
- if (log.isDebugEnabled())
- log.debug("Typemapping lookup failed for " + xmlName);
- if (log.isDebugEnabled())
- log.debug("Falling back to identifier generation");
+ log.debug("Typemapping lookup failed for " + xmlName);
+ log.debug("Falling back to identifier generation");
String className = xmlType.getLocalPart();
if (className.charAt(0) == '>')
className = className.substring(1);
Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-29 14:35:48 UTC (rev 3282)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -1105,7 +1105,7 @@
{
WSDLInterfaceOperationOutput destIntfOutput = destIntfOperation.getOutput(element);
if (destIntfOutput != null)
- destIntfOperation.removeInput(element);
+ destIntfOperation.removeOutput(element);
}
public void removeRPCPart(String partName)
Modified: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 14:35:48 UTC (rev 3282)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -42,6 +42,11 @@
generateScenario("doclit_in");
}
+ public void testGenerateDocLitOut() throws Exception
+ {
+ generateScenario("doclit_out");
+ }
+
protected void generateScenario(final String scenario) throws Exception
{
String resourceDir = "resources/tools/jbws1597/" + scenario;
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+ public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+ public BillingAccountHolder()
+ {
+ this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+ }
+
+ public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+ {
+ this.value = value;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1597'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='BillingAccount'>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ <part element='ns1:billingAccount' name='header'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal' parts='result' />
+ <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1597</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1597</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</wsdl-message-part-name>
+ <parameter-mode>OUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-05-29 14:43:37 UTC (rev 3283)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
- 1
- 0
JBossWS SVN: r3282 - in trunk: build/ant-import and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-29 10:35:48 -0400 (Tue, 29 May 2007)
New Revision: 3282
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/build/version.properties
trunk/integration/spi/.classpath
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/version.properties
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java
Log:
Fix classpath issues
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/build/ant-import/build-testsuite.xml 2007-05-29 14:35:48 UTC (rev 3282)
@@ -87,7 +87,6 @@
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
- <pathelement location="${jboss.client}/jbossws-spi.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
@@ -125,7 +124,6 @@
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
- <pathelement location="${jboss.client}/jbossws-spi.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/build/version.properties 2007-05-29 14:35:48 UTC (rev 3282)
@@ -14,6 +14,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
+apache-ant=1.6.5
dom4j=1.6.1
jboss-common-core=2.0.2.GA
jboss-common-logging-log4j=2.0.2.GA
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/integration/spi/.classpath 2007-05-29 14:35:48 UTC (rev 3282)
@@ -19,5 +19,7 @@
<classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="thirdparty/getopt.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-29 14:35:48 UTC (rev 3282)
@@ -39,6 +39,7 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/jbossws-core/.classpath 2007-05-29 14:35:48 UTC (rev 3282)
@@ -34,5 +34,7 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-29 14:35:48 UTC (rev 3282)
@@ -27,6 +27,7 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
@@ -72,20 +73,20 @@
<target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts">
- <!-- Define the JAX-WS wsconsume task -->
- <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.wsconsume">
- <classpath refid="ws.stack.classpath"/>
- <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.wsconsume">
+ <classpath refid="ws.stack.classpath"/>
+ <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
- <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
- <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
- <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
- <classpath location="${core.dir}/thirdparty/wstx.jar"/>
- </taskdef>
+ <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
+ <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
+ <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
+ <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
+ <classpath location="${core.dir}/thirdparty/wstx.jar"/>
+ </taskdef>
<wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
<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" verbose="false"/>
@@ -93,8 +94,8 @@
<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" verbose="false"/>
<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" verbose="false"/>
<wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
<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" verbose="false"/>
</target>
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/jbossws-core/version.properties 2007-05-29 14:35:48 UTC (rev 3282)
@@ -9,7 +9,6 @@
jbpm-bpel=1.1.0.Beta5
# Thirdparty library versions
-apache-ant=1.6.5
apache-collections=3.1
apache-log4j=1.2.8
apache-logging=1.1.0.jboss
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -1,13 +1,14 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ws.WSException;
import javax.jws.WebService;
import javax.jws.WebMethod;
import javax.ejb.Stateless;
import javax.activation.DataHandler;
import javax.xml.bind.annotation.XmlAttachmentRef;
+import javax.xml.ws.WebServiceException;
+
import java.io.IOException;
import java.rmi.RemoteException;
@@ -26,7 +27,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
@@ -36,14 +37,14 @@
{
try
{
- if(null == payload) throw new WSException("Payload was null");
+ if(null == payload) throw new WebServiceException("Payload was null");
System.out.println("Got " + payload.getData().getContent());
DataHandler dataHandler = new DataHandler("Server data", "text/plain");
return new DocumentPayloadWithoutRef(dataHandler);
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -1,11 +1,11 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ws.WSException;
import javax.ejb.Stateless;
import javax.jws.WebService;
import javax.jws.WebMethod;
+import javax.xml.ws.WebServiceException;
import javax.activation.DataHandler;
import java.rmi.RemoteException;
import java.io.IOException;
@@ -26,7 +26,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
@@ -42,7 +42,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -1,13 +1,14 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ws.WSException;
import javax.activation.DataHandler;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.ejb.Stateless;
import javax.xml.bind.annotation.XmlAttachmentRef;
+import javax.xml.ws.WebServiceException;
+
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -69,7 +70,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.xop.doclit;
-import org.jboss.ws.WSException;
-
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceException;
import javax.activation.DataHandler;
import java.io.IOException;
@@ -48,7 +47,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
}
16 years, 11 months
- 1
- 0
JBossWS SVN: r3281 - in branches/dlofthouse/JBWS-1597: jbossws-core/src/java/org/jboss/ws/tools/helpers and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-29 09:31:56 -0400 (Tue, 29 May 2007)
New Revision: 3281
Added:
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml
Removed:
branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl
branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
Doc/Lit Input header test case and implementation.
Added: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.tools;
+
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.ws.metadata.wsdl.WSDLBinding;
+import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLInterface;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation;
+import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
+
+/**
+ * Collection of static methods required for processing
+ * bound headers in WSDL to Java so they can be re-used for
+ * the JAX-RPC generation.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 29 May 2007
+ */
+public class HeaderUtil
+{
+
+ public static WSDLBindingOperation getWSDLBindingOperation(final WSDLDefinitions wsdl, final WSDLInterfaceOperation operation)
+ {
+ WSDLBindingOperation bindingOperation = null;
+
+ WSDLInterface wsdlInterface = operation.getWsdlInterface();
+ QName operationName = operation.getName();
+
+ WSDLBinding binding = wsdl.getBindingByInterfaceName(wsdlInterface.getName());
+ bindingOperation = binding.getOperationByRef(operationName);
+
+ return bindingOperation;
+ }
+
+ public static WSDLSOAPHeader[] getSignatureHeaders(final WSDLBindingMessageReference[] refs)
+ {
+ ArrayList<WSDLSOAPHeader> headers = new ArrayList<WSDLSOAPHeader>();
+
+ if (refs != null)
+ {
+ for (WSDLBindingMessageReference current : refs)
+ {
+ for (WSDLSOAPHeader header : current.getSoapHeaders())
+ {
+ if (header.isIncludeInSignature())
+ {
+ headers.add(header);
+ }
+ }
+ }
+ }
+
+ return headers.toArray(new WSDLSOAPHeader[headers.size()]);
+ }
+
+ public static boolean containsMatchingPart(WSDLSOAPHeader[] headers, WSDLSOAPHeader header)
+ {
+ for (WSDLSOAPHeader current : headers)
+ {
+ if (current.getPartName().equals(header.getPartName()))
+ {
+ if (current.getElement().equals(header.getElement()))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 13:30:34 UTC (rev 3280)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -25,6 +25,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -45,6 +46,11 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.core.utils.JavaUtils;
+import org.jboss.ws.metadata.wsdl.WSDLBinding;
+import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLException;
import org.jboss.ws.metadata.wsdl.WSDLInterface;
@@ -54,6 +60,7 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault;
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
+import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
@@ -195,7 +202,7 @@
public void setNamespacePackageMap(Map<String, String> map)
{
//Lets convert the package->namespace map to namespace->package map
- Set keys = map.keySet();
+ Set<String> keys = map.keySet();
Iterator<String> iter = keys.iterator();
while (iter != null && iter.hasNext())
{
@@ -271,10 +278,12 @@
throw new IllegalArgumentException("Interface " + itfname + " doesn't have operations");
int len = ops != null ? ops.length : 0;
- // FIXME - Add support for headers
for (int i = 0; i < len; i++)
{
WSDLInterfaceOperation op = ops[i];
+
+ WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdl, op);
+
//TODO: Take care of multiple outputs
String returnType = null;
@@ -284,7 +293,7 @@
WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(op);
if (isDocument())
{
- returnType = appendDocParameters(paramBuffer, input, output);
+ returnType = appendDocParameters(paramBuffer, input, output, bindingOperation);
}
else
{
@@ -369,7 +378,8 @@
return returnType;
}
- private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output) throws IOException
+ private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output,
+ WSDLBindingOperation bindingOperation) throws IOException
{
String returnType = null;
boolean holder = false;
@@ -391,9 +401,41 @@
returnType = getReturnType(xmlName, xmlType, xt);
}
+ if (bindingOperation != null)
+ {
+ appendHeaderParameters(paramBuffer, bindingOperation);
+ }
+
return returnType;
}
+ private void appendHeaderParameters(StringBuilder buf, WSDLBindingOperation bindingOperation) throws IOException
+ {
+ WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs());
+ WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs());
+
+ // Process Inputs First
+ for (WSDLSOAPHeader currentInput : inputHeaders)
+ {
+ boolean holder = HeaderUtil.containsMatchingPart(outputHeaders, currentInput);
+ QName elementName = currentInput.getElement();
+
+ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
+ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+ XSTypeDefinition xt = xe.getTypeDefinition();
+ QName xmlType = new QName(xt.getNamespace(), xt.getName());
+
+ if (buf.length() > 0)
+ {
+ buf.append(", ");
+ }
+
+ generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder);
+ buf.append(" ").append(currentInput.getPartName());
+ }
+
+ }
+
private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException
{
@@ -778,4 +820,5 @@
{
this.parameterStyle = paramStyle;
}
+
}
Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 13:30:34 UTC (rev 3280)
+++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -59,6 +59,7 @@
import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLInterface;
@@ -69,11 +70,13 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLProperty;
import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
+import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
+import org.jboss.ws.tools.HeaderUtil;
import org.jboss.ws.tools.RPCSignature;
import org.jboss.ws.tools.ToolsUtils;
import org.jboss.ws.tools.WSToolsConstants;
@@ -216,15 +219,22 @@
semm.setWsdlOperation(opname);
semm.setWrappedElement(isWrapped());
+ WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, wiop);
+
if (isDocStyle())
- constructDOCParameters(semm, wiop);
- else constructRPCParameters(semm, wiop);
+ {
+ constructDOCParameters(semm, wiop, bindingOperation);
+ }
+ else
+ {
+ constructRPCParameters(semm, wiop);
+ }
seim.addServiceEndpointMethodMapping(semm);
}
}
- private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop)
+ private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation)
{
WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop);
WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop);
@@ -301,26 +311,56 @@
}
}
- //Check it is a holder. If it is, return
- if (wiop.getInputByPartName(xmlName.getLocalPart()) != null)
- return;
+ //Check it is a holder.
+ if (wiop.getInputByPartName(xmlName.getLocalPart()) == null)
+ {
- if (xt instanceof XSSimpleTypeDefinition)
- xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+ if (xt instanceof XSSimpleTypeDefinition)
+ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
- String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
+ String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
- if (isDocStyle() == false && "void".equals(javaType))
- return;
+ if ((isDocStyle() == false && "void".equals(javaType)) == false)
+ {
+ WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm);
+ wrvm.setMethodReturnValue(javaType);
+ wrvm.setWsdlMessage(messageName);
+ wrvm.setWsdlMessagePartName(partName);
+ semm.setWsdlReturnValueMapping(wrvm);
+ }
+ }
+ }
- WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm);
- wrvm.setMethodReturnValue(javaType);
- wrvm.setWsdlMessage(messageName);
- wrvm.setWsdlMessagePartName(partName);
- semm.setWsdlReturnValueMapping(wrvm);
+ if (bindingOperation != null)
+ {
+ constructHeaderParameters(semm, wiop, bindingOperation);
}
}
+ private void constructHeaderParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation)
+ {
+ WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs());
+ WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs());
+
+ String wsdlMessageName = bindingOperation.getWsdlBinding().getInterface().getName().getLocalPart();
+ int paramPosition = 1;
+
+ for (WSDLSOAPHeader currentInput : inputHeaders)
+ {
+ QName elementName = currentInput.getElement();
+
+ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+ XSTypeDefinition xt = xe.getTypeDefinition();
+ QName xmlType = new QName(xt.getNamespace(), xt.getName());
+
+ String partName = currentInput.getPartName();
+
+ MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition++, wsdlMessageName, "IN", partName, false, true);
+ semm.addMethodParamPartsMapping(mpin);
+ }
+ }
+
private String getMode(WSDLInterfaceOperation op, String name)
{
WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op);
@@ -447,10 +487,32 @@
jwm.addExceptionMappings(exceptionMapping);
}
}
+
+ WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, op);
+ if (bindingOperation != null)
+ {
+ constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getInputs()));
+ constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs()));
+ }
+
}//end for
}
}
+ public void constructHeaderJavaXmlTypeMapping(JavaWsdlMapping jwm, WSDLSOAPHeader[] headers)
+ {
+ for (WSDLSOAPHeader current : headers)
+ {
+ QName elementName = current.getElement();
+
+ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+ XSTypeDefinition xt = xe.getTypeDefinition();
+
+ addJavaXMLTypeMap(xt, elementName.getLocalPart(), "", "", jwm, true);
+ }
+ }
+
private boolean unwrapRequest(ServiceEndpointMethodMapping methodMapping, String messageName, String containingElement, XSTypeDefinition xt)
{
if (xt instanceof XSComplexTypeDefinition == false)
@@ -761,7 +823,7 @@
*/
if (xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) && "anyType".equals(xmlType.getLocalPart()) && javaType == Element.class)
javaType = SOAPElement.class;
- javaType = this.makeCustomDecisions(javaType, xmlName, xmlType);
+ javaType = this.makeCustomDecisions(javaType, xmlType);
if (javaType == null)
{
@@ -833,7 +895,7 @@
* @param xmlName
* @param xmlType
*/
- private Class makeCustomDecisions(Class javaType, QName xmlName, QName xmlType)
+ private Class makeCustomDecisions(Class javaType, QName xmlType)
{
if (javaType != null && xmlType != null)
{
Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597 (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597)
Deleted: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-07 21:42:10 UTC (rev 2997)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1597;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Apr 2007
- */
-public class JBWS1597TestCase extends JBossWSTest
-{
-
- public void testGenerateDocLitIn() throws Exception
- {
- generateScenario("doclit_in");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1597/" + scenario;
- String toolsDir = "tools/jbws1597/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java)
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1597;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Apr 2007
+ */
+public class JBWS1597TestCase extends JBossWSTest
+{
+
+ public void testGenerateDocLitIn() throws Exception
+ {
+ generateScenario("doclit_in");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1597/" + scenario;
+ String toolsDir = "tools/jbws1597/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597 (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597)
Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in)
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-07 21:42:10 UTC (rev 2997)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-29 13:31:56 UTC (rev 3281)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1597'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1597/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1597'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1597/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='BillingAccount'>
- <sequence>
- <element name='sortCode' nillable='true' type='string'/>
- <element name='accountNumber' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
- <element name='billingAccount' type='tns:BillingAccount'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- <part element='ns1:billingAccount' name='header'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal' parts='parameters'/>
- <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl)
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1597'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1597/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='BillingAccount'>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ <part element='ns1:billingAccount' name='header'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccount header) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1597</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1597</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-07 21:42:10 UTC (rev 2997)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-29 13:31:56 UTC (rev 3281)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml)
===================================================================
--- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-29 13:31:56 UTC (rev 3281)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
16 years, 11 months
- 1
- 0
JBossWS SVN: r3280 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-29 09:30:34 -0400 (Tue, 29 May 2007)
New Revision: 3280
Added:
branches/dlofthouse/JBWS-1597/
Log:
Recreate.
Copied: branches/dlofthouse/JBWS-1597 (from rev 3279, branches/jbossws-2.0)
16 years, 11 months
- 1
- 0
JBossWS SVN: r3279 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-29 09:29:59 -0400 (Tue, 29 May 2007)
New Revision: 3279
Removed:
branches/dlofthouse/JBWS-1597/
Log:
Recreate.
16 years, 11 months
- 1
- 0
JBossWS SVN: r3278 - in trunk: testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-29 08:45:59 -0400 (Tue, 29 May 2007)
New Revision: 3278
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml
Log:
Fix handlerlifecycle and mtom tests
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-05-29 10:29:48 UTC (rev 3277)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-05-29 12:45:59 UTC (rev 3278)
@@ -103,7 +103,13 @@
</webinf>
</war>
- <!-- jaxws-handlerscope -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar">
+ <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF">
+ <include name="*.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-handlerscope -->
<war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
Modified: trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-05-29 10:29:48 UTC (rev 3277)
+++ trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-05-29 12:45:59 UTC (rev 3278)
@@ -1,17 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
- <servlet>
- <servlet-name>MTOMService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>MTOMService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
+ <servlet>
+ <servlet-name>MTOMService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>WrappedService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>MTOMService</servlet-name>
+ <url-pattern>/bare</url-pattern>
+ </servlet-mapping>
+
+
+ <servlet-mapping>
+ <servlet-name>WrappedService</servlet-name>
+ <url-pattern>/wrapped</url-pattern>
+ </servlet-mapping>
</web-app>
16 years, 11 months
- 1
- 0