Author: darran.lofthouse(a)jboss.com Date: 2006-12-06 19:48:06 -0500 (Wed, 06 Dec 2006) New Revision: 1588 Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java Log: JBWS-1260 - Added code for handling attributes and first set of test cases Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -33,9 +33,12 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; +import org.apache.xerces.xs.XSAttributeDeclaration; +import org.apache.xerces.xs.XSAttributeUse; import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; +import org.apache.xerces.xs.XSObject; import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSSimpleTypeDefinition; @@ -236,6 +239,10 @@ throw new WSException("Tried to unwrap a non-complex type."); XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; + + if (wrapper.getAttributeUses().getLength() > 0) + return false; + XSParticle particle = wrapper.getParticle(); if (particle != null) { @@ -413,7 +420,7 @@ } else if (term instanceof XSElementDeclaration) { - if (i > 0) + if (buf.length() > 0) buf.append(", "); XSElementDeclaration element = (XSElementDeclaration)term; @@ -453,9 +460,12 @@ if (xt instanceof XSComplexTypeDefinition == false) return false; + StringBuilder tempBuf = new StringBuilder(); XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; + + appendParameters(tempBuf, wrapper.getAttributeUses()); + XSParticle particle = wrapper.getParticle(); - if (particle == null) return true; @@ -463,8 +473,6 @@ if (term instanceof XSModelGroup == false) return false; - StringBuilder tempBuf = new StringBuilder(); - if (unwrapGroup(tempBuf, containingElement, (XSModelGroup)term) == false) return false; @@ -476,6 +484,28 @@ return true; } + private void appendParameters(StringBuilder buf, XSObjectList attributes) throws IOException + { + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + + for (int i = 0; i < attributes.getLength(); i++) + { + XSObject object = attributes.item(i); + if (object instanceof XSAttributeUse) + { + if (buf.length() > 0) + buf.append(", "); + + XSAttributeUse attribute = (XSAttributeUse)object; + XSAttributeDeclaration declaration = attribute.getAttrDeclaration(); + XSTypeDefinition type = declaration.getTypeDefinition(); + QName xmlType = new QName(type.getNamespace(), type.getName()); + generateParameter(buf, null, "", xmlType, xsmodel, type, false, true); + buf.append(" ").append(getMethodParam(declaration.getName())); + } + } + } + private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, String containingElement, QName xmlType, XSTypeDefinition xt) throws IOException { JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); @@ -610,12 +640,9 @@ if (wt.unwrap()) { XSElementDeclaration element = wt.unwrapped; - // TODO DAL - Probably don't need this now. - //if (element != null) - //{ + xt = element.getTypeDefinition(); containingElement = containingElement + element.getName(); - //} } boolean primitive = true; Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -55,6 +55,13 @@ tests.add('J'); tests.add('K'); tests.add('L'); + tests.add('M'); + tests.add('N'); + tests.add('O'); + tests.add('P'); + tests.add('Q'); + tests.add('R'); + tests.add('S'); } /** @@ -307,6 +314,158 @@ generateScenario('L'); } + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single element and an attribute. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_M() throws Exception + { + generateScenario('M'); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains + * a single element and an attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * + */ + public void testScenario_N() throws Exception + { + generateScenario('N'); + } + + /** + * Test scenario where the element referenced as the message part + * references a complex type which contains an anonymous complex + * type which contains one element and one attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_O() throws Exception + { + generateScenario('O'); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single element which is an array and a single parameter. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_P() throws Exception + { + generateScenario('P'); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains a single + * element which is an array and a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * + */ + public void testScenario_Q() throws Exception + { + generateScenario('Q'); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains an anonymous + * complex type which contains a single element which is an array + * and a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_R() throws Exception + { + generateScenario('R'); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * an empty sequence and a single attribute. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_S() throws Exception + { + generateScenario('S'); + } + protected void generateScenario(final char scenario) throws Exception { if (tests.contains(scenario) == false) Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String postcode, java.lang.String surname) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <complexType> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + + <element name='lookupResponse'> + <complexType> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_M/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String postcode, java.lang.String surname) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_N/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='Name'> + <complexType> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='Number'> + <complexType> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_O/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String postcode, java.lang.String[] surname) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <complexType> + <sequence> + <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + + <element name='lookupResponse'> + <complexType> + <sequence> + <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_P/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String postcode, java.lang.String[] surname) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_Q/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='Name'> + <complexType> + <sequence> + <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='Number'> + <complexType> + <sequence> + <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_R/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String postcode) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/Wrapped.wsdl 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/Wrapped.wsdl 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <complexType> + <sequence> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + + <element name='lookupResponse'> + <complexType> + <sequence> + </sequence> + <attribute name='postcode' type='string'/> + </complexType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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 Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml 2006-12-07 00:41:57 UTC (rev 1587) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml 2006-12-07 00:48:06 UTC (rev 1588) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_S/Wrapped.wsdl" parameter-style="wrapped"> + <!--mapping file="wrapped-mapping.xml"/--> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF