Author: dkulp Date: Mon Jul 15 18:04:15 2013 New Revision: 1503381 URL: http://svn.apache.org/r1503381 Log: Merged revisions 1503349 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1503349 | dkulp | 2013-07-15 13:12:10 -0400 (Mon, 15 Jul 2013) | 10 lines Merged revisions 1502890 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1502890 | dkulp | 2013-07-13 17:29:46 -0400 (Sat, 13 Jul 2013) | 2 lines Fix the expected wsdl to actuall be what is expected ........ ........ Modified: cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Struct.wsdl cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Union.wsdl cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_scopedStruct.wsdl Modified: cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Struct.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Struct.wsdl?rev=1503381&r1=1503380&r2=1503381&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Struct.wsdl (original) +++ cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Struct.wsdl Mon Jul 15 18:04:15 2013 @@ -19,25 +19,25 @@ --> <wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/Struct"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/Struct"; 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/Struct/typemap";> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:OutsideStruct:1.0" type="OutsideStruct" name="OutsideStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct"; repositoryID="IDL:OutsideStruct:1.0" type="OutsideStruct" name="OutsideStruct"> <corba:member name="number" idltype="corba:long" /> <corba:member name="word" idltype="corba:string" /> </corba:struct> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:StructTest/Employee:1.0" type="StructTest.Employee" name="StructTest.Employee"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct"; repositoryID="IDL:StructTest/Employee:1.0" type="StructTest.Employee" name="StructTest.Employee"> <corba:member name="name" idltype="corba:string" /> <corba:member name="dept" idltype="corba:string" /> </corba:struct> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:StructTest/Compensation:1.0" type="StructTest.Compensation" name="StructTest.Compensation"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct"; repositoryID="IDL:StructTest/Compensation:1.0" type="StructTest.Compensation" name="StructTest.Compensation"> <corba:member name="amount" idltype="corba:long" /> <corba:member name="currency" idltype="corba:string" /> <corba:member name="praise" idltype="corba:string" /> </corba:struct> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:StructTest/NestedOutsideStruct:1.0" type="StructTest.NestedOutsideStruct" name="StructTest.NestedOutsideStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct"; repositoryID="IDL:StructTest/NestedOutsideStruct:1.0" type="StructTest.NestedOutsideStruct" name="StructTest.NestedOutsideStruct"> <corba:member name="aShort" idltype="corba:short" /> <corba:member name="aLong" idltype="corba:long" /> <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; name="outsider" idltype="ns4:OutsideStruct" /> </corba:struct> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:StructTest/NestedStructs:1.0" type="StructTest.NestedStructs" name="StructTest.NestedStructs"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct"; repositoryID="IDL:StructTest/NestedStructs:1.0" type="StructTest.NestedStructs" name="StructTest.NestedStructs"> <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; name="employStruct" idltype="ns4:StructTest.Employee" /> <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; name="compensationStruct" idltype="ns4:StructTest.Compensation" /> </corba:struct> Modified: cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Union.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Union.wsdl?rev=1503381&r1=1503380&r2=1503381&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Union.wsdl (original) +++ cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_Union.wsdl Mon Jul 15 18:04:15 2013 @@ -19,18 +19,18 @@ --> <wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/Union"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/Union"; 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/Union/typemap";> - <corba:enum xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:e1:1.0" type="e1" name="e1"> + <corba:enum xmlns="http://cxf.apache.org/bindings/corba/idl/Union"; repositoryID="IDL:e1:1.0" type="e1" name="e1"> <corba:enumerator value="e1_1" /> <corba:enumerator value="e1_2" /> <corba:enumerator value="e1_3" /> <corba:enumerator value="e1_4" /> </corba:enum> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:s1:1.0" type="s1" name="s1"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Union"; repositoryID="IDL:s1:1.0" type="s1" name="s1"> <corba:member name="s1_1" idltype="corba:short" /> <corba:member name="s1_2" idltype="corba:short" /> <corba:member name="s1_3" idltype="corba:short" /> </corba:struct> - <corba:union xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Exception/types"; xmlns="http://cxf.apache.org/bindings/corba/idl/Union/typemap"; discriminator="e1" repositoryID="IDL:u1:1.0" type="ns4:u1" name="u1"> + <corba:union xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Union"; xmlns="http://cxf.apache.org/bindings/corba/idl/Union/typemap"; discriminator="e1" repositoryID="IDL:u1:1.0" type="ns4:u1" name="u1"> <corba:unionbranch name="u1_1" idltype="corba:long"> <corba:case label="e1_1" /> </corba:unionbranch> @@ -41,18 +41,18 @@ </corba:unionbranch> <corba:unionbranch name="u1_3" idltype="s1" default="true" /> </corba:union> - <corba:enum xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:if/e2:1.0" type="if.e2" name="if.e2"> + <corba:enum xmlns="http://cxf.apache.org/bindings/corba/idl/Union"; repositoryID="IDL:if/e2:1.0" type="if.e2" name="if.e2"> <corba:enumerator value="e2_1" /> <corba:enumerator value="e2_2" /> <corba:enumerator value="e2_3" /> <corba:enumerator value="e2_4" /> </corba:enum> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:if/s2:1.0" type="if.s2" name="if.s2"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Union"; repositoryID="IDL:if/s2:1.0" type="if.s2" name="if.s2"> <corba:member name="s2_1" idltype="corba:short" /> <corba:member name="s2_2" idltype="corba:short" /> <corba:member name="s2_3" idltype="corba:short" /> </corba:struct> - <corba:union xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Exception/types"; xmlns="http://cxf.apache.org/bindings/corba/idl/Union/typemap"; discriminator="if.e2" repositoryID="IDL:if/u2:1.0" type="ns4:if.u2" name="if.u2"> + <corba:union xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Union"; xmlns="http://cxf.apache.org/bindings/corba/idl/Union/typemap"; discriminator="if.e2" repositoryID="IDL:if/u2:1.0" type="ns4:if.u2" name="if.u2"> <corba:unionbranch name="u2_1" idltype="corba:long"> <corba:case label="e2_1" /> </corba:unionbranch> @@ -63,18 +63,18 @@ </corba:unionbranch> <corba:unionbranch name="u2_3" idltype="if.s2" default="true" /> </corba:union> - <corba:enum xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:m/e3:1.0" type="m.e3" name="m.e3"> + <corba:enum xmlns="http://cxf.apache.org/bindings/corba/idl/Union"; repositoryID="IDL:m/e3:1.0" type="m.e3" name="m.e3"> <corba:enumerator value="e3_1" /> <corba:enumerator value="e3_2" /> <corba:enumerator value="e3_3" /> <corba:enumerator value="e3_4" /> </corba:enum> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:m/s3:1.0" type="m.s3" name="m.s3"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Union"; repositoryID="IDL:m/s3:1.0" type="m.s3" name="m.s3"> <corba:member name="s3_1" idltype="corba:short" /> <corba:member name="s3_2" idltype="corba:short" /> <corba:member name="s3_3" idltype="corba:short" /> </corba:struct> - <corba:union xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Exception/types"; xmlns="http://cxf.apache.org/bindings/corba/idl/Union/typemap"; discriminator="m.e3" repositoryID="IDL:m/u3:1.0" type="ns4:m.u3" name="m.u3"> + <corba:union xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Union"; xmlns="http://cxf.apache.org/bindings/corba/idl/Union/typemap"; discriminator="m.e3" repositoryID="IDL:m/u3:1.0" type="ns4:m.u3" name="m.u3"> <corba:unionbranch name="u3_1" idltype="corba:long"> <corba:case label="e3_1" /> </corba:unionbranch> Modified: cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_scopedStruct.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_scopedStruct.wsdl?rev=1503381&r1=1503380&r2=1503381&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_scopedStruct.wsdl (original) +++ cxf/branches/2.6.x-fixes/tools/corba/src/test/resources/idl/expected_scopedStruct.wsdl Mon Jul 15 18:04:15 2013 @@ -19,18 +19,18 @@ --> <wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/scopedStruct"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/scopedStruct"; 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/scopedStruct/typemap";> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:globalStruct:1.0" type="globalStruct" name="globalStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/scopedStruct"; repositoryID="IDL:globalStruct:1.0" type="globalStruct" name="globalStruct"> <corba:member name="time" idltype="corba:long" /> </corba:struct> <corba:alias basetype="corba:short" repositoryID="IDL:var:1.0" name="var" /> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:firstModule/var:1.0" type="firstModule.var" name="firstModule.var"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/scopedStruct"; repositoryID="IDL:firstModule/var:1.0" type="firstModule.var" name="firstModule.var"> <corba:member name="number" idltype="corba:long" /> </corba:struct> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:firstModule/firstInterface/firstStruct:1.0" type="firstModule.firstInterface.firstStruct" name="firstModule.firstInterface.firstStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/scopedStruct"; repositoryID="IDL:firstModule/firstInterface/firstStruct:1.0" type="firstModule.firstInterface.firstStruct" name="firstModule.firstInterface.firstStruct"> <corba:member name="number" idltype="corba:long" /> <corba:member name="word" idltype="corba:string" /> </corba:struct> - <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Exception/types"; repositoryID="IDL:secondModule/secondInterface/secondStruct:1.0" type="secondModule.secondInterface.secondStruct" name="secondModule.secondInterface.secondStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/scopedStruct"; repositoryID="IDL:secondModule/secondInterface/secondStruct:1.0" type="secondModule.secondInterface.secondStruct" name="secondModule.secondInterface.secondStruct"> <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/scopedStruct/typemap"; name="hour" idltype="ns4:globalStruct" /> <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/scopedStruct/typemap"; name="minute" idltype="ns4:firstModule.firstInterface.firstStruct" /> <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/scopedStruct/typemap"; name="second" idltype="ns4:firstModule.firstInterface.firstStruct" />
