cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r534599 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/service/model/ rt/bindings/http/src/main/java/org/apache/cxf/binding/http/ rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ rt/bindings/soap/src/main...
Date Wed, 02 May 2007 19:34:36 GMT
Author: dkulp
Date: Wed May  2 12:34:34 2007
New Revision: 534599

URL: http://svn.apache.org/viewvc?view=rev&rev=534599
Log:
Bunch more Java -> WSDL updates and fixes

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/MessageInfo.java
    incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
    incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.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/CollectionTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.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/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
    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/expected/my_hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.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_holder.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java Wed May  2 12:34:34 2007
@@ -29,8 +29,8 @@
 
 
 public abstract class AbstractMessageContainer extends AbstractPropertiesHolder {
+    protected QName mName;
     private OperationInfo operation;
-    private QName mName;
     private Map<QName, MessagePartInfo> messageParts 
         = new LinkedHashMap<QName, MessagePartInfo>(4);
     

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/MessageInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/MessageInfo.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/MessageInfo.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/MessageInfo.java Wed May  2 12:34:34 2007
@@ -34,6 +34,10 @@
         super(op, nm);
     }
     
+    public void setName(QName qn) {
+        mName = qn;
+    }
+    
     public Map<QName, MessagePartInfo> getMessagePartsMap() {
         Map<QName, MessagePartInfo> partsMap = new HashMap<QName, MessagePartInfo>();
         for (MessagePartInfo part : getMessageParts()) {

Modified: incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java Wed May  2 12:34:34 2007
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.xml.XMLConstants;
@@ -34,9 +35,11 @@
 
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaType;
 
 /**
  * @author <a href=""mailto:gnodet [at] gmail.com">Guillaume Nodet</a>
@@ -166,6 +169,16 @@
         }
     }
 
+    private static XmlSchemaType findSchemaType(Collection<SchemaInfo> schemas,
+                                         QName name) {
+        for (SchemaInfo inf : schemas) {
+            if (inf.getNamespaceURI().equals(name.getNamespaceURI())) {
+                return inf.getSchema().getTypeByName(name);
+            }
+        }
+        return null;
+    }
+    
     /**
      * Create a dom document conformant with the given schema element with the
      * input parameters.
@@ -174,9 +187,14 @@
      * @param params
      * @return
      */
-    public static Document buildDocument(XmlSchemaElement element, List<Param> params) {
+    public static Document buildDocument(XmlSchemaElement element,
+                                         Collection<SchemaInfo> schemas,
+                                         List<Param> params) {
         Document doc = DOMUtils.createDocument();
         XmlSchemaComplexType cplxType = (XmlSchemaComplexType)element.getSchemaType();
+        if (cplxType == null) {
+            cplxType = (XmlSchemaComplexType)findSchemaType(schemas, element.getSchemaTypeName());
+        }
         XmlSchemaSequence seq = (XmlSchemaSequence)cplxType.getParticle();
         Element e = doc.createElementNS(element.getQName().getNamespaceURI(), element.getQName()
             .getLocalPart());
@@ -210,8 +228,14 @@
         return doc;
     }
     
-    public static Document interopolateParams(Document doc, XmlSchemaElement element, List<Param> params) {
+    public static Document interopolateParams(Document doc,
+                                              XmlSchemaElement element,
+                                              Collection<SchemaInfo> schemas,
+                                              List<Param> params) {
         XmlSchemaComplexType cplxType = (XmlSchemaComplexType)element.getSchemaType();
+        if (cplxType == null) {
+            cplxType = (XmlSchemaComplexType)findSchemaType(schemas, element.getSchemaTypeName());
+        }
         XmlSchemaSequence seq = (XmlSchemaSequence)cplxType.getParticle();
         Element root = doc.getDocumentElement();
         if (root == null) {

Modified: incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java Wed May  2 12:34:34 2007
@@ -19,6 +19,7 @@
 package org.apache.cxf.binding.http.interceptor;
 
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -45,6 +46,7 @@
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
+import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 
@@ -108,6 +110,8 @@
         // TODO: If its a POST/PUT operation we probably need to merge the
         // incoming doc
         Document doc;
+        Collection<SchemaInfo> schemas = part.getMessageInfo().getOperation()
+            .getInterface().getService().getSchemas();
         if ("POST".equals(method) || "PUT".equals(method)) {
             XMLInputFactory inputFactory = StaxInInterceptor.getXMLInputFactory(message);
             try {
@@ -117,9 +121,14 @@
             } catch (XMLStreamException e) {
                 throw new Fault(e);
             }
-            doc = IriDecoderHelper.interopolateParams(doc, (XmlSchemaElement)part.getXmlSchema(), params);
+            doc = IriDecoderHelper.interopolateParams(doc, 
+                                                      (XmlSchemaElement)part.getXmlSchema(),
+                                                      schemas,
+                                                      params);
         } else {
-            doc = IriDecoderHelper.buildDocument((XmlSchemaElement)part.getXmlSchema(), params);
+            doc = IriDecoderHelper.buildDocument((XmlSchemaElement)part.getXmlSchema(),
+                                                 schemas,
+                                                 params);
         }
 
         XMLStreamReader reader = StaxUtils.createXMLStreamReader(new DOMSource(doc));

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Wed May  2 12:34:34 2007
@@ -136,17 +136,19 @@
                     List<String> bodyParts = new ArrayList<String>();
                     SoapHeaderInfo headerInfo = b.getInput().getExtensor(SoapHeaderInfo.class);
                     if (headerInfo != null) {
+                        for (MessagePartInfo part : b.getInput().getMessageParts()) {
+                            bodyParts.add(part.getName().getLocalPart());
+                        }
+                        
                         SoapHeader soapHeader = SOAPBindingUtil.createSoapHeader(extensionRegistry,
                                                                                  BindingInput.class,
                                                                                  isSoap12);
                         soapHeader.setMessage(b.getInput().getMessageInfo().getName());
                         soapHeader.setPart(headerInfo.getPart().getName().getLocalPart());
                         soapHeader.setUse("literal");
+                        bodyParts.remove(headerInfo.getPart().getName().getLocalPart());
                         b.getInput().addExtensor(soapHeader);
 
-                        for (MessagePartInfo part : b.getInput().getMessageParts()) {
-                            bodyParts.add(part.getName().getLocalPart());
-                        }
                     } 
                     SoapBody body = SOAPBindingUtil.createSoapBody(extensionRegistry,
                                                                    BindingInput.class,
@@ -167,17 +169,18 @@
                     List<String> bodyParts = new ArrayList<String>();
                     SoapHeaderInfo headerInfo = b.getOutput().getExtensor(SoapHeaderInfo.class);
                     if (headerInfo != null) {
+                        for (MessagePartInfo part : b.getOutput().getMessageParts()) {
+                            bodyParts.add(part.getName().getLocalPart());
+                        }
                         SoapHeader soapHeader = SOAPBindingUtil.createSoapHeader(extensionRegistry,
                                                                                  BindingOutput.class,
                                                                                  isSoap12);
                         soapHeader.setMessage(b.getOutput().getMessageInfo().getName());
                         soapHeader.setPart(headerInfo.getPart().getName().getLocalPart());
                         soapHeader.setUse("literal");
+                        bodyParts.remove(headerInfo.getPart().getName().getLocalPart());
                         b.getOutput().addExtensor(soapHeader);
 
-                        for (MessagePartInfo part : b.getOutput().getMessageParts()) {
-                            bodyParts.add(part.getName().getLocalPart());
-                        }
                     }
                     SoapBody body = SOAPBindingUtil.createSoapBody(extensionRegistry,
                                                                    BindingOutput.class,

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -63,9 +63,9 @@
         assertValid("//xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']/"
                     + "xsd:element[@name='getSubmitBean']",
                     doc);
-        assertValid("//xsd:element[@name='getSubmitBean']/xsd:complexType/xsd:sequence"
+        assertValid("//xsd:complexType[@name='getSubmitBean']/xsd:sequence"
                     + "/xsd:element[@name='bleh'][@type='string'][@minOccurs='0']", doc);
-        assertValid("//xsd:element[@name='getSubmitBean']/xsd:complexType/xsd:sequence"
+        assertValid("//xsd:complexType[@name='getSubmitBean']/xsd:sequence"
                     + "/xsd:element[@name='bean'][@type='SimpleBean'][@minOccurs='0']", doc);
 
         assertValid("/wsdl:definitions/wsdl:types"

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java Wed May  2 12:34:34 2007
@@ -185,8 +185,8 @@
         Document doc = getWSDLDocument("CollectionService");
         // printNode(doc);
         assertValid(
-                    "//xsd:element[@name='getUnannotatedStringsResponse']"
-                    + "/xsd:complexType/xsd:sequence/xsd:element[@type='ArrayOfString']",
+                    "//xsd:complexType[@name='getUnannotatedStringsResponse']"
+                    + "/xsd:sequence/xsd:element[@type='ArrayOfString']",
                     doc);
     }
 

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -43,11 +43,11 @@
         addNamespace("xsd", XmlConstants.XSD);
  
         assertValid(
-                    "//xsd:element[@name='getValuesResponse']//xsd:element"
+                    "//xsd:complexType[@name='getValuesResponse']//xsd:element"
                     + "[@name='return'][@type='string']",
                     wsdl);
         assertValid(
-                    "//xsd:element[@name='getValuesResponse']//xsd:element"
+                    "//xsd:complexType[@name='getValuesResponse']//xsd:element"
                     + "[@name='return1'][@type='string']",
                     wsdl);
     }

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Wed May  2 12:34:34 2007
@@ -32,6 +32,7 @@
 
 import org.apache.cxf.service.ServiceModelVisitor;
 import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.model.FaultInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
@@ -64,6 +65,7 @@
     public void begin(MessagePartInfo part) {
         // Check to see if the WSDL information has been filled in for us.
         if (part.getTypeQName() != null || part.getElementQName() != null) {
+            checkForExistence(part);
             return;
         }
         
@@ -78,7 +80,6 @@
         }
 
         JaxBeanInfo<?> beanInfo = context.getBeanInfo(clazz);
-        
         if (beanInfo == null) {
             if (Exception.class.isAssignableFrom(clazz)) {
                 QName name = part.getMessageInfo().getName();
@@ -111,12 +112,92 @@
             part.setXmlSchema(schemas.getTypeByQName(typeName));
         }
     } 
+    public void checkForExistence(MessagePartInfo part) {
+        QName qn = part.getElementQName();
+        if (qn != null) {
+            XmlSchemaElement el = schemas.getElementByQName(qn);
+            if (el == null) {
+                Class<?> clazz = part.getTypeClass();
+                if (clazz == null) {
+                    return;
+                }
+
+                boolean isFromWrapper = part.getMessageInfo().getOperation().isUnwrapped();
+                if (isFromWrapper && clazz.isArray() && !Byte.TYPE.equals(clazz.getComponentType())) {
+                    clazz = clazz.getComponentType();
+                }
+                JaxBeanInfo<?> beanInfo = context.getBeanInfo(clazz);
+                if (beanInfo == null) {
+                    return;
+                }
+                Iterator<QName> itr = beanInfo.getTypeNames().iterator();
+                if (!itr.hasNext()) {
+                    return;
+                }
+                QName typeName = itr.next();
+
+                SchemaInfo schemaInfo = null;
+                for (SchemaInfo s : serviceInfo.getSchemas()) {
+                    if (s.getNamespaceURI().equals(qn.getNamespaceURI())) {
+                        schemaInfo = s;
+
+                        el = new XmlSchemaElement();
+                        el.setQName(part.getElementQName());
+                        el.setName(part.getElementQName().getLocalPart());
+                        el.setNillable(true);
+                        schemaInfo.getSchema().getItems().add(el);
+                        
+                        el.setSchemaTypeName(typeName);
+                        return;
+                    }
+                }
+            }
+        }
+        
+        
+    }
+    
+    public void end(FaultInfo fault) {
+        MessagePartInfo part = fault.getMessageParts().get(0); 
+        Class<?> cls = part.getTypeClass();
+        Class<?> cl2 = (Class)fault.getProperty(Class.class.getName());
+        if (cls != cl2) {
+            QName name = part.getMessageInfo().getName();
+            part.setElementQName(name);
+            
+            JaxBeanInfo<?> beanInfo = context.getBeanInfo(cls);
+
+
+            SchemaInfo schemaInfo = null;
+            for (SchemaInfo s : serviceInfo.getSchemas()) {
+                if (s.getNamespaceURI().equals(part.getElementQName().getNamespaceURI())) {
+                    schemaInfo = s;
+
+                    XmlSchemaElement el = new XmlSchemaElement();
+                    el.setQName(part.getElementQName());
+                    el.setName(part.getElementQName().getLocalPart());
+                    el.setNillable(true);
+                    schemaInfo.getSchema().getItems().add(el);
+                    
+                    Iterator<QName> itr = beanInfo.getTypeNames().iterator();
+                    if (!itr.hasNext()) {
+                        continue;
+                    }
+                    QName typeName = itr.next();
+                    el.setSchemaTypeName(typeName);
+
+                    return;
+                }
+            }
+        }
+    }
+
     
     private void buildExceptionType(MessagePartInfo part, Class cls) {
         SchemaInfo schemaInfo = null;
         for (SchemaInfo s : serviceInfo.getSchemas()) {
             if (s.getNamespaceURI().equals(part.getElementQName().getNamespaceURI())) {
-                schemaInfo = s;
+                schemaInfo = s;                
                 break;
             }
         }
@@ -143,7 +224,10 @@
         schema.getItems().add(el);
         
         XmlSchemaComplexType ct = new XmlSchemaComplexType(schema);
-        el.setSchemaType(ct);
+        ct.setName(part.getElementQName().getLocalPart());
+        schema.getItems().add(ct);
+        schema.addType(ct);
+        el.setSchemaTypeName(part.getElementQName());
         
         XmlSchemaSequence seq = new XmlSchemaSequence();
         ct.setParticle(seq);

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Wed May  2 12:34:34 2007
@@ -123,6 +123,7 @@
 
     @Override
     public Boolean isOperation(Method method) {
+        Method origMethod = method;
         method = getDeclaredMethod(method);
         if (method.getReturnType().equals(Future.class)
             || method.getReturnType().equals(Response.class)) {
@@ -138,6 +139,10 @@
                     return Boolean.TRUE;
                 }
             } else {
+                if (method.getDeclaringClass().isInterface()) {
+                    return hasWebServiceAnnotation(method) 
+                        ||  hasWebServiceAnnotation(origMethod);
+                }
                 return hasWebServiceAnnotation(method);              
             }
         }
@@ -522,6 +527,7 @@
     
     @Override 
     public Boolean hasOutMessage(Method method) {
+        method = getDeclaredMethod(method);
         return !method.isAnnotationPresent(Oneway.class);
     }
     

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Wed May  2 12:34:34 2007
@@ -189,7 +189,7 @@
             super.initializeWSDLOperations();
         }
     }
-    
+
  
     protected void initializeWSDLOperationsForProvider() {
         Type[] genericInterfaces = getServiceClass().getGenericInterfaces();

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Wed May  2 12:34:34 2007
@@ -88,12 +88,12 @@
         assertValid("//wsdl:port/wsdlsoap:address[@location='" + address + "']", wsdl);
         assertValid("//wsdl:portType[@name='Hello']", wsdl);
         assertValid("/wsdl:definitions/wsdl:message[@name='sayHi']"
-                    + "/wsdl:part[@element='ns1:sayHi'][@name='sayHi']",
+                    + "/wsdl:part[@element='ns1:sayHi'][@name='parameters']",
                     wsdl);
         assertValid("/wsdl:definitions/wsdl:message[@name='sayHiResponse']"
-                    + "/wsdl:part[@element='ns1:sayHiResponse'][@name='sayHiResponse']",
+                    + "/wsdl:part[@element='ns1:sayHiResponse'][@name='parameters']",
                     wsdl);
-        assertValid("//xsd:element[@name='sayHi']/xsd:complexType"
+        assertValid("//xsd:complexType[@name='sayHi']"
                     + "/xsd:sequence/xsd:element[@name='arg0']",
                     wsdl);
     }

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -175,7 +175,7 @@
         assertEquals("greetMeResponse", greetMeOp.getOutput().getName().getLocalPart());
         
         MessagePartInfo outMessagePart = messageParts.get(0);
-        assertEquals("greetMeResponse", outMessagePart.getName().getLocalPart());
+        assertEquals("parameters", outMessagePart.getName().getLocalPart());
         assertEquals("http://apache.org/hello_world_doc_lit", outMessagePart.getName().getNamespaceURI());
         assertEquals("http://apache.org/hello_world_doc_lit/types", outMessagePart.getElementQName()
             .getNamespaceURI());

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -219,19 +219,9 @@
         
         getDataBinding().initialize(service);
         
-        boolean overLoaded = containsOverloadedMethod();
         boolean isWrapped = isWrapped();
-        if (isWrapped && !overLoaded) {
+        if (isWrapped) {
             initializeWrappedSchema(serviceInfo);
-        }  else if (isWrapped && overLoaded) {
-            if (wrappedStyle != null && wrappedStyle) {
-                throw new ServiceConstructionException(new Message("COULD_NOT_SET_WRAPPER_STYLE", 
-                                                                   BUNDLE, serviceClass.getName()));
-            }
-            if (wrappedStyle == null) {
-                setWrapped(false);
-            }
-            
         }
 
         for (OperationInfo opInfo : serviceInfo.getInterface().getOperations()) {
@@ -248,20 +238,6 @@
         }
     }
     
-    private boolean containsOverloadedMethod() {
-        Method[] methods = serviceClass.getDeclaredMethods();
-        List<String> methodList = new ArrayList<String>();
-        for (int i = 0; i < methods.length; i++) {
-            String name = methods[i].getName();
-            if (!methodList.contains(name)) {
-                methodList.add(name);
-            } else if (!name.endsWith("Async")) {               
-                return true;
-            }
-            
-        }
-        return false;
-    }
     
     protected void initializeServiceModel() {
         String wsdlurl = getWsdlURL();
@@ -470,7 +446,7 @@
             nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD);
             schema.setNamespaceContext(nsMap);
 
-            createWrappedMessageSchema(wrappedMessage, unwrappedMessage, schema);
+            createWrappedMessageSchema(wrappedMessage, unwrappedMessage, schema, wraperBeanName);
 
             Document[] docs;
             try {
@@ -485,7 +461,7 @@
             serviceInfo.addSchema(schemaInfo);
         } else {
             XmlSchema schema = schemaInfo.getSchema();
-            createWrappedMessageSchema(wrappedMessage, unwrappedMessage, schema);
+            createWrappedMessageSchema(wrappedMessage, unwrappedMessage, schema, wraperBeanName);
 
             Document[] docs;
             try {
@@ -594,44 +570,50 @@
 
     private void createWrappedMessageSchema(AbstractMessageContainer wrappedMessage,
                                             AbstractMessageContainer unwrappedMessage,
-                                            XmlSchema schema) {
+                                            XmlSchema schema, 
+                                            QName wrapperName) {
         XmlSchemaElement el = new XmlSchemaElement();
-        el.setQName(wrappedMessage.getName());
-        el.setName(wrappedMessage.getName().getLocalPart());
+        el.setQName(wrapperName);
+        el.setName(wrapperName.getLocalPart());
         schema.getItems().add(el);
         
         wrappedMessage.getMessageParts().get(0).setXmlSchema(el);
         
         XmlSchemaComplexType ct = new XmlSchemaComplexType(schema);
-        el.setSchemaType(ct);
+        ct.setName(wrapperName.getLocalPart());
+        el.setSchemaTypeName(wrapperName);
+        schema.addType(ct);
+        schema.getItems().add(ct);
         
         XmlSchemaSequence seq = new XmlSchemaSequence();
         ct.setParticle(seq);
         
         for (MessagePartInfo mpi : unwrappedMessage.getMessageParts()) {
-            el = new XmlSchemaElement();
-            el.setName(mpi.getName().getLocalPart());
-            el.setQName(mpi.getName());
-
-            if (mpi.getTypeClass() != null 
-                && mpi.getTypeClass().isArray()
-                && !Byte.TYPE.equals(mpi.getTypeClass().getComponentType())) {
-                el.setMinOccurs(0);
-                el.setMaxOccurs(Long.MAX_VALUE);
-            } else {
-                el.setMaxOccurs(1);
+            if (!Boolean.TRUE.equals(mpi.getProperty(HEADER))) {
+                el = new XmlSchemaElement();
+                el.setName(mpi.getName().getLocalPart());
+                el.setQName(mpi.getName());
+    
                 if (mpi.getTypeClass() != null 
-                    && !mpi.getTypeClass().isPrimitive()) {
+                    && mpi.getTypeClass().isArray()
+                    && !Byte.TYPE.equals(mpi.getTypeClass().getComponentType())) {
                     el.setMinOccurs(0);
+                    el.setMaxOccurs(Long.MAX_VALUE);
+                } else {
+                    el.setMaxOccurs(1);
+                    if (mpi.getTypeClass() != null 
+                        && !mpi.getTypeClass().isPrimitive()) {
+                        el.setMinOccurs(0);
+                    }
                 }
+    
+                if (mpi.isElement()) {
+                    el.setRefName(mpi.getElementQName());
+                } else {
+                    el.setSchemaTypeName(mpi.getTypeQName());
+                }
+                seq.getItems().add(el);
             }
-
-            if (mpi.isElement()) {
-                el.setRefName(mpi.getElementQName());
-            } else {
-                el.setSchemaTypeName(mpi.getTypeQName());
-            }
-            seq.getItems().add(el);
         }
     }
 
@@ -683,8 +665,17 @@
                     if (outMsg == null) {
                         outMsg = op.createMessage(createOutputMessageName(op, method)); 
                     }
-                    final QName q = getOutPartName(op, method, j);
-                    final QName q2 = getOutParameterName(op, method, j);
+                    QName q = getOutPartName(op, method, j);
+                    QName q2 = getOutParameterName(op, method, j);
+                    
+                    if (isInParam(method, j)) {
+                        q = op.getInput().getMessagePartByIndex(j).getName();
+                        q2 = (QName)op.getInput().getMessagePartByIndex(j).getProperty(ELEMENT_NAME);
+                        if (q2 == null) {
+                            q2 = op.getInput().getMessagePartByIndex(j).getElementQName();
+                        }
+                    }
+                    
                     MessagePartInfo part = outMsg.addMessagePart(q);
                     initializeParameter(part, paramClasses[j], method.getGenericParameterTypes()[j]);
                     part.setIndex(j);
@@ -717,7 +708,7 @@
     }
         
     protected void createInputWrappedMessageParts(OperationInfo op, Method method, MessageInfo inMsg) {
-        MessagePartInfo part = inMsg.addMessagePart(op.getInputName());
+        MessagePartInfo part = inMsg.addMessagePart("parameters");
         part.setElement(true);
         for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
             AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
@@ -728,14 +719,24 @@
         }
         if (part.getElementQName() == null) {
             part.setElementQName(inMsg.getName());
+        } else if (!part.getElementQName().equals(op.getInput().getName())) {
+            op.getInput().setName(part.getElementQName());
         }
         if (getRequestWrapper(method) != null) {
             part.setTypeClass(this.getRequestWrapper(method));
         }
+        
+        for (MessagePartInfo mpart : op.getInput().getMessageParts()) {
+            if (Boolean.TRUE.equals(mpart.getProperty(HEADER))) {
+                int idx = mpart.getIndex();
+                inMsg.addMessagePart(mpart);
+                mpart.setIndex(idx);
+            }
+        }
     }  
     
     protected void createOutputWrappedMessageParts(OperationInfo op, Method method, MessageInfo inMsg) {
-        MessagePartInfo part = inMsg.addMessagePart(op.getOutputName());
+        MessagePartInfo part = inMsg.addMessagePart("parameters");
         part.setElement(true);
         part.setIndex(-1);
         for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
@@ -748,6 +749,8 @@
         
         if (part.getElementQName() == null) {
             part.setElementQName(inMsg.getName());
+        } else if (!part.getElementQName().equals(op.getOutput().getName())) {
+            op.getOutput().setName(part.getElementQName());
         }
         
         if (this.getResponseWrapper(method) != null) {

Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java Wed May  2 12:34:34 2007
@@ -52,7 +52,6 @@
 import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
 import org.apache.cxf.ws.rm.Identifier;
 import org.apache.cxf.ws.rm.RMContextUtils;
-import org.apache.cxf.ws.rm.RMEndpoint;
 import org.apache.cxf.ws.rm.RMManager;
 import org.apache.cxf.ws.rm.RMMessageConstants;
 import org.apache.cxf.ws.rm.RMProperties;
@@ -238,8 +237,7 @@
     }
 
     private void serverResend(Message message) {
-        RMEndpoint reliableEndpoint = manager.getReliableEndpoint(message);
-        final Endpoint endpoint = reliableEndpoint.getEndpoint();
+        final Endpoint reliableEndpoint = manager.getReliableEndpoint(message).getEndpoint();
         
         // get the message's to address
         
@@ -260,7 +258,7 @@
             @Override
             public Conduit selectConduit(Message message) {
                 Conduit conduit = null;
-                EndpointInfo endpointInfo = endpoint.getEndpointInfo();
+                EndpointInfo endpointInfo = reliableEndpoint.getEndpointInfo();
                 org.apache.cxf.ws.addressing.EndpointReferenceType original = 
                     endpointInfo.getTarget();
                 try {

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java Wed May  2 12:34:34 2007
@@ -54,13 +54,11 @@
         String name;
         String type;
 
-        final MessagePartInfo[] messageParts = message.getMessageParts().toArray(
-            new MessagePartInfo[message.getMessageParts().size()]);
-        
         final Class[] paramClasses = method.getParameterTypes();
-        for (int j = 0; j < paramClasses.length; j++) {
-            name = messageParts[j].getName().getLocalPart();
-            Class clz = paramClasses[j];
+        for (MessagePartInfo mpi : message.getMessageParts()) {
+            int idx = mpi.getIndex();
+            name = mpi.getName().getLocalPart();
+            Class clz = paramClasses[idx];
             if (clz.isArray()) {
                 if (isBuiltInTypes(clz.getComponentType())) {
                     type = clz.getComponentType().getSimpleName() + "[]";
@@ -72,7 +70,9 @@
             }
             JavaField field = new JavaField(name, type, "");
             fields.add(field);
+            
         }
+
         return fields;
     }
 

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java Wed May  2 12:34:34 2007
@@ -76,6 +76,27 @@
             field.setType(type);
         }
         fields.add(field);
+        
+        final Class[] paramClasses = method.getParameterTypes();
+        for (MessagePartInfo mpi : message.getMessageParts()) {
+            int idx = mpi.getIndex();
+            if (idx >= 0) {
+                String name = mpi.getName().getLocalPart();
+                String type;
+                Class clz = paramClasses[idx];
+                if (clz.isArray()) {
+                    if (isBuiltInTypes(clz.getComponentType())) {
+                        type = clz.getComponentType().getSimpleName() + "[]";
+                    } else {
+                        type = clz.getComponentType().getName() + "[]";
+                    }
+                } else {
+                    type = clz.getName();
+                }
+                fields.add(new JavaField(name, type, ""));
+            }
+        }
+        
         return fields;
     }
 

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/JavaToWSDLTest.java Wed May  2 12:34:34 2007
@@ -75,5 +75,4 @@
         JavaToWSDL.main(args);
         assertEquals(-1, getStdOut().indexOf("Caused by:"));
     }
-
 }

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl Wed May  2 12:34:34 2007
@@ -20,36 +20,33 @@
 <wsdl:definitions name="Calculator" 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/">
-<xsd:element name="AddException">
-<xsd:complexType>
+<xsd:element name="AddException" type="AddException"/>
+<xsd:complexType name="AddException">
 <xsd:sequence>
 <xsd:element name="message" nillable="true" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="add">
-<xsd:complexType>
+<xsd:element name="add" type="add"/>
+<xsd:complexType name="add">
 <xsd:sequence>
 <xsd:element name="a" type="xsd:int"/>
 <xsd:element name="b" type="xsd:int"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="addResponse">
-<xsd:complexType>
+<xsd:element name="addResponse" type="addResponse"/>
+<xsd:complexType name="addResponse">
 <xsd:sequence>
 <xsd:element name="return" type="xsd:int"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="add">
-    <wsdl:part name="add" element="ns1:add">
+    <wsdl:part name="parameters" element="ns1:add">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="addResponse">
-    <wsdl:part name="addResponse" element="ns1:addResponse">
+    <wsdl:part name="parameters" element="ns1:addResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="AddException">

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl Wed May  2 12:34:34 2007
@@ -30,29 +30,26 @@
 <xs:element minOccurs="0" name="species" type="xs:string"/>
 </xs:sequence>
 </xs:complexType>
-<xs:element name="DBServiceFault">
-<xs:complexType>
+<xs:element name="DBServiceFault" type="DBServiceFault"/>
+<xs:complexType name="DBServiceFault">
 <xs:sequence>
 <xs:element name="message" nillable="true" type="xs:string"/>
 </xs:sequence>
 </xs:complexType>
-</xs:element>
-<xs:element name="operation0">
-<xs:complexType>
+<xs:element name="operation0" type="operation0"/>
+<xs:complexType name="operation0">
 <xs:sequence/>
 </xs:complexType>
-</xs:element>
-<xs:element name="operation0Response">
-<xs:complexType>
+<xs:element name="operation0Response" type="operation0Response"/>
+<xs:complexType name="operation0Response">
 <xs:sequence>
 <xs:element maxOccurs="unbounded" minOccurs="0" name="return" type="operation0ResponseType"/>
 </xs:sequence>
 </xs:complexType>
-</xs:element>
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="operation0">
-    <wsdl:part name="operation0" element="ns1:operation0">
+    <wsdl:part name="parameters" element="ns1:operation0">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="DBServiceFault">
@@ -60,7 +57,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="operation0Response">
-    <wsdl:part name="operation0Response" element="ns1:operation0Response">
+    <wsdl:part name="parameters" element="ns1:operation0Response">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="DatabasePortType">

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -47,11 +47,11 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="sayHi">
-    <wsdl:part name="sayHi" element="ns2:sayHi">
+    <wsdl:part name="parameters" element="ns2:sayHi">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="sayHiResponse" element="ns2:sayHiResponse">
+    <wsdl:part name="parameters" element="ns2:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="faultDetail">
@@ -59,11 +59,11 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="pingMeResponse" element="ns2:pingMeResponse">
+    <wsdl:part name="parameters" element="ns2:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">
-    <wsdl:part name="pingMe" element="ns2:pingMe">
+    <wsdl:part name="parameters" element="ns2:pingMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Wed May  2 12:34:34 2007
@@ -29,11 +29,11 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="sayHi">
-    <wsdl:part name="sayHi" element="ns2:sayHi">
+    <wsdl:part name="parameters" element="ns2:sayHi">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="sayHiResponse" element="ns2:sayHiResponse">
+    <wsdl:part name="parameters" element="ns2:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="faultDetail">
@@ -41,11 +41,11 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="pingMeResponse" element="ns2:pingMeResponse">
+    <wsdl:part name="parameters" element="ns2:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">
-    <wsdl:part name="pingMe" element="ns2:pingMe">
+    <wsdl:part name="parameters" element="ns2:pingMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.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_doc_lit_wrapped_localName.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl Wed May  2 12:34:34 2007
@@ -36,28 +36,26 @@
 </xs:element>
 </xs:schema>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://doc.withannotation.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/">
-<xsd:element name="getPrice">
-<xsd:complexType>
+<xsd:element name="getPrice" type="getPrice"/>
+<xsd:complexType name="getPrice">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="getPriceResponse">
-<xsd:complexType>
+<xsd:element name="getPriceResponse" type="getPriceResponse"/>
+<xsd:complexType name="getPriceResponse">
 <xsd:sequence>
 <xsd:element name="return" type="xsd:float"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="getPriceResponse" element="ns1:getPriceResponse">
+    <wsdl:part name="parameters" element="ns1:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPrice">
-    <wsdl:part name="getPrice" element="ns1:getPrice">
+    <wsdl:part name="parameters" element="ns1:getPrice">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Stock">

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.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_doc_lit_wrapped_no_wrapperclass.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl Wed May  2 12:34:34 2007
@@ -20,26 +20,24 @@
 <wsdl:definitions name="HelloWrappedService" targetNamespace="http://cxf.com/" xmlns:ns1="http://cxf.com/" 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://cxf.com/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://cxf.com/">
-<xsd:element name="sayHiWithoutWrapperClass">
-<xsd:complexType>
+<xsd:element name="sayHiWithoutWrapperClass" type="sayHiWithoutWrapperClass"/>
+<xsd:complexType name="sayHiWithoutWrapperClass">
 <xsd:sequence/>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="sayHiWithoutWrapperClassResponse">
-<xsd:complexType>
+<xsd:element name="sayHiWithoutWrapperClassResponse" type="sayHiWithoutWrapperClassResponse"/>
+<xsd:complexType name="sayHiWithoutWrapperClassResponse">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="return" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="sayHiWithoutWrapperClass">
-    <wsdl:part name="sayHiWithoutWrapperClass" element="ns1:sayHiWithoutWrapperClass">
+    <wsdl:part name="parameters" element="ns1:sayHiWithoutWrapperClass">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiWithoutWrapperClassResponse">
-    <wsdl:part name="sayHiWithoutWrapperClassResponse" element="ns1:sayHiWithoutWrapperClassResponse">
+    <wsdl:part name="parameters" element="ns1:sayHiWithoutWrapperClassResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Hello">

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.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_doc_lit_wrapped_with_wrapperclass.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl Wed May  2 12:34:34 2007
@@ -37,11 +37,11 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="getPrice">
-    <wsdl:part name="getPrice" element="ns1:getPrice">
+    <wsdl:part name="parameters" element="ns1:getPrice">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="getPriceResponse" element="ns1:getPriceResponse">
+    <wsdl:part name="parameters" element="ns1:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="StockWrapped">

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -37,11 +37,11 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="greetMeSometime">
-    <wsdl:part name="greetMeSometime" element="ns2:greetMeSometime">
+    <wsdl:part name="parameters" element="ns2:greetMeSometime">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeSometimeResponse">
-    <wsdl:part name="greetMeSometimeResponse" element="ns2:greetMeSometimeResponse">
+    <wsdl:part name="parameters" element="ns2:greetMeSometimeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="GreeterAsync">

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -68,35 +68,35 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="faultDetail">
-    <wsdl:part name="faultDetail" element="ns2:faultDetail">
+    <wsdl:part name="fault" element="ns2:faultDetail">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="sayHiResponse" element="ns2:sayHiResponse">
+    <wsdl:part name="parameters" element="ns2:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeResponse">
-    <wsdl:part name="greetMeResponse" element="ns2:greetMeResponse">
+    <wsdl:part name="parameters" element="ns2:greetMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMe">
-    <wsdl:part name="greetMe" element="ns2:greetMe">
+    <wsdl:part name="parameters" element="ns2:greetMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">
-    <wsdl:part name="pingMe" element="ns2:pingMe">
+    <wsdl:part name="parameters" element="ns2:pingMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="pingMeResponse" element="ns2:pingMeResponse">
+    <wsdl:part name="parameters" element="ns2:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHi">
-    <wsdl:part name="sayHi" element="ns2:sayHi">
+    <wsdl:part name="parameters" element="ns2:sayHi">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeOneWay">
-    <wsdl:part name="greetMeOneWay" element="ns2:greetMeOneWay">
+    <wsdl:part name="parameters" element="ns2:greetMeOneWay">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">
@@ -121,7 +121,7 @@
     </wsdl:input>
       <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
     </wsdl:output>
-      <wsdl:fault name="fault" message="ns2:faultDetail">
+      <wsdl:fault name="faultDetail" message="ns2:faultDetail">
     </wsdl:fault>
     </wsdl:operation>
   </wsdl:portType>

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.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_holder.wsdl?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl Wed May  2 12:34:34 2007
@@ -20,78 +20,72 @@
 <wsdl:definitions name="HolderServiceService" targetNamespace="http://holder.fortest.tools.cxf.apache.org/" xmlns:ns1="http://holder.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://holder.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://holder.fortest.tools.cxf.apache.org/">
-<xsd:element name="echo">
-<xsd:complexType>
+<xsd:element name="echo" type="echo"/>
+<xsd:complexType name="echo">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
 <xsd:element minOccurs="0" name="arg1" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="echoResponse">
-<xsd:complexType>
+<xsd:element name="echoResponse" type="echoResponse"/>
+<xsd:complexType name="echoResponse">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="return" type="xsd:string"/>
 <xsd:element minOccurs="0" name="return1" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="echo3">
-<xsd:complexType>
+<xsd:element name="echo3" type="echo3"/>
+<xsd:complexType name="echo3">
 <xsd:sequence>
-<xsd:element minOccurs="0" ref="header"/>
 <xsd:element minOccurs="0" name="arg1" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="echo3Response">
-<xsd:complexType>
+<xsd:element name="echo3Response" type="echo3Response"/>
+<xsd:complexType name="echo3Response">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="return" type="xsd:string"/>
-<xsd:element minOccurs="0" ref="header"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="echo2">
-<xsd:complexType>
+<xsd:element name="echo2" type="echo2"/>
+<xsd:complexType name="echo2">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
 <xsd:element minOccurs="0" name="arg1" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="echo2Response">
-<xsd:complexType>
+<xsd:element name="echo2Response" type="echo2Response"/>
+<xsd:complexType name="echo2Response">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="return" type="xsd:string"/>
 <xsd:element minOccurs="0" name="return1" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="echo">
-    <wsdl:part name="echo" element="ns1:echo">
+    <wsdl:part name="parameters" element="ns1:echo">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo3Response">
-    <wsdl:part name="echo3Response" element="ns1:echo3Response">
+    <wsdl:part name="parameters" element="ns1:echo3Response">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo2">
-    <wsdl:part name="echo2" element="ns1:echo2">
+    <wsdl:part name="parameters" element="ns1:echo2">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echoResponse">
-    <wsdl:part name="echoResponse" element="ns1:echoResponse">
+    <wsdl:part name="parameters" element="ns1:echoResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo2Response">
-    <wsdl:part name="echo2Response" element="ns1:echo2Response">
+    <wsdl:part name="parameters" element="ns1:echo2Response">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo3">
-    <wsdl:part name="echo3" element="ns1:echo3">
+    <wsdl:part name="parameters" element="ns1:echo3">
+    </wsdl:part>
+    <wsdl:part name="header" element="ns1:header">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="HolderService">
@@ -139,12 +133,12 @@
       <wsdl:input name="echo3">
         <soap:header message="ns1:echo3" part="header" use="literal">
         </soap:header>
-        <soap:body parts="echo3" use="literal"/>
+        <soap:body parts="parameters" use="literal"/>
       </wsdl:input>
       <wsdl:output name="echo3Response">
         <soap:header message="ns1:echo3Response" part="header" use="literal">
         </soap:header>
-        <soap:body parts="echo3Response" use="literal"/>
+        <soap:body parts="parameters" use="literal"/>
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>

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=534599&r1=534598&r2=534599
==============================================================================
--- 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 May  2 12:34:34 2007
@@ -20,28 +20,26 @@
 <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/">
-<xsd:element name="getPrice">
-<xsd:complexType>
+<xsd:element name="getPrice" type="getPrice"/>
+<xsd:complexType name="getPrice">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
-<xsd:element name="getPriceResponse">
-<xsd:complexType>
+<xsd:element name="getPriceResponse" type="getPriceResponse"/>
+<xsd:complexType name="getPriceResponse">
 <xsd:sequence>
 <xsd:element name="return" type="xsd:float"/>
 </xsd:sequence>
 </xsd:complexType>
-</xsd:element>
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="getPriceResponse" element="ns1:getPriceResponse">
+    <wsdl:part name="parameters" element="ns1:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPrice">
-    <wsdl:part name="getPrice" element="ns1:getPrice">
+    <wsdl:part name="parameters" element="ns1:getPrice">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Stock">

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm?view=diff&rev=534599&r1=534598&r2=534599
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm Wed May  2 12:34:34 2007
@@ -56,13 +56,13 @@
     <fail message="Please set CXF_HOME environment variable." unless="cxf.home"/>
 
     <!-- Determine cxf.jar.file, either ${cxf.home}/build/lib/cxf.jar
-	 - in a source distribution, or ${cxf.home}/modules/cxf-manifest-incubator.jar in a binary
+	 - in a source distribution, or ${cxf.home}/lib/cxf-manifest-incubator.jar in a binary
 	 - distribution.
     -->
-    <condition property="cxf-manifest-incubator.jar.file" value="${cxf.home}/build/modules/cxf-manifest-incubator.jar">
+    <condition property="cxf-manifest-incubator.jar.file" value="${cxf.home}/build/lib/cxf-manifest-incubator.jar">
 	<available file="cxf-manifest-incubator.jar" type="file" filepath="${cxf.home}/build/lib"/>
     </condition>
-    <property name="cxf-manifest-incubator.jar.file" value="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
+    <property name="cxf-manifest-incubator.jar.file" value="${cxf.home}/lib/cxf-manifest-incubator.jar"/>
 
     <fail message="The location ${cxf.home} does not seem to contain a cxf installation; if you are importing this common build file from a location other than the cxf samples directory then you need to set the cxf_HOME environment variable.">
 	<condition>



Mime
View raw message