You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/01/25 10:41:20 UTC
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
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
// <interface_name> ::= <scoped_name>
- 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);
};