Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 84986 invoked from network); 25 Jan 2011 09:41:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Jan 2011 09:41:43 -0000 Received: (qmail 75132 invoked by uid 500); 25 Jan 2011 09:41:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 75015 invoked by uid 500); 25 Jan 2011 09:41:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 75008 invoked by uid 99); 25 Jan 2011 09:41:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jan 2011 09:41:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jan 2011 09:41:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1E07D2388A02; Tue, 25 Jan 2011 09:41:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1063191 - in /cxf/branches/2.3.x-fixes: ./ tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java tools/corba/src/test/resources/idl/PragmaPrefix.idl Date: Tue, 25 Jan 2011 09:41:20 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110125094120.1E07D2388A02@eris.apache.org> Author: ffang Date: Tue Jan 25 09:41:19 2011 New Revision: 1063191 URL: http://svn.apache.org/viewvc?rev=1063191&view=rev Log: Merged revisions 1063185 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1063185 | ffang | 2011-01-25 17:32:08 +0800 (二, 25 1 2011) | 1 line [CXF-3286]idl2wsdl tool should be able to honor local keyword ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/PragmaPrefix.idl Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java?rev=1063191&r1=1063190&r2=1063191&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java (original) +++ cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java Tue Jan 25 09:41:19 2011 @@ -82,8 +82,10 @@ public class PortTypeVisitor extends Vis // ::= - AST identifierNode = node.getFirstChild(); - + AST identifierNode = node.getFirstChild(); + if (identifierNode.getText().equals("local")) { + identifierNode = identifierNode.getNextSibling(); + } // Check if its a forward declaration if (identifierNode.getFirstChild() == null && identifierNode.getNextSibling() == null) { visitForwardDeclaredInterface(identifierNode); Modified: cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/PragmaPrefix.idl URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/PragmaPrefix.idl?rev=1063191&r1=1063190&r2=1063191&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/PragmaPrefix.idl (original) +++ cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/PragmaPrefix.idl Tue Jan 25 09:41:19 2011 @@ -13,7 +13,7 @@ module Test2 { const char NEW = '\65'; #endif - interface ForTesting { + local interface ForTesting { void greetMe(in string who); };