cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r724481 - in /cxf/trunk/tools/wsdlto: frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ test/src/test/java/org/...
Date Mon, 08 Dec 2008 21:04:41 GMT
Author: dkulp
Date: Mon Dec  8 13:04:41 2008
New Revision: 724481

URL: http://svn.apache.org/viewvc?rev=724481&view=rev
Log:
[CXF-1935] Bunch of issues with enableAsyncMapping not being picked up all the time.

Added:
    cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
  (contents, props changed)
      - copied, changed from r724441, cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl
Modified:
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java?rev=724481&r1=724480&r2=724481&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java
Mon Dec  8 13:04:41 2008
@@ -28,15 +28,14 @@
 
 public class JAXWSBinding implements ExtensibilityElement, Serializable {
 
-    private boolean enableAsyncMapping;
-
-    private boolean enableMime;
+    private Boolean enableAsyncMapping;
+    private Boolean enableWrapperStyle;
+    private Boolean enableMime;
 
     private Element element;
     private boolean required;
     private QName elementType;
 
-    private boolean enableWrapperStyle = true;
 
     private String documentBaseURI;
 
@@ -87,25 +86,31 @@
     }
 
     public boolean isEnableMime() {
-        return enableMime;
+        return enableMime == null ? false : enableMime;
+    }
+    public boolean isSetEnableMime() {
+        return enableMime != null;
     }
-
     public void setEnableMime(boolean enableMime) {
         this.enableMime = enableMime;
     }
 
     public boolean isEnableAsyncMapping() {
-        return this.enableAsyncMapping;
+        return enableAsyncMapping == null ? false : enableAsyncMapping;
+    }
+    public boolean isSetEnableAsyncMapping() {
+        return enableAsyncMapping != null;
     }
-
     public void setEnableAsyncMapping(boolean enableAsync) {
         this.enableAsyncMapping = enableAsync;
     }
 
     public boolean isEnableWrapperStyle() {
-        return enableWrapperStyle;
+        return enableWrapperStyle == null ? true : enableWrapperStyle;
+    }
+    public boolean isSetEnableWrapperStyle() {
+        return enableWrapperStyle != null;
     }
-
     public void setEnableWrapperStyle(boolean pEnableWrapperStyle) {
         this.enableWrapperStyle = pEnableWrapperStyle;
     }

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?rev=724481&r1=724480&r2=724481&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Mon Dec  8 13:04:41 2008
@@ -59,7 +59,9 @@
     public void process(JavaInterface intf, OperationInfo operation) throws ToolException
{
         JavaMethod method = new MethodMapper().map(operation);
         method.setInterface(intf);
-        processMethod(method, operation, null);
+        
+        processMethod(method, operation);
+        
         Collection<FaultInfo> faults = operation.getFaults();
         FaultProcessor faultProcessor = new FaultProcessor(context);
         faultProcessor.process(method, faults);
@@ -69,8 +71,8 @@
         intf.addMethod(method);
     }
 
-    void processMethod(JavaMethod method, OperationInfo operation,
-                              JAXWSBinding globalBinding) throws ToolException {
+    void processMethod(JavaMethod method, 
+                       OperationInfo operation) throws ToolException {
         if (isAsyncMethod(method)) {
             return;
         }
@@ -102,21 +104,43 @@
         method.annotate(new WebResultAnnotator());
 
         JAXWSBinding opBinding = (JAXWSBinding)operation.getExtensor(JAXWSBinding.class);
-
+        JAXWSBinding ptBinding = operation.getInterface().getExtensor(JAXWSBinding.class);
+        JAXWSBinding defBinding = operation.getInterface().getService()
+            .getDescription().getExtensor(JAXWSBinding.class);
+        
         boolean enableAsync = false;
-        if (globalBinding != null && globalBinding.isEnableAsyncMapping()
-            || opBinding != null && opBinding.isEnableAsyncMapping()) {
-            enableAsync = true;
+        boolean enableMime = false;
+        if (defBinding != null) {
+            if (defBinding.isSetEnableMime()) {
+                enableMime = defBinding.isEnableMime();
+            }
+            if (defBinding.isSetEnableAsyncMapping()) {
+                enableAsync = defBinding.isEnableAsyncMapping();
+            }
         }
-
-
+        if (ptBinding != null) {
+            if (ptBinding.isSetEnableMime()) {
+                enableMime = ptBinding.isEnableMime();
+            }
+            if (ptBinding.isSetEnableAsyncMapping()) {
+                enableAsync = ptBinding.isEnableAsyncMapping();
+            }
+        }
+        if (opBinding != null) {
+            if (opBinding.isSetEnableMime()) {
+                enableMime = opBinding.isEnableMime();
+            }
+            if (opBinding.isSetEnableAsyncMapping()) {
+                enableAsync = opBinding.isEnableAsyncMapping();
+            }
+        }
+        
         if (!method.isOneWay()
-            && enableAsync && !isAddedAsyMethod(method)) {
+            && enableAsync && !isAddedAsycMethod(method)) {
             addAsyncMethod(method);
         }
 
-        if (globalBinding != null && globalBinding.isEnableMime()
-            || opBinding != null && opBinding.isEnableMime()) {
+        if (enableMime) {
             method.setMimeEnable(true);
         }
     }
@@ -154,9 +178,14 @@
     }
 
     private boolean isAsyncMethod(JavaMethod method) {
-        if (method.getName().toLowerCase()
-            .equals((method.getOperationName() + ToolConstants.ASYNC_METHOD_SUFFIX).toLowerCase()))
{
-            return true;
+        if (method.getName().endsWith(ToolConstants.ASYNC_METHOD_SUFFIX)) {
+            if (method.getReturn().getClassName().startsWith("Response<")) {
+                return true;
+            } else if (method.getParameterCount() > 0
+                && method.getParameters().get(method.getParameterCount() - 1)
+                    .getClassName().startsWith("AsyncHandler<")) {
+                return true;
+            }
         }
         return false;
     }
@@ -256,7 +285,7 @@
         return sb.toString();
     }
 
-    private boolean isAddedAsyMethod(JavaMethod method) {
+    private boolean isAddedAsycMethod(JavaMethod method) {
         List<JavaMethod> jmethods = method.getInterface().getMethods();
         int counter = 0;
         for (JavaMethod jm : jmethods) {

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?rev=724481&r1=724480&r2=724481&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
Mon Dec  8 13:04:41 2008
@@ -383,12 +383,12 @@
                     // changed wrapper style
 
                     jm.setWrapperStyle(false);
-                    processor.processMethod(jm, bop.getOperationInfo(), jaxwsBinding);
+                    processor.processMethod(jm, bop.getOperationInfo());
                     jm.getAnnotationMap().remove("ResponseWrapper");
                     jm.getAnnotationMap().remove("RequestWrapper");
 
                 } else {
-                    processor.processMethod(jm, bop.getOperationInfo(), jaxwsBinding);
+                    processor.processMethod(jm, bop.getOperationInfo());
 
                 }
 

Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=724481&r1=724480&r2=724481&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Mon Dec  8 13:04:41 2008
@@ -536,7 +536,11 @@
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug627/hello_world.wsdl"));
         env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/bug627/async_binding.xml"));
         processor.setContext(env);
-        processor.execute();
+        try {
+            processor.execute();
+        } catch (Exception ex) {
+            //ignore
+        }
 
 
         Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter");

Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=724481&r1=724480&r2=724481&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Mon Dec  8 13:04:41 2008
@@ -283,7 +283,7 @@
     }
 
     @Test
-    public void testAsynMethod() throws Exception {
+    public void testAsyncMethod() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_async.wsdl"));
         processor.setContext(env);
         processor.execute();
@@ -322,6 +322,81 @@
     }
 
     @Test
+    public void testAsyncMethodNoService() throws Exception {
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_async_noservice.wsdl"));
+        processor.setContext(env);
+        processor.execute();
+
+        assertNotNull(output);
+
+        File org = new File(output, "org");
+        assertTrue(org.exists());
+        File apache = new File(org, "apache");
+        assertTrue(apache.exists());
+        File cxf = new File(apache, "cxf");
+        assertTrue(cxf.exists());
+        File w2j = new File(cxf, "w2j");
+        assertTrue(w2j.exists());
+        File async = new File(w2j, "hello_world_async_soap_http");
+        assertTrue(async.exists());
+
+        File[] files = async.listFiles();
+        assertEquals(Arrays.asList(files).toString(), 9, files.length);
+
+        Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterAsync");
+
+        Method method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
+                                                                            javax.xml.ws.AsyncHandler.class});
+        WebMethod webMethodAnno1 = AnnotationUtil.getPrivMethodAnnotation(method1, WebMethod.class);
+
+        assertEquals(method1.getName() + "()" + " Annotation : WebMethod.operationName ",
"greetMeSometime",
+                     webMethodAnno1.operationName());
+
+        java.lang.reflect.Method method2 = clz.getMethod("greetMeSometimeAsync",
+                                                         new Class[] {java.lang.String.class});
+        WebMethod webMethodAnno2 = AnnotationUtil.getPrivMethodAnnotation(method2, WebMethod.class);
+        assertEquals(method2.getName() + "()" + " Annotation : WebMethod.operationName ",
"greetMeSometime",
+                     webMethodAnno2.operationName());
+
+        method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
+                                                                     javax.xml.ws.AsyncHandler.class});
+        try {
+            method1 = clz.getMethod("testIntAsync", new Class[] {Integer.TYPE,
+                                                                 javax.xml.ws.AsyncHandler.class});
+            fail("Should not have generated testIntAsync");
+        } catch (NoSuchMethodException ex) {
+            //ignore
+        }
+
+        
+        clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterDAsync");
+        method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
+                                                                     javax.xml.ws.AsyncHandler.class});
+        
+        clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterCAsync");
+        try {
+            method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
+                                                                         javax.xml.ws.AsyncHandler.class});
+            fail("Should not have generated greetMeSometimeAsync");
+        } catch (NoSuchMethodException ex) {
+            //ignore
+        }
+        method1 = clz.getMethod("testIntAsync", new Class[] {Integer.TYPE,
+                                                             javax.xml.ws.AsyncHandler.class});
+        
+        clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterBAsync");
+        try {
+            method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
+                                                                         javax.xml.ws.AsyncHandler.class});
+            fail("Should not have generated greetMeSometimeAsync");
+        } catch (NoSuchMethodException ex) {
+            //ignore
+        }
+        method1 = clz.getMethod("testIntAsync", new Class[] {Integer.TYPE,
+                                                             javax.xml.ws.AsyncHandler.class});
+    }    
+    
+    @Test
     public void testHelloWorldSoap12() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_soap12.wsdl"));
         processor.setContext(env);

Copied: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
(from r724441, cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl?p2=cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl&p1=cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl&r1=724441&r2=724481&rev=724481&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async.wsdl (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
Mon Dec  8 13:04:41 2008
@@ -17,92 +17,111 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:http-conf="http://schemas.iona.com/transports/http/configuration" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://cxf.apache.org/w2j/hello_world_async_soap_http" 
-    xmlns:x1="http://cxf.apache.org/w2j/hello_world_async_soap_http/types" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+<wsdl:definitions
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:http-conf="http://schemas.iona.com/transports/http/configuration"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://cxf.apache.org/w2j/hello_world_async_soap_http"
+    xmlns:x1="http://cxf.apache.org/w2j/hello_world_async_soap_http/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
-    targetNamespace="http://cxf.apache.org/w2j/hello_world_async_soap_http" 
+    targetNamespace="http://cxf.apache.org/w2j/hello_world_async_soap_http"
     name="HelloWorld">
     <jaxws:bindings>
-	<jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
+        <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
     </jaxws:bindings>
     <wsdl:types>
-	<schema 
-	    targetNamespace="http://cxf.apache.org/w2j/hello_world_async_soap_http/types" 
-	    xmlns="http://www.w3.org/2001/XMLSchema" 
-	    xmlns:x1="http://cxf.apache.org/w2j/hello_world_async_soap_http/types" 
-	    elementFormDefault="qualified">
-	    <element name="greetMeSometime">
-		<complexType>
-		    <sequence>
-			<element name="requestType" type="xsd:string"/>
-		    </sequence>
-		</complexType>
-	    </element>
-	    <element name="greetMeSometimeResponse">
-		<complexType>
-		    <sequence>
-			<element name="responseType" type="xsd:string"/>
-		    </sequence>
-		</complexType>
-	    </element>		
-      	<element name="testInt" type="xsd:int"/>
-        <element name="testIntResponse" type="xsd:int"/>
-	</schema>
+        <schema
+            targetNamespace="http://cxf.apache.org/w2j/hello_world_async_soap_http/types"
+            xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:x1="http://cxf.apache.org/w2j/hello_world_async_soap_http/types"
+            elementFormDefault="qualified">
+            <element name="greetMeSometime">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeSometimeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="testInt" type="xsd:int"/>
+            <element name="testIntResponse" type="xsd:int"/>
+        </schema>
     </wsdl:types>
     <wsdl:message name="greetMeSometimeRequest">
-	<wsdl:part name="in" element="x1:greetMeSometime"/>
+        <wsdl:part name="in" element="x1:greetMeSometime"/>
     </wsdl:message>
     <wsdl:message name="greetMeSometimeResponse">
-	<wsdl:part name="out" element="x1:greetMeSometimeResponse"/>
+        <wsdl:part name="out" element="x1:greetMeSometimeResponse"/>
     </wsdl:message>
     <wsdl:message name="testIntRequest">
-    	<wsdl:part name="parameters" element="x1:testInt"></wsdl:part>
+        <wsdl:part name="parameters" element="x1:testInt"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="testIntResponse">
-    	<wsdl:part name="parameters" element="x1:testIntResponse"></wsdl:part>
+        <wsdl:part name="parameters" element="x1:testIntResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="GreeterAsync">
-	<wsdl:operation name="greetMeSometime">
-	    <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
-	    <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
-	</wsdl:operation>
-	<wsdl:operation name="testInt">
-		<wsdl:input message="tns:testIntRequest"></wsdl:input>
-		<wsdl:output message="tns:testIntResponse"></wsdl:output>
-	</wsdl:operation>
+        <jaxws:bindings>
+            <jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
+        </jaxws:bindings>
+        <wsdl:operation name="greetMeSometime">
+            <jaxws:bindings>
+                <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
+            </jaxws:bindings>
+            <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
+            <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="testInt">
+            <wsdl:input message="tns:testIntRequest"></wsdl:input>
+            <wsdl:output message="tns:testIntResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:portType name="GreeterBAsync">
+        <jaxws:bindings>
+            <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
+        </jaxws:bindings>
+        <wsdl:operation name="greetMeSometime">
+            <jaxws:bindings>
+                <jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
+            </jaxws:bindings>
+            <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
+            <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="testInt">
+            <wsdl:input message="tns:testIntRequest"></wsdl:input>
+            <wsdl:output message="tns:testIntResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:portType name="GreeterCAsync">
+        <wsdl:operation name="greetMeSometime">
+            <jaxws:bindings>
+                <jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
+            </jaxws:bindings>
+            <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
+            <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="testInt">
+            <wsdl:input message="tns:testIntRequest"></wsdl:input>
+            <wsdl:output message="tns:testIntResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+        <wsdl:portType name="GreeterDAsync">
+        <wsdl:operation name="greetMeSometime">
+            <jaxws:bindings>
+            </jaxws:bindings>
+            <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
+            <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="testInt">
+            <wsdl:input message="tns:testIntRequest"></wsdl:input>
+            <wsdl:output message="tns:testIntResponse"></wsdl:output>
+        </wsdl:operation>
     </wsdl:portType>
-    <wsdl:binding name="GreeterAsync_SOAPBinding" type="tns:GreeterAsync">
-	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-	<wsdl:operation name="greetMeSometime">
-	    <soap:operation style="document"/>
-	    <wsdl:input>
-		<soap:body use="literal"/>
-	    </wsdl:input>
-	    <wsdl:output>
-		<soap:body use="literal"/>
-	    </wsdl:output>
-	</wsdl:operation>
-	<wsdl:operation name="testInt">
-	    <soap:operation style="document"/>
-	    <wsdl:input>
-		<soap:body use="literal"/>
-	    </wsdl:input>
-	    <wsdl:output>
-		<soap:body use="literal"/>
-	    </wsdl:output>
-	</wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-	<wsdl:port name="SoapPort" binding="tns:GreeterAsync_SOAPBinding">
-	    <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-	    <http-conf:client/>
-	    <http-conf:server/>
-	</wsdl:port>
-    </wsdl:service>
 </wsdl:definitions>

Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message