You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/12 19:27:40 UTC

svn commit: r752962 - in /cxf/branches/2.1.x-fixes: ./ tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl

Author: dkulp
Date: Thu Mar 12 18:27:39 2009
New Revision: 752962

URL: http://svn.apache.org/viewvc?rev=752962&view=rev
Log:
Merged revisions 752961 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r752961 | dkulp | 2009-03-12 14:26:02 -0400 (Thu, 12 Mar 2009) | 2 lines
  
  [CXF-2108] Make sure Array's have the correct scopes in idl2wsdl so that they can be found.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
    cxf/branches/2.1.x-fixes/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 18:27:39 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
 732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
 8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890,750059-750060,750302,750591,750689,750935,751067-751110,751233,751527,751567,751576,751607,751732,751740,751787,751828,751840,751972-751974,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752883
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
 732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
 8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890,750059-750060,750302,750591,750689,750935,751067-751110,751233,751527,751567,751576,751607,751732,751740,751787,751828,751840,751972-751974,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752883,752961

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java?rev=752962&r1=752961&r2=752962&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java (original)
+++ cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java Thu Mar 12 18:27:39 2009
@@ -99,7 +99,8 @@
                 
                 while (identifierNode != null) {
                     if (ArrayVisitor.accept(identifierNode)) {
-                        ArrayVisitor arrayVisitor = new ArrayVisitor(getScope(),
+                        ArrayVisitor arrayVisitor = new ArrayVisitor(new Scope(getScope(),
+                                                                               identifierNode.getText()),
                                                                      definition,
                                                                      schema,
                                                                      wsdlVisitor,

Modified: cxf/branches/2.1.x-fixes/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl?rev=752962&r1=752961&r2=752962&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl Thu Mar 12 18:27:39 2009
@@ -1,67 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 targetNamespace="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:tns="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:corba="http://cxf.apache.org/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap">
-    <corba:array xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemtype="corba:string" elemname="item" bound="10" repositoryID="IDL:AnonStrings:1.0" type="ns4:AnonStrings" name="AnonStrings" />
-    <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemtype="corba:string" elemname="item" bound="0" repositoryID="IDL:AnonStrings/SequenceBoundedString:1.0" type="ns4:AnonStrings.SequenceBoundedString" name="AnonStrings.SequenceBoundedString" />
-    <corba:anonsequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemtype="corba:string" elemname="item" bound="0" type="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString" name="AnonStrings._Anon1_SequenceSequenceBoundedString" />
-    <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap" xmlns="" elemtype="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString" elemname="item" bound="0" repositoryID="IDL:AnonStrings/SequenceSequenceBoundedString:1.0" type="ns5:AnonStrings.SequenceSequenceBoundedString" name="AnonStrings.SequenceSequenceBoundedString" />
-    <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemtype="corba:string" elemname="item" bound="20" repositoryID="IDL:AnonStrings/BoundedSequenceBoundedString:1.0" type="ns4:AnonStrings.BoundedSequenceBoundedString" name="AnonStrings.BoundedSequenceBoundedString" />
-    <corba:anonsequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemtype="corba:string" elemname="item" bound="20" type="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" name="AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" />
-    <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap" xmlns="" elemtype="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" elemname="item" bound="0" repositoryID="IDL:AnonStrings/SequenceBoundedSequenceBoundedString:1.0" type="ns5:AnonStrings.SequenceBoundedSequenceBoundedString" name="AnonStrings.SequenceBoundedSequenceBoundedString" />
+    <corba:array xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemname="item" bound="10" elemtype="corba:string" repositoryID="IDL:AnonStrings/String5Array:1.0" type="ns4:AnonStrings.String5Array" name="AnonStrings.String5Array" />
+    <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemname="item" bound="0" elemtype="corba:string" repositoryID="IDL:AnonStrings/SequenceBoundedString:1.0" type="ns4:AnonStrings.SequenceBoundedString" name="AnonStrings.SequenceBoundedString" />
+    <corba:anonsequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemname="item" bound="0" elemtype="corba:string" type="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString" name="AnonStrings._Anon1_SequenceSequenceBoundedString" />
+    <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap" xmlns="" elemname="item" bound="0" elemtype="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString" repositoryID="IDL:AnonStrings/SequenceSequenceBoundedString:1.0" type="ns5:AnonStrings.SequenceSequenceBoundedString" name="AnonStrings.SequenceSequenceBoundedString" />
+    <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemname="item" bound="20" elemtype="corba:string" repositoryID="IDL:AnonStrings/BoundedSequenceBoundedString:1.0" type="ns4:AnonStrings.BoundedSequenceBoundedString" name="AnonStrings.BoundedSequenceBoundedString" />
+    <corba:anonsequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="" elemname="item" bound="20" elemtype="corba:string" type="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" name="AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" />
+    <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap" xmlns="" elemname="item" bound="0" elemtype="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" repositoryID="IDL:AnonStrings/SequenceBoundedSequenceBoundedString:1.0" type="ns5:AnonStrings.SequenceBoundedSequenceBoundedString" name="AnonStrings.SequenceBoundedSequenceBoundedString" />
     <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring" repositoryID="IDL:AnonStrings/anonStringStruct:1.0" type="AnonStrings.anonStringStruct" name="AnonStrings.anonStringStruct">
-      <corba:member name="unboundedString" idltype="corba:string" />
-      <corba:member name="anotherUnboundedString" idltype="corba:string" />
-      <corba:member name="anonBoundedString" idltype="corba:string" />
-      <corba:member name="anotherAnonBoundedString" idltype="corba:string" />
+      <corba:member idltype="corba:string" name="unboundedString" />
+      <corba:member idltype="corba:string" name="anotherUnboundedString" />
+      <corba:member idltype="corba:string" name="anonBoundedString" />
+      <corba:member idltype="corba:string" name="anotherAnonBoundedString" />
     </corba:struct>
     <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring" repositoryID="IDL:AnonStrings/typedefAnonStringStruct:1.0" type="AnonStrings.typedefAnonStringStruct" name="AnonStrings.typedefAnonStringStruct">
-      <corba:member name="unboundedString" idltype="corba:string" />
-      <corba:member name="anotherUnboundedString" idltype="corba:string" />
-      <corba:member name="anonBoundedString" idltype="corba:string" />
-      <corba:member name="anotherAnonBoundedString" idltype="corba:string" />
+      <corba:member idltype="corba:string" name="unboundedString" />
+      <corba:member idltype="corba:string" name="anotherUnboundedString" />
+      <corba:member idltype="corba:string" name="anonBoundedString" />
+      <corba:member idltype="corba:string" name="anotherAnonBoundedString" />
     </corba:struct>
     <corba:alias xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap" basetype="AnonStrings.typedefAnonStringStruct" repositoryID="IDL:AnonStrings/myTypedefAnonStringStruct:1.0" name="AnonStrings.myTypedefAnonStringStruct" />
     <corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring" discriminator="corba:long" repositoryID="IDL:AnonStrings/anonStringUnion:1.0" type="AnonStrings.anonStringUnion" name="AnonStrings.anonStringUnion">
-      <corba:unionbranch name="anonStringUnion1" idltype="corba:string">
+      <corba:unionbranch idltype="corba:string" name="anonStringUnion1">
         <corba:case label="1" />
       </corba:unionbranch>
-      <corba:unionbranch name="anonStringUnionDefault" idltype="corba:string" default="true" />
+      <corba:unionbranch default="true" idltype="corba:string" name="anonStringUnionDefault" />
     </corba:union>
     <corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring" discriminator="corba:long" repositoryID="IDL:AnonStrings/typedefAnonStringUnion:1.0" type="AnonStrings.typedefAnonStringUnion" name="AnonStrings.typedefAnonStringUnion">
-      <corba:unionbranch name="anonStringUnion1" idltype="corba:string">
+      <corba:unionbranch idltype="corba:string" name="anonStringUnion1">
         <corba:case label="1" />
       </corba:unionbranch>
-      <corba:unionbranch name="anonStringUnionDefault" idltype="corba:string" default="true" />
+      <corba:unionbranch default="true" idltype="corba:string" name="anonStringUnionDefault" />
     </corba:union>
     <corba:alias xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap" basetype="AnonStrings.typedefAnonStringUnion" repositoryID="IDL:AnonStrings/myTypedefAnonStringUnion:1.0" name="AnonStrings.myTypedefAnonStringUnion" />
     <corba:exception xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring" repositoryID="IDL:AnonStrings/anonException:1.0" type="AnonStrings.anonExceptionType" name="AnonStrings.anonException">
-      <corba:member name="unboundedString" idltype="corba:string" />
-      <corba:member name="anotherUnboundedString" idltype="corba:string" />
-      <corba:member name="anonBoundedAnonString" idltype="corba:string" />
-      <corba:member name="anotherBoundedAnonString" idltype="corba:string" />
+      <corba:member idltype="corba:string" name="unboundedString" />
+      <corba:member idltype="corba:string" name="anotherUnboundedString" />
+      <corba:member idltype="corba:string" name="anonBoundedAnonString" />
+      <corba:member idltype="corba:string" name="anotherBoundedAnonString" />
     </corba:exception>
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:complexType name="AnonStrings">
+      <xs:complexType name="AnonStrings.String5Array">
         <xs:sequence>
           <xs:element maxOccurs="10" minOccurs="10" name="item" type="xs:string">
           </xs:element>
@@ -191,10 +173,6 @@
       </xs:complexType>
     </xs:schema>
   </wsdl:types>
-  <wsdl:message name="anonStringOperation">
-    <wsdl:part name="inparameter" element="tns:anonStringOperation">
-    </wsdl:part>
-  </wsdl:message>
   <wsdl:message name="anotherAnonStringOperation">
     <wsdl:part name="inparameter" element="tns:anotherAnonStringOperation">
     </wsdl:part>
@@ -203,14 +181,18 @@
     <wsdl:part name="exception" element="tns:AnonStrings.anonException">
     </wsdl:part>
   </wsdl:message>
-  <wsdl:message name="anotherAnonStringOperationResponse">
-    <wsdl:part name="outparameter" element="tns:anotherAnonStringOperationResponse">
-    </wsdl:part>
-  </wsdl:message>
   <wsdl:message name="anonStringOperationResponse">
     <wsdl:part name="outparameter" element="tns:anonStringOperationResponse">
     </wsdl:part>
   </wsdl:message>
+  <wsdl:message name="anonStringOperation">
+    <wsdl:part name="inparameter" element="tns:anonStringOperation">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="anotherAnonStringOperationResponse">
+    <wsdl:part name="outparameter" element="tns:anotherAnonStringOperationResponse">
+    </wsdl:part>
+  </wsdl:message>
   <wsdl:portType name="AnonStrings.anonStringIf">
     <wsdl:operation name="anonStringOperation">
       <wsdl:input name="anonStringOperationRequest" message="tns:anonStringOperation">
@@ -229,8 +211,8 @@
     <corba:binding repositoryID="IDL:AnonStrings/anonStringIf:1.0" />
     <wsdl:operation name="anonStringOperation">
       <corba:operation name="anonStringOperation">
-        <corba:param mode="in" name="inString" idltype="corba:string" />
-        <corba:return name="return" idltype="corba:string" />
+        <corba:param mode="in" idltype="corba:string" name="inString" />
+        <corba:return idltype="corba:string" name="return" />
       </corba:operation>
       <wsdl:input name="anonStringOperationRequest">
       </wsdl:input>
@@ -239,8 +221,8 @@
     </wsdl:operation>
     <wsdl:operation name="anotherAnonStringOperation">
       <corba:operation name="anotherAnonStringOperation">
-        <corba:param mode="in" name="inString" idltype="corba:string" />
-        <corba:return name="return" idltype="corba:string" />
+        <corba:param mode="in" idltype="corba:string" name="inString" />
+        <corba:return idltype="corba:string" name="return" />
       </corba:operation>
       <wsdl:input name="anotherAnonStringOperationRequest">
       </wsdl:input>