Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 2554 invoked from network); 18 Apr 2007 18:06:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Apr 2007 18:06:40 -0000 Received: (qmail 45525 invoked by uid 500); 18 Apr 2007 18:06:46 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 45498 invoked by uid 500); 18 Apr 2007 18:06:46 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 45484 invoked by uid 99); 18 Apr 2007 18:06:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Apr 2007 11:06:46 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Apr 2007 11:06:37 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8587A1A983E; Wed, 18 Apr 2007 11:06:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r530109 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/service/model/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ rt/databinding/aegi... Date: Wed, 18 Apr 2007 18:06:14 -0000 To: cxf-commits@incubator.apache.org From: jliu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070418180617.8587A1A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jliu Date: Wed Apr 18 11:06:12 2007 New Revision: 530109 URL: http://svn.apache.org/viewvc?view=rev&rev=530109 Log: CXF-534. Fixed the bug that javatowsdl generates duplicate schemas for wrapped style. We query the SchemaInfo first for the wrapperBean type, and we create new schema for wrapperBean only if the schema does not contain wrapper bean type yet. Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_stock_bare.wsdl incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java (original) +++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Wed Apr 18 11:06:12 2007 @@ -19,9 +19,13 @@ package org.apache.cxf.service.model; +import javax.xml.namespace.QName; + import org.w3c.dom.Element; import org.apache.ws.commons.schema.XmlSchema; +import org.apache.ws.commons.schema.XmlSchemaElement; + public final class SchemaInfo extends AbstractPropertiesHolder { @@ -101,5 +105,24 @@ public void setSystemId(String systemId) { this.systemId = systemId; + } + + public XmlSchemaElement getElementByQName(QName qname) { +/* String uri = qname.getNamespaceURI(); + if (namespaceUri.equals(uri)) { + NodeList nodes = element.getElementsByTagName(qname.getLocalPart()); + for (int i = 0; i < nodes.getLength(); i++) { + if (nodes.item(i) instanceof Element) { + return (Element)nodes.item(i); + } + + } + } + return null;*/ + String uri = qname.getNamespaceURI(); + if (schema.getTargetNamespace().equals(uri)) { + return schema.getElementByName(qname); + } + return null; } } Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original) +++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Wed Apr 18 11:06:12 2007 @@ -55,6 +55,9 @@ import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.SchemaInfo; import org.apache.cxf.service.model.ServiceInfo; +import org.apache.ws.commons.schema.XmlSchema; +import org.apache.ws.commons.schema.XmlSchemaCollection; +import org.apache.ws.commons.schema.utils.NamespaceMap; import org.jdom.Attribute; import org.jdom.Document; import org.jdom.Element; @@ -147,7 +150,7 @@ List classes = (List)service.get(Aegis.OVERRIDE_TYPES_KEY); this.overrideTypes = classes; - + if (classes != null) { List types = new ArrayList(); for (Iterator it = classes.iterator(); it.hasNext();) { @@ -251,14 +254,25 @@ } try { + XmlSchemaCollection col = new XmlSchemaCollection(); + NamespaceMap nsMap = new NamespaceMap(); + nsMap.add("xsd", "http://www.w3.org/2001/XMLSchema"); + //For Aegis types, such as org.apache.cxf.aegis.type.basic.StringType + nsMap.add("ns1", "http://lang.java"); + col.setNamespaceContext(nsMap); + org.w3c.dom.Document schema = new DOMOutputter().output(new Document(e)); for (ServiceInfo si : service.getServiceInfos()) { SchemaInfo info = new SchemaInfo(si, entry.getKey()); info.setElement(schema.getDocumentElement()); + + XmlSchema xmlSchema = col.read(schema.getDocumentElement()); + info.setSchema(xmlSchema); + info.setSystemId(entry.getKey()); - + si.addSchema(info); } } catch (JDOMException e1) { Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java (original) +++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java Wed Apr 18 11:06:12 2007 @@ -64,7 +64,7 @@ + "xsd:element[@name='getSubmitBean']", doc); assertValid("//xsd:element[@name='getSubmitBean']/xsd:complexType/xsd:sequence" - + "/xsd:element[@name='bleh'][@type='xsd:string'][@nillable='true']", doc); + + "/xsd:element[@name='bleh'][@type='string'][@nillable='true']", doc); assertValid("//xsd:element[@name='getSubmitBean']/xsd:complexType/xsd:sequence" + "/xsd:element[@name='bean'][@type='SimpleBean'][@nillable='true']", doc); @@ -89,7 +89,7 @@ "/wsdl:definitions/wsdl:types" + "/xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']" + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element" - + "[@type=\"xsd:string\"]", + + "[@type=\"string\"]", doc); } Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original) +++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Wed Apr 18 11:06:12 2007 @@ -158,11 +158,11 @@ assertValid( "//xsd:complexType[@name='AnnotatedBean2']/xsd:sequence/xsd:element" - + "[@name='element'][@type='xsd:string']", + + "[@name='element'][@type='string']", wsdl); assertValid( "//xsd:complexType[@name='AnnotatedBean2']/xsd:attribute" - + "[@name='attribute'][@type='xsd:string']", + + "[@name='attribute'][@type='string']", wsdl); } Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java (original) +++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java Wed Apr 18 11:06:12 2007 @@ -18,6 +18,8 @@ */ package org.apache.cxf.aegis.type.java5; + + import org.w3c.dom.Document; import org.apache.cxf.aegis.AbstractAegisTest; @@ -37,15 +39,16 @@ Document wsdl = getWSDLDocument("DualOutService"); assertNotNull(wsdl); - + addNamespace("xsd", XmlConstants.XSD); + assertValid( "//xsd:element[@name='getValuesResponse']//xsd:element" - + "[@name='return'][@type='xsd:string']", + + "[@name='return'][@type='string']", wsdl); assertValid( "//xsd:element[@name='getValuesResponse']//xsd:element" - + "[@name='return1'][@type='xsd:string']", + + "[@name='return1'][@type='string']", wsdl); } } Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java (original) +++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java Wed Apr 18 11:06:12 2007 @@ -114,10 +114,10 @@ Document wsdl = getWSDLDocument("CurrencyService"); assertValid("//xsd:element[@name='inputCurrency'][@nillable='true']", wsdl); - assertValid("//xsd:simpleType[@name='Currency']/xsd:restriction[@base='xsd:string']", wsdl); - assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='USD']", wsdl); - assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='EURO']", wsdl); - assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='POUNDS']", wsdl); + assertValid("//xsd:simpleType[@name='Currency']/xsd:restriction[@base='string']", wsdl); + assertValid("//xsd:restriction[@base='string']/xsd:enumeration[@value='USD']", wsdl); + assertValid("//xsd:restriction[@base='string']/xsd:enumeration[@value='EURO']", wsdl); + assertValid("//xsd:restriction[@base='string']/xsd:enumeration[@value='POUNDS']", wsdl); } @Test Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original) +++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Wed Apr 18 11:06:12 2007 @@ -287,8 +287,9 @@ SchemaInfo schema = new SchemaInfo(serviceInfo, ns); schema.setElement(d.getDocumentElement()); schema.setSystemId(r.getSystemId()); + XmlSchema xmlSchema = col.read(d.getDocumentElement()); + schema.setSchema(xmlSchema); serviceInfo.addSchema(schema); - col.read(d.getDocumentElement()); } } catch (IOException e) { throw new ServiceConstructionException(new Message("SCHEMA_GEN_EXC", BUNDLE), e); Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Wed Apr 18 11:06:12 2007 @@ -36,6 +36,7 @@ import org.apache.cxf.service.model.InterfaceInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; +import org.apache.cxf.service.model.SchemaInfo; import org.apache.cxf.service.model.ServiceInfo; import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Test; @@ -182,12 +183,10 @@ OperationInfo greetMeOneWayOp = si.getInterface().getOperation(new QName(ns, "greetMeOneWay")); assertEquals(1, greetMeOneWayOp.getInput().getMessageParts().size()); - - //FIXME: CXF-533 - //Collection schemas = si.getSchemas(); - //assertEquals(2, schemas.size()); - assertNull(greetMeOneWayOp.getOutput()); + + Collection schemas = si.getSchemas(); + assertEquals(1, schemas.size()); } } Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Wed Apr 18 11:06:12 2007 @@ -336,7 +336,6 @@ op.setInput(uOp.getInputName(), msg); createInputWrappedMessageParts(uOp, m, msg); - //msg.addMessagePart(uOp.getInput().getName()); for (MessagePartInfo p : uOp.getInput().getMessageParts()) { p.setConcreteName(p.getName()); @@ -350,11 +349,7 @@ op.setOutput(uOp.getOutputName(), msg); createOutputWrappedMessageParts(uOp, m, msg); - /* - MessagePartInfo part = msg.addMessagePart(name); - part.setIndex(-1); - */ - + for (MessagePartInfo p : uOp.getOutput().getMessageParts()) { p.setConcreteName(p.getName()); } @@ -370,42 +365,92 @@ } protected void initializeWrappedSchema(ServiceInfo serviceInfo) { - XmlSchemaCollection col = new XmlSchemaCollection(); - XmlSchema schema = new XmlSchema(getServiceNamespace(), col); - schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED)); - serviceInfo.setXmlSchemaCollection(col); - - NamespaceMap nsMap = new NamespaceMap(); - nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD); - schema.setNamespaceContext(nsMap); - + for (OperationInfo op : serviceInfo.getInterface().getOperations()) { if (op.getUnwrappedOperation() != null) { if (op.hasInput()) { - createWrappedMessage(op.getInput(), op.getUnwrappedOperation().getInput(), schema); + QName wraperBeanName = op.getInput().getMessageParts().get(0).getElementQName(); + XmlSchemaElement e = null; + for (SchemaInfo s : serviceInfo.getSchemas()) { + e = s.getElementByQName(wraperBeanName); + if (e != null) { + break; + } + } + if (e == null) { + createWrappedSchema(serviceInfo, op.getInput(), + op.getUnwrappedOperation().getInput(), wraperBeanName); + } } if (op.hasOutput()) { - createWrappedMessage(op.getOutput(), op.getUnwrappedOperation().getOutput(), schema); + QName wraperBeanName = op.getOutput().getMessageParts().get(0).getElementQName(); + XmlSchemaElement e = null; + for (SchemaInfo s : serviceInfo.getSchemas()) { + e = s.getElementByQName(wraperBeanName); + if (e != null) { + break; + } + } + if (e == null) { + createWrappedSchema(serviceInfo, op.getOutput(), op.getUnwrappedOperation() + .getOutput(), wraperBeanName); + } } } } - - Document[] docs; - try { - docs = XmlSchemaSerializer.serializeSchema(schema, false); - } catch (XmlSchemaSerializerException e1) { - throw new ServiceConstructionException(e1); - } - Element e = docs[0].getDocumentElement(); - SchemaInfo schemaInfo = new SchemaInfo(serviceInfo, getServiceNamespace()); - schemaInfo.setElement(e); - schemaInfo.setSchema(schema); - serviceInfo.addSchema(schemaInfo); + } - private void createWrappedMessage(MessageInfo wrappedMessage, - MessageInfo unwrappedMessage, - XmlSchema schema) { + protected void createWrappedSchema(ServiceInfo serviceInfo, MessageInfo wrappedMessage, + MessageInfo unwrappedMessage, QName wraperBeanName) { + SchemaInfo schemaInfo = null; + for (SchemaInfo s : serviceInfo.getSchemas()) { + if (s.getNamespaceURI().equals(wraperBeanName.getNamespaceURI())) { + schemaInfo = s; + break; + } + } + + if (schemaInfo == null) { + XmlSchemaCollection col = new XmlSchemaCollection(); + XmlSchema schema = new XmlSchema(wraperBeanName.getNamespaceURI(), col); + schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED)); + serviceInfo.setXmlSchemaCollection(col); + + NamespaceMap nsMap = new NamespaceMap(); + nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD); + schema.setNamespaceContext(nsMap); + + createWrappedMessageSchema(wrappedMessage, unwrappedMessage, schema); + + Document[] docs; + try { + docs = XmlSchemaSerializer.serializeSchema(schema, false); + } catch (XmlSchemaSerializerException e1) { + throw new ServiceConstructionException(e1); + } + Element e = docs[0].getDocumentElement(); + schemaInfo = new SchemaInfo(serviceInfo, wraperBeanName.getNamespaceURI()); + schemaInfo.setElement(e); + schemaInfo.setSchema(schema); + serviceInfo.addSchema(schemaInfo); + } else { + XmlSchema schema = schemaInfo.getSchema(); + createWrappedMessageSchema(wrappedMessage, unwrappedMessage, schema); + + Document[] docs; + try { + docs = XmlSchemaSerializer.serializeSchema(schema, false); + } catch (XmlSchemaSerializerException e1) { + throw new ServiceConstructionException(e1); + } + Element e = docs[0].getDocumentElement(); + schemaInfo.setElement(e); + } + } + + private void createWrappedMessageSchema(MessageInfo wrappedMessage, MessageInfo unwrappedMessage, + XmlSchema schema) { XmlSchemaElement el = new XmlSchemaElement(); el.setQName(wrappedMessage.getName()); el.setName(wrappedMessage.getName().getLocalPart()); @@ -435,6 +480,7 @@ seq.getItems().add(el); } } + protected void createMessageParts(InterfaceInfo intf, OperationInfo op, Method method) { final Class[] paramClasses = method.getParameterTypes(); Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl Wed Apr 18 11:06:12 2007 @@ -1,3 +1,21 @@ + @@ -27,30 +45,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl Wed Apr 18 11:06:12 2007 @@ -1,3 +1,21 @@ + @@ -17,22 +35,6 @@ - - - - - - - - - - - - - - - - Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl Wed Apr 18 11:06:12 2007 @@ -1,4 +1,3 @@ - + @@ -66,51 +66,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_stock_bare.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_stock_bare.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_stock_bare.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_stock_bare.wsdl Wed Apr 18 11:06:12 2007 @@ -1,4 +1,3 @@ - + Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl Wed Apr 18 11:06:12 2007 @@ -1,4 +1,3 @@ - + Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl Wed Apr 18 11:06:12 2007 @@ -1,4 +1,3 @@ - + Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl?view=diff&rev=530109&r1=530108&r2=530109 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl Wed Apr 18 11:06:12 2007 @@ -1,4 +1,3 @@ - +