You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jl...@apache.org on 2007/04/18 20:06:14 UTC
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...
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<Type> types = new ArrayList<Type>();
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<SchemaInfo> schemas = si.getSchemas();
- //assertEquals(2, schemas.size());
-
assertNull(greetMeOneWayOp.getOutput());
+
+ Collection<SchemaInfo> 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 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
@@ -27,30 +45,6 @@
</xs:complexType>
</xs:element>
</xs:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_soap12_http" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/hello_world_soap12_http">
-<xsd:element name="sayHi">
-<xsd:complexType>
-<xsd:sequence/>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="sayHiResponse">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="responseType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="pingMe">
-<xsd:complexType>
-<xsd:sequence/>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="pingMeResponse">
-<xsd:complexType>
-<xsd:sequence/>
-</xsd:complexType>
-</xsd:element>
-</xsd:schema>
</wsdl:types>
<wsdl:message name="sayHi">
<wsdl:part name="sayHi" element="ns2:sayHi">
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 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="GreeterAsyncService" targetNamespace="http://apache.org/hello_world_async_soap_http" xmlns:ns1="http://apache.org/hello_world_async_soap_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_async_soap_http/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
@@ -17,22 +35,6 @@
</xs:complexType>
</xs:element>
</xs:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_async_soap_http" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/hello_world_async_soap_http">
-<xsd:element name="greetMeSometime">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="requestType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="greetMeSometimeResponse">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="responseType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-</xsd:schema>
</wsdl:types>
<wsdl:message name="greetMeSometime">
<wsdl:part name="greetMeSometime" element="ns2:greetMeSometime">
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_doc_lit" xmlns:ns1="http://apache.org/hello_world_doc_lit" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_doc_lit/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_doc_lit/types" version="1.0">
@@ -66,51 +66,6 @@
</xs:complexType>
</xs:element>
</xs:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_doc_lit" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/hello_world_doc_lit">
-<xsd:element name="greetMe">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="requestType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="greetMeResponse">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="responseType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="greetMeOneWay">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="requestType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="sayHi">
-<xsd:complexType>
-<xsd:sequence/>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="sayHiResponse">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element name="responseType" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="pingMe">
-<xsd:complexType>
-<xsd:sequence/>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="pingMeResponse">
-<xsd:complexType>
-<xsd:sequence/>
-</xsd:complexType>
-</xsd:element>
-</xsd:schema>
</wsdl:types>
<wsdl:message name="sayHiResponse">
<wsdl:part name="sayHiResponse" element="ns2:sayHiResponse">
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="StockService" targetNamespace="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:message name="getPriceResponse">
<wsdl:part name="return" type="xsd:float">
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="HeaderTesterService" targetNamespace="http://apache.org/samples/headers" xmlns:ns1="http://apache.org/samples/headers" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/samples/headers" targetNamespace="http://apache.org/samples/headers" version="1.0">
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="StockService" targetNamespace="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:message name="getPrice">
<wsdl:part name="arg0" type="xsd:string">
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="StockService" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">