Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 92169 invoked from network); 7 Sep 2006 03:51:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Sep 2006 03:51:31 -0000 Received: (qmail 54543 invoked by uid 500); 7 Sep 2006 03:51:30 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 54495 invoked by uid 500); 7 Sep 2006 03:51:30 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 54486 invoked by uid 99); 7 Sep 2006 03:51:30 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Sep 2006 20:51:30 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Sep 2006 20:51:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 875B11A981A; Wed, 6 Sep 2006 20:51:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r440966 - /incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Date: Thu, 07 Sep 2006 03:51:09 -0000 To: cxf-commits@incubator.apache.org From: tli@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060907035109.875B11A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tli Date: Wed Sep 6 20:51:08 2006 New Revision: 440966 URL: http://svn.apache.org/viewvc?view=rev&rev=440966 Log: add support for wsdl operation parametor ordering Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?view=diff&rev=440966&r1=440965&r2=440966 ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original) +++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Wed Sep 6 20:51:08 2006 @@ -292,23 +292,24 @@ OperationInfo opInfo = inf.addOperation(new QName(inf.getName().getNamespaceURI(), op.getName())); opInfo.setProperty(WSDL_OPERATION, op); Input input = op.getInput(); + List paramOrder = op.getParameterOrdering(); if (input != null) { MessageInfo minfo = opInfo.createMessage(input.getMessage().getQName()); opInfo.setInput(input.getName(), minfo); - buildMessage(minfo, input.getMessage()); + buildMessage(minfo, input.getMessage(), paramOrder); } Output output = op.getOutput(); if (output != null) { MessageInfo minfo = opInfo.createMessage(output.getMessage().getQName()); opInfo.setOutput(output.getName(), minfo); - buildMessage(minfo, output.getMessage()); + buildMessage(minfo, output.getMessage(), paramOrder); } Map m = op.getFaults(); for (Map.Entry rawentry : m.entrySet()) { Map.Entry entry = cast(rawentry, String.class, Fault.class); FaultInfo finfo = opInfo.addFault(new QName(inf.getName().getNamespaceURI(), entry.getKey()), entry.getValue().getMessage().getQName()); - buildMessage(finfo, entry.getValue().getMessage()); + buildMessage(finfo, entry.getValue().getMessage(), paramOrder); } checkForWrapped(opInfo); } @@ -429,8 +430,8 @@ return false; } - private void buildMessage(AbstractMessageContainer minfo, Message msg) { - for (Part part : cast(msg.getOrderedParts(null), Part.class)) { + private void buildMessage(AbstractMessageContainer minfo, Message msg, List paramOrder) { + for (Part part : cast(msg.getOrderedParts(paramOrder), Part.class)) { MessagePartInfo pi = minfo.addMessagePart(part.getName()); if (part.getTypeName() != null) { pi.setTypeQName(part.getTypeName());