cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r583892 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ rt/frontend/jax...
Date Thu, 11 Oct 2007 17:32:29 GMT
Author: dkulp
Date: Thu Oct 11 10:32:27 2007
New Revision: 583892

URL: http://svn.apache.org/viewvc?rev=583892&view=rev
Log:
Merged revisions 583877 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r583877 | dkulp | 2007-10-11 12:53:40 -0400 (Thu, 11 Oct 2007) | 5 lines
  
  Change default part name for wrapped doc/lit responses to "parameters" when the tcks/specs allow to make .NET happy
  Add more logging in JAXB databinding
  If there is a problem writing a fault, log the exception but continue the chain so the binding can take a crack at it instead of ending up with an empty response message.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/Messages.properties
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
    incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java Thu Oct 11 10:32:27 2007
@@ -21,13 +21,14 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamWriter;
 
 import org.w3c.dom.Node;
 
-import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.databinding.DataWriter;
 import org.apache.cxf.frontend.FaultInfoException;
@@ -42,7 +43,7 @@
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 
 public class FaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
-    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(FaultOutInterceptor.class);
+    private static final Logger LOG = LogUtils.getL7dLogger(FaultOutInterceptor.class); 
 
     public FaultOutInterceptor() {
         super(Phase.PRE_PROTOCOL);
@@ -67,19 +68,26 @@
             MessagePartInfo part = fi.getMessageParts().iterator().next();
             DataBinding db = service.getDataBinding();
 
-            if (isDOMSupported(db)) {
-                DataWriter<Node> writer = db.createWriter(Node.class);
-
-                writer.write(bean, part, f.getOrCreateDetail());
-            } else {
-                XMLStreamWriter xsw = new W3CDOMStreamWriter(f.getOrCreateDetail());
-
-                DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
-
-                writer.write(bean, part, xsw);
+            try {
+                if (isDOMSupported(db)) {
+                    DataWriter<Node> writer = db.createWriter(Node.class);
+    
+                    writer.write(bean, part, f.getOrCreateDetail());
+                } else {
+                    XMLStreamWriter xsw = new W3CDOMStreamWriter(f.getOrCreateDetail());
+    
+                    DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
+    
+                    writer.write(bean, part, xsw);
+                }
+    
+                f.setMessage(ex.getMessage());
+            } catch (Exception fex) {
+                //ignore - if any exceptions occur here, we'll ignore them
+                //and let the default fault handling of the binding convert 
+                //the fault like it was an unchecked exception.
+                LOG.log(Level.WARNING, "EXCEPTION_WHILE_WRITING_FAULT", fex);
             }
-
-            f.setMessage(ex.getMessage());
         }
     }
 
@@ -99,11 +107,11 @@
                 Method method = cause.getClass().getMethod("getFaultInfo", new Class[0]);
                 return method.invoke(cause, new Object[0]);
             } catch (InvocationTargetException e) {
-                throw new Fault(new org.apache.cxf.common.i18n.Message("INVOKE_FAULT_INFO", BUNDLE), e);
+                throw new Fault(new org.apache.cxf.common.i18n.Message("INVOKE_FAULT_INFO", LOG), e);
             } catch (NoSuchMethodException e) {
-                throw new Fault(new org.apache.cxf.common.i18n.Message("NO_FAULT_INFO_METHOD", BUNDLE), e);
+                throw new Fault(new org.apache.cxf.common.i18n.Message("NO_FAULT_INFO_METHOD", LOG), e);
             } catch (Exception e) {
-                throw new Fault(new org.apache.cxf.common.i18n.Message("NO_ACCCESS_FAULT_INFO", BUNDLE), e);
+                throw new Fault(new org.apache.cxf.common.i18n.Message("NO_ACCCESS_FAULT_INFO", LOG), e);
             }
         }
         return cause;

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/Messages.properties Thu Oct 11 10:32:27 2007
@@ -34,4 +34,5 @@
 NO_FAULT_INFO_METHOD=Custom faults need a getFaultInfo method.
 NO_ACCCESS_FAULT_INFO=Couldn't access getFaultInfo method.
 COULD_NOT_CREATE_ANNOTATION_OBJECT=Could not create annotation object: {0}
-COULD_NOT_FIND_SEICLASS=Could not find the class: {0}
\ No newline at end of file
+COULD_NOT_FIND_SEICLASS=Could not find the class: {0}
+EXCEPTION_WHILE_WRITING_FAULT = Exception occurred while writing fault.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Thu Oct 11 10:32:27 2007
@@ -32,8 +32,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 import javax.xml.bind.JAXBContext;
@@ -54,8 +55,8 @@
 import com.sun.xml.bind.v2.ContextFactory;
 import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
 
-import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.CacheMap;
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.common.util.StringUtils;
@@ -74,13 +75,13 @@
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 
 public final class JAXBDataBinding extends AbstractDataBinding implements DataBinding {
-
     public static final String SCHEMA_RESOURCE = "SCHEMRESOURCE";
     
     public static final String UNWRAP_JAXB_ELEMENT = "unwrap.jaxb.element";
 
-    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JAXBDataBinding.class);
-    
+    private static final Logger LOG = LogUtils.getLogger(JAXBDataBinding.class);
+
+
     private static final Class<?> SUPPORTED_READER_FORMATS[] = new Class<?>[] {Node.class,
                                                                                XMLEventReader.class,
                                                                                XMLStreamReader.class};
@@ -200,6 +201,9 @@
             }
         }
             
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.log(Level.FINE, "CREATED_JAXB_CONTEXT", new Object[] {ctx, contextClasses});
+        }
         setContext(ctx);
         
             
@@ -232,7 +236,7 @@
                                           (Document)r.getNode(), r.getSystemId());
                     }
                 } catch (IOException e) {
-                    throw new ServiceConstructionException(new Message("SCHEMA_GEN_EXC", BUNDLE), e);
+                    throw new ServiceConstructionException(new Message("SCHEMA_GEN_EXC", LOG), e);
                 }
             }
             

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Messages.properties Thu Oct 11 10:32:27 2007
@@ -26,3 +26,4 @@
 UNKNOWN_ELEMENT_NAME = Could not determine the element name for {0}.
 UNKNOWN_PACKAGE_NS = No package info found for class {0}. Cannot lookup default schema namespace.
 SCHEMA_GEN_EXC = Could not generate schemas.
+CREATED_JAXB_CONTEXT = Created JAXBContext "{0}" with classes {1}.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/Messages.properties?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/Messages.properties (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/Messages.properties Thu Oct 11 10:32:27 2007
@@ -26,3 +26,4 @@
 ATTACHMENT_NOT_SUPPORTED = Attachments of type {0} are not supported.
 DISPATCH_OBJECT_NOT_SUPPORTED_SOAPBINDING = {0} is not valid in {1} mode with SOAP/HTTP binding.
 DISPATCH_OBJECT_NOT_SUPPORTED_XMLBINDING = {0} is not valid in {1} mode with XML/HTTP binding.
+EXCEPTION_WHILE_WRITING_FAULT = Exception occurred while writing fault.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java Thu Oct 11 10:32:27 2007
@@ -22,6 +22,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
@@ -104,14 +105,20 @@
             }
             Service service = message.getExchange().get(Service.class);
 
-            DataWriter<Node> writer = service.getDataBinding().createWriter(Node.class);
-
-            OperationInfo op = message.getExchange().get(BindingOperationInfo.class).getOperationInfo();
-            QName faultName = getFaultName(fault, cause.getClass(), op);
-            MessagePartInfo part = getFaultMessagePart(faultName, op);
-            writer.write(faultInfo, part, f.getOrCreateDetail());
-
-            f.setMessage(ex.getMessage());
+            try {
+                DataWriter<Node> writer = service.getDataBinding().createWriter(Node.class);
+    
+                OperationInfo op = message.getExchange().get(BindingOperationInfo.class).getOperationInfo();
+                QName faultName = getFaultName(fault, cause.getClass(), op);
+                MessagePartInfo part = getFaultMessagePart(faultName, op);
+                writer.write(faultInfo, part, f.getOrCreateDetail());
+    
+                f.setMessage(ex.getMessage());
+            } catch (Exception nex) {
+                //if exception occurs while writing a fault, we'll just let things continue
+                //and let the rest of the chain try handling it as is.
+                LOG.log(Level.WARNING, "EXCEPTION_WHILE_WRITING_FAULT", nex);
+            }
         } else {
             FaultMode mode = message.get(FaultMode.class);
             if (mode == FaultMode.CHECKED_APPLICATION_FAULT) {

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Thu Oct 11 10:32:27 2007
@@ -308,6 +308,27 @@
     }
 
     @Override
+    public String getResponseWrapperPartName(OperationInfo op, Method method) {
+        method = getDeclaredMethod(method);
+        WebResult webResult = getWebResult(method);
+        if (webResult != null
+            && webResult.header()) {
+            for (int x = 0; x < method.getParameterTypes().length; x++) {
+                WebParam parm = getWebParam(method, x);
+                if (parm != null
+                    && !parm.header()
+                    && parm.mode() != WebParam.Mode.IN) {
+                    return null;
+                }
+            }
+            //all outs are headers, thus it's an empty body part
+            //thus return the default for an empty part of "result"
+            return "result";
+        }
+        return null;
+    }  
+
+    @Override
     public QName getOutParameterName(OperationInfo op, Method method, int paramNumber) {       
         method = getDeclaredMethod(method);
         

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Thu Oct 11 10:32:27 2007
@@ -104,7 +104,7 @@
                     + "/wsdl:part[@element='tns:sayHi'][@name='parameters']",
                     wsdl);
         assertValid("/wsdl:definitions/wsdl:message[@name='sayHiResponse']"
-                    + "/wsdl:part[@element='tns:sayHiResponse'][@name='result']",
+                    + "/wsdl:part[@element='tns:sayHiResponse'][@name='parameters']",
                     wsdl);
         assertValid("//xsd:complexType[@name='sayHi']"
                     + "/xsd:sequence/xsd:element[@name='arg0']",

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Thu Oct 11 10:32:27 2007
@@ -181,7 +181,7 @@
         assertEquals("greetMeResponse", greetMeOp.getOutput().getName().getLocalPart());
         
         MessagePartInfo outMessagePart = messageParts.get(0);
-        assertEquals("result", outMessagePart.getName().getLocalPart());
+        //assertEquals("result", 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/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java Thu Oct 11 10:32:27 2007
@@ -152,6 +152,9 @@
     public QName getResponseWrapperName(OperationInfo op, Method method) {
         return null;        
     }  
+    public String getResponseWrapperPartName(OperationInfo op, Method method) {
+        return null;        
+    }  
  
     public Class getResponseWrapper(Method selected) {
         return null;

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Oct 11 10:32:27 2007
@@ -903,7 +903,19 @@
     }
 
     protected void createOutputWrappedMessageParts(OperationInfo op, Method method, MessageInfo outMsg) {
-        MessagePartInfo part = outMsg.addMessagePart("result");
+        String partName = null;
+        for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
+            AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next();
+            partName = c.getResponseWrapperPartName(op, method);
+            if (partName != null) {
+                break;
+            }
+        }
+        if (partName == null) {
+            partName = "parameters";
+        }
+        
+        MessagePartInfo part = outMsg.addMessagePart(partName);
         part.setElement(true);
         part.setIndex(0);
         for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) {
@@ -911,6 +923,7 @@
             QName q = c.getResponseWrapperName(op, method);
             if (q != null) {
                 part.setElementQName(q);
+                break;
             }
         }
 

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Oct 11 10:32:27 2007
@@ -1693,7 +1693,7 @@
         /**
          * This boolean is true if the request must be cached.
          */
-        private boolean cachingForRetransmision;
+        private boolean cachingForRetransmission;
         
         /**
          * If we are going to be chunking, we won't flush till close which causes
@@ -1718,7 +1718,7 @@
             super();
             this.outMessage = m;
             connection = c;
-            cachingForRetransmision = possibleRetransmit;
+            cachingForRetransmission = possibleRetransmit;
             chunking = isChunking;
         }
 
@@ -1755,7 +1755,7 @@
             
             // If we need to cache for retransmission, store data in a
             // CacheAndWriteOutputStream. Otherwise write directly to the output stream.
-            if (cachingForRetransmision) {
+            if (cachingForRetransmission) {
                 cachedStream =
                     new CacheAndWriteOutputStream(connection.getOutputStream());
                 wrappedStream = cachedStream;
@@ -1778,7 +1778,7 @@
                 handleHeadersTrustCaching();
             }
             super.flush();
-            if (!cachingForRetransmision) {
+            if (!cachingForRetransmission) {
                 super.close();
             } else {
                 cachedStream.getOut().close();
@@ -1787,7 +1787,7 @@
             try {
                 handleResponse();
             } finally {
-                if (cachingForRetransmision) {
+                if (cachingForRetransmission) {
                     cachedStream.close();
                 }
             }

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java Thu Oct 11 10:32:27 2007
@@ -262,8 +262,8 @@
         try {
             disp.invoke(ds);
             fail("Did not get expected exception");
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (HTTPException e) {
+            //expected
         }
     }
 

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java Thu Oct 11 10:32:27 2007
@@ -51,6 +51,7 @@
     int[] echoIntArray(int[] ar);
     
     @WebMethod
+    @WebResult(partName = "parameters")
     String listInput(List<String> inputs);
 
     @WebMethod

Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java Thu Oct 11 10:32:27 2007
@@ -118,7 +118,7 @@
 
         assertTrue(!st1.hasMoreTokens());
         assertTrue(!st2.hasMoreTokens());
-        assertTrue("Files did not match", unmatched.isEmpty());
+        assertTrue("Files did not match: " + unmatched, unmatched.isEmpty());
     }
 
     public String getStringFromFile(File location) {

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java Thu Oct 11 10:32:27 2007
@@ -50,6 +50,8 @@
     public void tearDown() {
         super.tearDown();
         System.setProperty("java.class.path", cp);
+        FileUtils.removeDir(output);
+        output = null;
     }
 
     @Test

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl Thu Oct 11 10:32:27 2007
@@ -46,7 +46,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="addResponse">
-    <wsdl:part name="result" element="tns:addResponse">
+    <wsdl:part name="parameters" element="tns:addResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="AddException">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl Thu Oct 11 10:32:27 2007
@@ -57,7 +57,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="operation0Response">
-    <wsdl:part name="result" element="tns:operation0Response">
+    <wsdl:part name="parameters" element="tns:operation0Response">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="DatabasePortType">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl Thu Oct 11 10:32:27 2007
@@ -51,7 +51,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="ns1:sayHiResponse">
+    <wsdl:part name="parameters" element="ns1:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="PingMeFault">
@@ -59,7 +59,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="result" element="ns1:pingMeResponse">
+    <wsdl:part name="parameters" element="ns1:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl Thu Oct 11 10:32:27 2007
@@ -79,11 +79,11 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeResponse">
-    <wsdl:part name="result" element="ns1:greetMeResponse">
+    <wsdl:part name="parameters" element="ns1:greetMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="testDocLitFaultResponse">
-    <wsdl:part name="result" element="ns1:testDocLitFaultResponse">
+    <wsdl:part name="parameters" element="ns1:testDocLitFaultResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMe">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl Thu Oct 11 10:32:27 2007
@@ -35,7 +35,7 @@
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="tns:sayHiResponse">
+    <wsdl:part name="parameters" element="tns:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHi">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Thu Oct 11 10:32:27 2007
@@ -51,7 +51,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="ns1:sayHiResponse">
+    <wsdl:part name="parameters" element="ns1:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="PingMeFault">
@@ -59,7 +59,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="result" element="ns1:pingMeResponse">
+    <wsdl:part name="parameters" element="ns1:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java Thu Oct 11 10:32:27 2007
@@ -41,9 +41,6 @@
         generator.setBus(builder.getBus());
     }
 
-    public void tearDown() {
-
-    }
 
     @Test
     public void testGeneratedWithElementryClass() throws Exception {

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl Thu Oct 11 10:32:27 2007
@@ -19,7 +19,7 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="result" element="tns:getPriceResponse">
+    <wsdl:part name="parameters" element="tns:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPrice">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl Thu Oct 11 10:32:27 2007
@@ -17,7 +17,7 @@
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="tns:sayHiResponse">
+    <wsdl:part name="parameters" element="tns:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHi">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl Thu Oct 11 10:32:27 2007
@@ -19,7 +19,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiWithoutWrapperClassResponse">
-    <wsdl:part name="result" element="tns:sayHiWithoutWrapperClassResponse">
+    <wsdl:part name="parameters" element="tns:sayHiWithoutWrapperClassResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Hello">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl Thu Oct 11 10:32:27 2007
@@ -23,7 +23,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="result" element="tns:getPriceResponse">
+    <wsdl:part name="parameters" element="tns:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="StockWrapped">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl Thu Oct 11 10:32:27 2007
@@ -41,7 +41,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeSometimeResponse">
-    <wsdl:part name="result" element="ns1:greetMeSometimeResponse">
+    <wsdl:part name="parameters" element="ns1:greetMeSometimeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="GreeterAsync">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl Thu Oct 11 10:32:27 2007
@@ -68,11 +68,11 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="ns1:sayHiResponse">
+    <wsdl:part name="parameters" element="ns1:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeResponse">
-    <wsdl:part name="result" element="ns1:greetMeResponse">
+    <wsdl:part name="parameters" element="ns1:greetMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMe">
@@ -84,7 +84,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="result" element="ns1:pingMeResponse">
+    <wsdl:part name="parameters" element="ns1:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHi">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl Thu Oct 11 10:32:27 2007
@@ -50,7 +50,7 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo3Response">
-    <wsdl:part name="result" element="tns:echo3Response">
+    <wsdl:part name="parameters" element="tns:echo3Response">
     </wsdl:part>
     <wsdl:part name="header" element="tns:header">
     </wsdl:part>
@@ -60,11 +60,11 @@
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echoResponse">
-    <wsdl:part name="result" element="tns:echoResponse">
+    <wsdl:part name="parameters" element="tns:echoResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo2Response">
-    <wsdl:part name="result" element="tns:echo2Response">
+    <wsdl:part name="parameters" element="tns:echo2Response">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="echo3">
@@ -123,7 +123,7 @@
       <wsdl:output name="echo3Response">
         <soap:header message="tns:echo3Response" part="header" use="literal">
         </soap:header>
-        <soap:body parts="result" use="literal"/>
+        <soap:body parts="parameters" use="literal"/>
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl?rev=583892&r1=583891&r2=583892&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl Thu Oct 11 10:32:27 2007
@@ -35,7 +35,7 @@
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="result" element="tns:getPriceResponse">
+    <wsdl:part name="parameters" element="tns:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPrice">



Mime
View raw message