cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r555939 - in /incubator/cxf/trunk: rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ rt/core/src/main/java/org/apache/cxf/binding/ systests/src/test/resources/wsdl/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/ws...
Date Fri, 13 Jul 2007 11:36:54 GMT
Author: mmao
Date: Fri Jul 13 04:36:52 2007
New Revision: 555939

URL: http://svn.apache.org/viewvc?view=rev&rev=555939
Log:
CXF-602, CXF-772
Out of band headers update

* Add support for the wrapper style
* Add support for the return types
* Fix addParameter in the parameterProcessor, 
     if we the parameter already exists, when adding an OUT parameter, it should turn out
to be an INOUT parameter


Added:
    incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
Modified:
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
    incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?view=diff&rev=555939&r1=555938&r2=555939
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Fri Jul 13 04:36:52 2007
@@ -374,7 +374,8 @@
         return sb;
     }
 
-    protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop)
{
+    protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop,
+                                         boolean isInput) {
         SoapHeader header = SOAPBindingUtil.getSoapHeader(ext);
 
         ServiceInfo serviceInfo = bop.getBinding().getService();
@@ -387,17 +388,44 @@
             if (def != null && schemas != null) {
                 javax.wsdl.Message msg = def.getMessage(header.getMessage());
                 if (msg != null) {
-                    MessageInfo minfo = bop.getOperationInfo().getInput();
-                    if (minfo == null) {
-                        minfo = new MessageInfo(null, msg.getQName());
-                    }
-                    buildMessage(minfo, msg, schemas);
+                    addOutOfBandParts(bop, msg, schemas, isInput);
                     serviceInfo.refresh();
                 } else {
                     //TODO: The header message is not defined in this wsdl, what to do
                 }
             }
         }
+    }
+
+    private void addOutOfBandParts(final BindingOperationInfo bop, final javax.wsdl.Message
msg,
+                                   final XmlSchemaCollection schemas, boolean isInput) {
+        MessageInfo minfo = null;
+        if (isInput) {
+            minfo = bop.getOperationInfo().getInput();
+        } else {
+            minfo = bop.getOperationInfo().getOutput();
+        }
+
+        if (minfo == null) {
+            minfo = new MessageInfo(null, msg.getQName());
+        }
+        buildMessage(minfo, msg, schemas);
+
+        // for wrapped style
+        OperationInfo unwrapped = bop.getOperationInfo().getUnwrappedOperation();
+        if (unwrapped == null) {
+            return;
+        }
+        if (isInput) {
+            minfo = unwrapped.getInput();
+        } else {
+            minfo = unwrapped.getOutput();
+        }
+
+        if (minfo == null) {
+            minfo = new MessageInfo(unwrapped, msg.getQName());
+        }
+        buildMessage(minfo, msg, schemas);
     }
 
     private void buildMessage(MessageInfo minfo, javax.wsdl.Message msg,

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java?view=diff&rev=555939&r1=555938&r2=555939
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
Fri Jul 13 04:36:52 2007
@@ -20,13 +20,15 @@
 package org.apache.cxf.binding;
 
 import java.util.Collection;
-import java.util.List;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.wsdl.Binding;
 import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
 import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.extensions.ElementExtensible;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.xml.namespace.QName;
 
@@ -100,7 +102,7 @@
 
     protected BindingInfo initializeBindingInfo(ServiceInfo service, Binding binding, BindingInfo
bi) {
         bi.setName(binding.getQName());
-        copyExtensors(bi, binding.getExtensibilityElements(), null);
+        copyExtensors(bi, binding, null);
 
         for (BindingOperation bop : cast(binding.getBindingOperations(), BindingOperation.class))
{
             String inName = null;
@@ -122,35 +124,40 @@
                 }
             }
             if (bop2 != null) {
-                copyExtensors(bop2, bop.getExtensibilityElements(), bop2);
+                copyExtensors(bop2, bop, bop2);
                 if (bop.getBindingInput() != null) {
-                    copyExtensors(bop2.getInput(), bop.getBindingInput().getExtensibilityElements(),
bop2);
+                    copyExtensors(bop2.getInput(), bop.getBindingInput(), bop2);
                 }
                 if (bop.getBindingOutput() != null) {
-                    copyExtensors(bop2.getOutput(), bop.getBindingOutput().getExtensibilityElements(),
-                                  bop2);
+                    copyExtensors(bop2.getOutput(), bop.getBindingOutput(), bop2);
                 }
                 for (BindingFault f : cast(bop.getBindingFaults().values(), BindingFault.class))
{
                     copyExtensors(bop2.getFault(new QName(service.getTargetNamespace(), f.getName())),
-                                  bop.getBindingFault(f.getName()).getExtensibilityElements(),
bop2);
+                                  bop.getBindingFault(f.getName()), bop2);
                 }
             }
         }
         return bi;
     }
 
-    private void copyExtensors(AbstractPropertiesHolder info, List<?> extList, BindingOperationInfo
bop) {
+    private void copyExtensors(AbstractPropertiesHolder info, ElementExtensible extElement,
+                               BindingOperationInfo bop) {
         if (info != null) {
-            for (ExtensibilityElement ext : cast(extList, ExtensibilityElement.class)) {
+            for (ExtensibilityElement ext : cast(extElement.getExtensibilityElements(),
+                                                 ExtensibilityElement.class)) {
                 info.addExtensor(ext);
-                if (bop != null) {
-                    addMessageFromBinding(ext, bop);
+                if (bop != null && extElement instanceof BindingInput) {
+                    addMessageFromBinding(ext, bop, true);
+                }
+                if (bop != null && extElement instanceof BindingOutput) {
+                    addMessageFromBinding(ext, bop, false);
                 }
             }
         }
     }
 
-    protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop)
{
+    protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop,
+                                         boolean isInput) {
     }
 
     public void addListener(Destination d, Endpoint e) {

Added: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl?view=auto&rev=555939
==============================================================================
--- incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl (added)
+++ incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl Fri Jul
13 04:36:52 2007
@@ -0,0 +1,105 @@
+<?xml version="1.0" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+  <wsdl:definitions
+      name="PizzaService"
+      targetNamespace="http://cxf.apache.org/pizza_wrapped"
+      xmlns:tns="http://cxf.apache.org/pizza_wrapped"
+      xmlns:types="http://cxf.apache.org/pizza_wrapped/types"
+      xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+      xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+    <wsdl:types>
+      <xsd:schema targetNamespace="http://cxf.apache.org/pizza_wrapped/types"
+                  xmlns:tns="http://cxf.apache.org/pizza_wrapped/types"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  elementFormDefault="qualified"
+                  version="1.0">
+
+        <xsd:element name="CallerIDHeader" type="tns:CallerIDHeaderType" />
+
+        <xsd:complexType name="CallerIDHeaderType">
+          <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string" />
+            <xsd:element name="PhoneNumber" type="xsd:string" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:element name="OrderPizza" type="tns:OrderPizzaType" />
+
+        <xsd:complexType name="OrderPizzaType">
+          <xsd:sequence>
+            <xsd:element name="Toppings" type="tns:ToppingsListType" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:element name="OrderPizzaResponse" type="tns:OrderPizzaResponseType" />
+
+        <xsd:complexType name="OrderPizzaResponseType">
+          <xsd:sequence>
+            <xsd:element name="MinutesUntilReady" type="xsd:int" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:complexType name="ToppingsListType">
+          <xsd:sequence>
+            <xsd:element name="Topping" type="xsd:string" minOccurs="0" maxOccurs="unbounded"
/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:schema>
+    </wsdl:types>
+
+    <wsdl:portType name="Pizza">
+      <wsdl:operation name="OrderPizza">
+        <wsdl:input message="tns:OrderPizzaRequest" />
+        <wsdl:output message="tns:OrderPizzaResponse" />
+      </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:message name="CallerIDHeader">
+      <wsdl:part name="callerID" element="types:CallerIDHeader"/>
+    </wsdl:message>
+
+    <wsdl:message name="OrderPizzaRequest">
+      <wsdl:part name="body" element="types:OrderPizza"/>
+    </wsdl:message>
+    <wsdl:message name="OrderPizzaResponse">
+      <wsdl:part name="body" element="types:OrderPizzaResponse"/>
+    </wsdl:message>
+
+  <wsdl:binding name="PizzaPortBinding" type="tns:Pizza">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <wsdl:operation name="OrderPizza">
+      <soap:operation soapAction=""/>
+      <wsdl:input>
+        <soap:header message="tns:CallerIDHeader" part="callerID" use="literal" />
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+
+  <wsdl:service name="PizzaService">
+    <wsdl:port name="PizzaPort" binding="tns:PizzaPortBinding">
+      <soap:address location="http://localhost:9013/pizza_service/services/PizzaService"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?view=diff&rev=555939&r1=555938&r2=555939
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Fri Jul 13 04:36:52 2007
@@ -101,7 +101,7 @@
         return ParameterMapper.map(part, style, context);
     }
 
-    private JavaParameter addParameter(JavaMethod method, JavaParameter parameter) throws
ToolException {
+    protected JavaParameter addParameter(JavaMethod method, JavaParameter parameter) throws
ToolException {
         if (parameter == null) {
             return null;
         }
@@ -137,6 +137,21 @@
         return StringUtils.isEmpty(value) || Boolean.valueOf(value).booleanValue();
     }
 
+    private int countOutOfBandHeader(MessageInfo message) {
+        int count = 0;
+        for (MessagePartInfo part : message.getMessageParts()) {
+            if (isOutOfBandHeader(part)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    private boolean messagePartsNotUnique(final MessageInfo message) {
+        int count = countOutOfBandHeader(message);
+        return message.getMessageParts().size() - count > 1;
+    }
+
     @SuppressWarnings("unchecked")
     private void processInput(JavaMethod method, MessageInfo inputMessage) throws ToolException
{
         if (requireOutOfBandHeader()) {
@@ -151,7 +166,6 @@
             if (isOutOfBandHeader(part) && !requireOutOfBandHeader()) {
                 continue;
             }
-
             addParameter(method, getParameterFromPart(part, JavaType.Style.IN));
         }
     }
@@ -160,7 +174,7 @@
     private void processWrappedInput(JavaMethod method, MessageInfo inputMessage) throws
ToolException {
         List<MessagePartInfo> inputParts = inputMessage.getMessageParts();
 
-        if (inputParts.size() > 1) {
+        if (messagePartsNotUnique(inputMessage)) {
             processInput(method, inputMessage);
             return;
         } else if (inputParts.isEmpty()) {
@@ -182,6 +196,16 @@
 
             addParameter(method, jp);
         }
+
+        // Adding out of band headers
+        if (countOutOfBandHeader(inputMessage) > 0) {
+            for (MessagePartInfo hpart : inputMessage.getMessageParts()) {
+                if (!isOutOfBandHeader(hpart) || !requireOutOfBandHeader()) {
+                    continue;
+                }
+                addParameter(method, getParameterFromPart(hpart, JavaType.Style.IN));
+            }
+        }
     }
 
     @SuppressWarnings("unchecked")
@@ -222,15 +246,32 @@
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void processWrappedOutput(JavaMethod method,
                                       MessageInfo inputMessage,
                                       MessageInfo outputMessage) throws ToolException {
 
+        processWrappedAbstractOutput(method, inputMessage, outputMessage);
+
+        // process out of band headers
+        if (countOutOfBandHeader(outputMessage) > 0) {
+            for (MessagePartInfo hpart : outputMessage.getMessageParts()) {
+                if (!isOutOfBandHeader(hpart) || !requireOutOfBandHeader()) {
+                    continue;
+                }
+                addParameter(method, getParameterFromPart(hpart, JavaType.Style.OUT));
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void processWrappedAbstractOutput(JavaMethod method,
+                                              MessageInfo inputMessage,
+                                              MessageInfo outputMessage) throws ToolException
{
+
         List<MessagePartInfo> outputParts = outputMessage.getMessageParts();
         List<MessagePartInfo> inputParts = inputMessage.getMessageParts();
 
-        if (inputParts.size() > 1 || outputParts.size() > 1) {
+        if (messagePartsNotUnique(inputMessage) || messagePartsNotUnique(outputMessage))
{
             processOutput(method, inputMessage, outputMessage);
             return;
         }
@@ -288,6 +329,7 @@
             }
 
         }
+
         for (QName outElement : outputWrapElement) {
             if ("return".equals(outElement.getLocalPart())) {
                 if (method.getReturn() != null) {

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java?view=diff&rev=555939&r1=555938&r2=555939
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
Fri Jul 13 04:36:52 2007
@@ -37,6 +37,14 @@
             throw new RuntimeException("WebParamAnnotator only annotate the JavaParameter");
         }
         JavaMethod method = parameter.getMethod();
+
+        if (method.hasParameter(parameter.getName())) {
+            JavaParameter paramInList = method.getParameter(parameter.getName());
+            if (paramInList.isIN() && parameter.isOUT()) {
+                parameter.setStyle(JavaType.Style.INOUT);
+            }
+        }
+
         JavaAnnotation webParamAnnotation = new JavaAnnotation("WebParam");
         String name = parameter.getName();
         String targetNamespace = method.getInterface().getNamespace();
@@ -45,7 +53,7 @@
         if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT
             || parameter.isHeader()) {
             targetNamespace = parameter.getTargetNamespace();
-            
+
             if (parameter.getQName() != null) {
                 name = parameter.getQName().getLocalPart();
             }

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java?view=diff&rev=555939&r1=555938&r2=555939
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
Fri Jul 13 04:36:52 2007
@@ -48,6 +48,7 @@
 
         ExtendedURIResolver resolver = new ExtendedURIResolver();
         InputSource in = resolver.resolve(resolvedSchemaLocation, null);
-        assertTrue(in.getSystemId().indexOf("cxf-common-schemas") != -1);
+        assertTrue(in.getSystemId().indexOf("common") != -1);
+        assertTrue(in.getSystemId().indexOf("/schemas/wsdl/ws-addr.xsd") != -1);
     }
 }

Added: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java?view=auto&rev=555939
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
(added)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java
Fri Jul 13 04:36:52 2007
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal;
+
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.model.JavaMethod;
+import org.apache.cxf.tools.common.model.JavaParameter;
+import org.apache.cxf.tools.common.model.JavaType;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ParameterProcessorTest extends Assert {
+    @Test
+    public void testAddParameter() throws Exception {
+        ParameterProcessor processor = new ParameterProcessor(new ToolContext());
+
+        JavaMethod method = new JavaMethod();
+        JavaParameter p1 = new JavaParameter("request", String.class.getName(), null);
+        p1.setStyle(JavaType.Style.IN);
+        processor.addParameter(method, p1);
+
+        JavaParameter p2 = new JavaParameter("request", String.class.getName(), null);
+        p2.setStyle(JavaType.Style.OUT);
+        processor.addParameter(method, p2);
+
+        assertEquals(1, method.getParameters().size());
+        assertEquals(JavaType.Style.INOUT, method.getParameters().get(0).getStyle());
+    }
+}

Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java?view=diff&rev=555939&r1=555938&r2=555939
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java
Fri Jul 13 04:36:52 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class CatalogTest extends ProcessorTestBase {



Mime
View raw message