Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveStruct.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveStruct.wsdl?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveStruct.wsdl (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveStruct.wsdl Thu Feb 7 15:47:23 2008 @@ -17,35 +17,35 @@ * specific language governing permissions and limitations * under the License. --> -<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:tns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; xmlns:corba="http://schemas.apache.org/yoko/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://schemas.apache.org/yoko/idl/RecursiveStruct/typemap";> - <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:BasicTest" elemname="item" bound="0" type="ns5:BasicTest" name="_Anon1_BasicTest" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; repositoryID="IDL:BasicTest:1.0" type="BasicTest" name="BasicTest"> +<wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; 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/RecursiveStruct/typemap";> + <corba:anonsequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:BasicTest" elemname="item" bound="0" type="ns5:BasicTest" name="_Anon1_BasicTest" /> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; repositoryID="IDL:BasicTest:1.0" type="BasicTest" name="BasicTest"> <corba:member name="member1" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:_Anon1_BasicTest" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:_Anon1_BasicTest" /> </corba:struct> - <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:ForwardTest" elemname="item" bound="0" type="ns5:ForwardTest" name="_Anon1_ForwardTest" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; repositoryID="IDL:ForwardTest:1.0" type="ForwardTest" name="ForwardTest"> + <corba:anonsequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:ForwardTest" elemname="item" bound="0" type="ns5:ForwardTest" name="_Anon1_ForwardTest" /> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; repositoryID="IDL:ForwardTest:1.0" type="ForwardTest" name="ForwardTest"> <corba:member name="member1" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:_Anon1_ForwardTest" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:_Anon1_ForwardTest" /> </corba:struct> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:ForwardSeqTest" elemname="item" bound="0" repositoryID="IDL:ForwardSeqTestSeq:1.0" type="ns5:ForwardSeqTest" name="ForwardSeqTestSeq" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; repositoryID="IDL:ForwardSeqTest:1.0" type="ForwardSeqTest" name="ForwardSeqTest"> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:ForwardSeqTest" elemname="item" bound="0" repositoryID="IDL:ForwardSeqTestSeq:1.0" type="ns5:ForwardSeqTest" name="ForwardSeqTestSeq" /> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; repositoryID="IDL:ForwardSeqTest:1.0" type="ForwardSeqTest" name="ForwardSeqTest"> <corba:member name="member1" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:ForwardSeqTestSeq" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:ForwardSeqTestSeq" /> </corba:struct> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:NestedTestOuter" elemname="item" bound="0" repositoryID="IDL:NestedTestOuterSeq:1.0" type="ns5:NestedTestOuter" name="NestedTestOuterSeq" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; repositoryID="IDL:NestedTestOuter/NestedTestInner:1.0" type="NestedTestOuter.NestedTestInner" name="NestedTestOuter.NestedTestInner"> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; xmlns="" elemtype="ns4:NestedTestOuter" elemname="item" bound="0" repositoryID="IDL:NestedTestOuterSeq:1.0" type="ns5:NestedTestOuter" name="NestedTestOuterSeq" /> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; repositoryID="IDL:NestedTestOuter/NestedTestInner:1.0" type="NestedTestOuter.NestedTestInner" name="NestedTestOuter.NestedTestInner"> <corba:member name="mem" idltype="corba:double" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; name="memberSeq" idltype="ns4:NestedTestOuterSeq" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; name="memberSeq" idltype="ns4:NestedTestOuterSeq" /> </corba:struct> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; repositoryID="IDL:NestedTestOuter:1.0" type="NestedTestOuter" name="NestedTestOuter"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; repositoryID="IDL:NestedTestOuter:1.0" type="NestedTestOuter" name="NestedTestOuter"> <corba:member name="member1" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:NestedTestOuter.NestedTestInner" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct/typemap"; name="member2" idltype="ns4:NestedTestOuter.NestedTestInner" /> </corba:struct> </corba:typeMapping> <wsdl:types> - <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns="http://schemas.apache.org/yoko/idl/RecursiveStruct"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveStruct"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="_Anon1_BasicTest"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="BasicTest">
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveUnion.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveUnion.wsdl?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveUnion.wsdl (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_RecursiveUnion.wsdl Thu Feb 7 15:47:23 2008 @@ -17,55 +17,55 @@ * specific language governing permissions and limitations * under the License. --> -<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:tns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; xmlns:corba="http://schemas.apache.org/yoko/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://schemas.apache.org/yoko/idl/RecursiveUnion/typemap";> - <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:BasicTest" elemname="item" bound="0" type="ns5:BasicTest" name="_Anon1_BasicTest" /> - <corba:union xmlns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:BasicTest:1.0" type="BasicTest" name="BasicTest"> +<wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; 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/RecursiveUnion/typemap";> + <corba:anonsequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:BasicTest" elemname="item" bound="0" type="ns5:BasicTest" name="_Anon1_BasicTest" /> + <corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:BasicTest:1.0" type="BasicTest" name="BasicTest"> <corba:unionbranch name="case1" idltype="corba:long"> <corba:case label="1" /> </corba:unionbranch> - <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:_Anon1_BasicTest"> + <corba:unionbranch xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:_Anon1_BasicTest"> <corba:case label="2" /> </corba:unionbranch> <corba:unionbranch name="caseDef" idltype="corba:string" default="true" /> </corba:union> - <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:ForwardTest" elemname="item" bound="0" type="ns5:ForwardTest" name="_Anon1_ForwardTest" /> - <corba:union xmlns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:ForwardTest:1.0" type="ForwardTest" name="ForwardTest"> + <corba:anonsequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:ForwardTest" elemname="item" bound="0" type="ns5:ForwardTest" name="_Anon1_ForwardTest" /> + <corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:ForwardTest:1.0" type="ForwardTest" name="ForwardTest"> <corba:unionbranch name="case1" idltype="corba:long"> <corba:case label="1" /> </corba:unionbranch> - <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:_Anon1_ForwardTest"> + <corba:unionbranch xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:_Anon1_ForwardTest"> <corba:case label="2" /> </corba:unionbranch> <corba:unionbranch name="caseDef" idltype="corba:string" default="true" /> </corba:union> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:ForwardSeqTest" elemname="item" bound="0" repositoryID="IDL:ForwardSeqTestSeq:1.0" type="ns5:ForwardSeqTest" name="ForwardSeqTestSeq" /> - <corba:union xmlns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:ForwardSeqTest:1.0" type="ForwardSeqTest" name="ForwardSeqTest"> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:ForwardSeqTest" elemname="item" bound="0" repositoryID="IDL:ForwardSeqTestSeq:1.0" type="ns5:ForwardSeqTest" name="ForwardSeqTestSeq" /> + <corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:ForwardSeqTest:1.0" type="ForwardSeqTest" name="ForwardSeqTest"> <corba:unionbranch name="case1" idltype="corba:long"> <corba:case label="1" /> </corba:unionbranch> - <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:ForwardSeqTestSeq"> + <corba:unionbranch xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:ForwardSeqTestSeq"> <corba:case label="2" /> </corba:unionbranch> <corba:unionbranch name="caseDef" idltype="corba:string" default="true" /> </corba:union> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:NestedTestOuter" elemname="item" bound="0" repositoryID="IDL:NestedTestOuterSeq:1.0" type="ns5:NestedTestOuter" name="NestedTestOuterSeq" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; repositoryID="IDL:NestedTestOuter/NestedTestInner:1.0" type="NestedTestOuter.NestedTestInner" name="NestedTestOuter.NestedTestInner"> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; xmlns="" elemtype="ns4:NestedTestOuter" elemname="item" bound="0" repositoryID="IDL:NestedTestOuterSeq:1.0" type="ns5:NestedTestOuter" name="NestedTestOuterSeq" /> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; repositoryID="IDL:NestedTestOuter/NestedTestInner:1.0" type="NestedTestOuter.NestedTestInner" name="NestedTestOuter.NestedTestInner"> <corba:member name="member1" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; name="member2" idltype="ns4:NestedTestOuterSeq" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; name="member2" idltype="ns4:NestedTestOuterSeq" /> </corba:struct> - <corba:union xmlns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:NestedTestOuter:1.0" type="NestedTestOuter" name="NestedTestOuter"> + <corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; discriminator="corba:short" repositoryID="IDL:NestedTestOuter:1.0" type="NestedTestOuter" name="NestedTestOuter"> <corba:unionbranch name="case1" idltype="corba:long"> <corba:case label="1" /> </corba:unionbranch> - <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:NestedTestOuter.NestedTestInner"> + <corba:unionbranch xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion/typemap"; name="case2" idltype="ns4:NestedTestOuter.NestedTestInner"> <corba:case label="2" /> </corba:unionbranch> <corba:unionbranch name="caseDef" idltype="corba:string" default="true" /> </corba:union> </corba:typeMapping> <wsdl:types> - <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns="http://schemas.apache.org/yoko/idl/RecursiveUnion"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns="http://cxf.apache.org/bindings/corba/idl/RecursiveUnion"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="_Anon1_BasicTest"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="BasicTest"> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Schema.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Schema.xsd?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Schema.xsd (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Schema.xsd Thu Feb 7 15:47:23 2008 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/OptionsSchema-types"; xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsSchema-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/OptionsSchema-types"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/OptionsSchema-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="foo.bar.Employee"> <xs:sequence> <xs:element name="name" type="xs:string"> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLPT.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLPT.xsd?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLPT.xsd (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLPT.xsd Thu Feb 7 15:47:23 2008 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLPT-types"; xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLPT-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/OptionsLPT-types"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/OptionsLPT-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="foo.bar.Employee"> <xs:sequence> <xs:element name="name" type="xs:string"> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLT.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLT.xsd?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLT.xsd (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaLT.xsd Thu Feb 7 15:47:23 2008 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLT-types"; xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLT-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/OptionsLT-types"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/OptionsLT-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="foo.bar.Employee"> <xs:sequence> <xs:element name="name" type="xs:string"> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaPT.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaPT.xsd?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaPT.xsd (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_SchemaPT.xsd Thu Feb 7 15:47:23 2008 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/OptionsPT-types"; xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsPT-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/OptionsPT-types"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/OptionsPT-types"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="foo.bar.Employee"> <xs:sequence> <xs:element name="name" type="xs:string"> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Sequence.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Sequence.wsdl?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Sequence.wsdl (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Sequence.wsdl Thu Feb 7 15:47:23 2008 @@ -17,32 +17,32 @@ * specific language governing permissions and limitations * under the License. --> -<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:tns="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:corba="http://schemas.apache.org/yoko/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://schemas.apache.org/yoko/idl/Sequence/typemap";> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:longSequence:1.0" type="ns4:longSequence" name="longSequence" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:string" elemname="item" bound="0" repositoryID="IDL:stringSequence:1.0" type="ns4:stringSequence" name="stringSequence" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:long" elemname="item" bound="10" repositoryID="IDL:boundedLongSequence:1.0" type="ns4:boundedLongSequence" name="boundedLongSequence" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:string" elemname="item" bound="2" repositoryID="IDL:boundedStringSequence:1.0" type="ns4:boundedStringSequence" name="boundedStringSequence" /> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap"; xmlns="" elemtype="ns4:longSequence" elemname="item" bound="0" repositoryID="IDL:longSequenceSequence:1.0" type="ns5:longSequenceSequence" name="longSequenceSequence" /> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap"; xmlns="" elemtype="ns4:boundedLongSequence" elemname="item" bound="0" repositoryID="IDL:boundedLongSequenceSequence:1.0" type="ns5:boundedLongSequenceSequence" name="boundedLongSequenceSequence" /> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap"; xmlns="" elemtype="ns4:longSequence" elemname="item" bound="30" repositoryID="IDL:longSequenceBoundedSequence:1.0" type="ns5:longSequenceBoundedSequence" name="longSequenceBoundedSequence" /> - <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap"; xmlns="" elemtype="ns4:boundedLongSequence" elemname="item" bound="10" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" type="ns5:boundedLongSequenceBoundedSequence" name="boundedLongSequenceBoundedSequence" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:float" elemname="item" bound="0" repositoryID="IDL:sequences/myFloat:1.0" type="ns4:sequences.myFloat" name="sequences.myFloat" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:double" elemname="item" bound="0" repositoryID="IDL:sequences/myDouble:1.0" type="ns4:sequences.myDouble" name="sequences.myDouble" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:longdouble" elemname="item" bound="0" repositoryID="IDL:sequences/myLongDouble:1.0" type="ns4:sequences.myLongDouble" name="sequences.myLongDouble" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:short" elemname="item" bound="0" repositoryID="IDL:sequences/myShort:1.0" type="ns4:sequences.myShort" name="sequences.myShort" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:sequences/myLong:1.0" type="ns4:sequences.myLong" name="sequences.myLong" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:longlong" elemname="item" bound="0" repositoryID="IDL:sequences/myLonglong:1.0" type="ns4:sequences.myLonglong" name="sequences.myLonglong" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:ushort" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedShort:1.0" type="ns4:sequences.myUnsignedShort" name="sequences.myUnsignedShort" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:ulong" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedLong:1.0" type="ns4:sequences.myUnsignedLong" name="sequences.myUnsignedLong" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:ulonglong" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" type="ns4:sequences.myUnsignedLongLong" name="sequences.myUnsignedLongLong" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:char" elemname="item" bound="0" repositoryID="IDL:sequences/myChar:1.0" type="ns4:sequences.myChar" name="sequences.myChar" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:wchar" elemname="item" bound="0" repositoryID="IDL:sequences/myWchar:1.0" type="ns4:sequences.myWchar" name="sequences.myWchar" /> - <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="" elemtype="corba:boolean" elemname="item" bound="0" repositoryID="IDL:sequences/myBoolean:1.0" type="ns4:sequences.myBoolean" name="sequences.myBoolean" /> +<wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/Sequence"; 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/Sequence/typemap";> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:longSequence:1.0" type="ns4:longSequence" name="longSequence" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:string" elemname="item" bound="0" repositoryID="IDL:stringSequence:1.0" type="ns4:stringSequence" name="stringSequence" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:long" elemname="item" bound="10" repositoryID="IDL:boundedLongSequence:1.0" type="ns4:boundedLongSequence" name="boundedLongSequence" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:string" elemname="item" bound="2" repositoryID="IDL:boundedStringSequence:1.0" type="ns4:boundedStringSequence" name="boundedStringSequence" /> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence/typemap"; xmlns="" elemtype="ns4:longSequence" elemname="item" bound="0" repositoryID="IDL:longSequenceSequence:1.0" type="ns5:longSequenceSequence" name="longSequenceSequence" /> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence/typemap"; xmlns="" elemtype="ns4:boundedLongSequence" elemname="item" bound="0" repositoryID="IDL:boundedLongSequenceSequence:1.0" type="ns5:boundedLongSequenceSequence" name="boundedLongSequenceSequence" /> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence/typemap"; xmlns="" elemtype="ns4:longSequence" elemname="item" bound="30" repositoryID="IDL:longSequenceBoundedSequence:1.0" type="ns5:longSequenceBoundedSequence" name="longSequenceBoundedSequence" /> + <corba:sequence xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence/typemap"; xmlns="" elemtype="ns4:boundedLongSequence" elemname="item" bound="10" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" type="ns5:boundedLongSequenceBoundedSequence" name="boundedLongSequenceBoundedSequence" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:float" elemname="item" bound="0" repositoryID="IDL:sequences/myFloat:1.0" type="ns4:sequences.myFloat" name="sequences.myFloat" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:double" elemname="item" bound="0" repositoryID="IDL:sequences/myDouble:1.0" type="ns4:sequences.myDouble" name="sequences.myDouble" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:longdouble" elemname="item" bound="0" repositoryID="IDL:sequences/myLongDouble:1.0" type="ns4:sequences.myLongDouble" name="sequences.myLongDouble" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:short" elemname="item" bound="0" repositoryID="IDL:sequences/myShort:1.0" type="ns4:sequences.myShort" name="sequences.myShort" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:sequences/myLong:1.0" type="ns4:sequences.myLong" name="sequences.myLong" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:longlong" elemname="item" bound="0" repositoryID="IDL:sequences/myLonglong:1.0" type="ns4:sequences.myLonglong" name="sequences.myLonglong" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:ushort" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedShort:1.0" type="ns4:sequences.myUnsignedShort" name="sequences.myUnsignedShort" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:ulong" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedLong:1.0" type="ns4:sequences.myUnsignedLong" name="sequences.myUnsignedLong" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:ulonglong" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" type="ns4:sequences.myUnsignedLongLong" name="sequences.myUnsignedLongLong" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:char" elemname="item" bound="0" repositoryID="IDL:sequences/myChar:1.0" type="ns4:sequences.myChar" name="sequences.myChar" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:wchar" elemname="item" bound="0" repositoryID="IDL:sequences/myWchar:1.0" type="ns4:sequences.myWchar" name="sequences.myWchar" /> + <corba:sequence xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="" elemtype="corba:boolean" elemname="item" bound="0" repositoryID="IDL:sequences/myBoolean:1.0" type="ns4:sequences.myBoolean" name="sequences.myBoolean" /> <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:sequences/myOctet:1.0" type="xs:base64Binary" name="sequences.myOctet" /> </corba:typeMapping> <wsdl:types> - <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Sequence"; xmlns="http://schemas.apache.org/yoko/idl/Sequence"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns="http://cxf.apache.org/bindings/corba/idl/Sequence"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="longSequence"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:int"> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String.wsdl?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String.wsdl (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String.wsdl Thu Feb 7 15:47:23 2008 @@ -17,27 +17,27 @@ * specific language governing permissions and limitations * under the License. --> -<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/String"; xmlns:tns="http://schemas.apache.org/yoko/idl/String"; xmlns:corba="http://schemas.apache.org/yoko/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://schemas.apache.org/yoko/idl/String/typemap";> - <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/String"; bound="10" type="string10" name="_Anon1_string10" /> - <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String"; xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; basetype="_Anon1_string10" repositoryID="IDL:string10:1.0" type="ns4:string10" name="string10" /> - <corba:anonwstring xmlns="http://schemas.apache.org/yoko/idl/String"; bound="20" type="wstring20" name="_Anon1_wstring20" /> - <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String"; xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; basetype="_Anon1_wstring20" repositoryID="IDL:wstring20:1.0" type="ns4:wstring20" name="wstring20" /> - <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" /> - <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" /> +<wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/String"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/String"; 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/String/typemap";> + <corba:anonstring xmlns="http://cxf.apache.org/bindings/corba/idl/String"; bound="10" type="string10" name="_Anon1_string10" /> + <corba:alias xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String"; xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; basetype="_Anon1_string10" repositoryID="IDL:string10:1.0" type="ns4:string10" name="string10" /> + <corba:anonwstring xmlns="http://cxf.apache.org/bindings/corba/idl/String"; bound="20" type="wstring20" name="_Anon1_wstring20" /> + <corba:alias xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String"; xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; basetype="_Anon1_wstring20" repositoryID="IDL:wstring20:1.0" type="ns4:wstring20" name="wstring20" /> + <corba:alias xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" /> + <corba:alias xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" /> <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema"; basetype="corba:string" repositoryID="IDL:myString:1.0" type="xs:string" name="myString" /> <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema"; basetype="corba:wstring" repositoryID="IDL:myWString:1.0" type="xs:string" name="myWString" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/String"; repositoryID="IDL:strStruct:1.0" type="strStruct" name="strStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/String"; repositoryID="IDL:strStruct:1.0" type="strStruct" name="strStruct"> <corba:member name="unboundedStr" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="boundedStr10" idltype="ns4:string10" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="boundedStr10" idltype="ns4:string10" /> <corba:member name="unboundedWStr" idltype="corba:wstring" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="boundedWStr20" idltype="ns4:wstring20" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="myStringStruct" idltype="ns4:myString" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="myWStringStruct" idltype="ns4:myWString" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="boundedWStr20" idltype="ns4:wstring20" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="myStringStruct" idltype="ns4:myString" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="myWStringStruct" idltype="ns4:myWString" /> </corba:struct> </corba:typeMapping> <wsdl:types> - <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/String"; xmlns="http://schemas.apache.org/yoko/idl/String"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/String"; xmlns="http://cxf.apache.org/bindings/corba/idl/String"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:simpleType name="string10"> <xs:restriction base="xs:string"> <xs:maxLength value="10"> @@ -138,9 +138,9 @@ <corba:binding repositoryID="IDL:if:1.0" /> <wsdl:operation name="combineStrings"> <corba:operation name="combineStrings"> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="string10Parm" idltype="string10" /> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="myString10Parm" idltype="myString10" /> - <corba:return xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; name="return" idltype="myString" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="string10Parm" idltype="string10" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="myString10Parm" idltype="myString10" /> + <corba:return xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="return" idltype="myString" /> </corba:operation> <wsdl:input name="combineStringsRequest"> </wsdl:input> @@ -149,9 +149,9 @@ </wsdl:operation> <wsdl:operation name="combineWstrings"> <corba:operation name="combineWstrings"> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="wstring20Parm" idltype="wstring20" /> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="myWString20Parm" idltype="myWString20" /> - <corba:return xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; name="return" idltype="myWString" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="wstring20Parm" idltype="wstring20" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="myWString20Parm" idltype="myWString20" /> + <corba:return xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="return" idltype="myWString" /> </corba:operation> <wsdl:input name="combineWstringsRequest"> </wsdl:input> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String_unbounded.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String_unbounded.wsdl?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String_unbounded.wsdl (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_String_unbounded.wsdl Thu Feb 7 15:47:23 2008 @@ -17,25 +17,25 @@ * specific language governing permissions and limitations * under the License. --> -<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/String"; xmlns:tns="http://schemas.apache.org/yoko/idl/String"; xmlns:corba="http://schemas.apache.org/yoko/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://schemas.apache.org/yoko/idl/String/typemap";> +<wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/String"; xmlns:tns="http://cxf.apache.org/bindings/corba/idl/String"; 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/String/typemap";> <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema"; basetype="corba:string" repositoryID="IDL:string10:1.0" type="xs:string" name="string10" /> <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema"; basetype="corba:wstring" repositoryID="IDL:wstring20:1.0" type="xs:string" name="wstring20" /> - <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" /> - <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" /> + <corba:alias xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" /> + <corba:alias xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" /> <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema"; basetype="corba:string" repositoryID="IDL:myString:1.0" type="xs:string" name="myString" /> <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema"; basetype="corba:wstring" repositoryID="IDL:myWString:1.0" type="xs:string" name="myWString" /> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/String"; repositoryID="IDL:strStruct:1.0" type="strStruct" name="strStruct"> + <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/String"; repositoryID="IDL:strStruct:1.0" type="strStruct" name="strStruct"> <corba:member name="unboundedStr" idltype="corba:string" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="boundedStr10" idltype="ns4:string10" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="boundedStr10" idltype="ns4:string10" /> <corba:member name="unboundedWStr" idltype="corba:wstring" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="boundedWStr20" idltype="ns4:wstring20" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="myStringStruct" idltype="ns4:myString" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap"; name="myWStringStruct" idltype="ns4:myWString" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="boundedWStr20" idltype="ns4:wstring20" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="myStringStruct" idltype="ns4:myString" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="myWStringStruct" idltype="ns4:myWString" /> </corba:struct> </corba:typeMapping> <wsdl:types> - <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/String"; xmlns="http://schemas.apache.org/yoko/idl/String"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/String"; xmlns="http://cxf.apache.org/bindings/corba/idl/String"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="strStruct"> <xs:sequence> <xs:element name="unboundedStr" type="xs:string"> @@ -124,9 +124,9 @@ <corba:binding repositoryID="IDL:if:1.0" /> <wsdl:operation name="combineStrings"> <corba:operation name="combineStrings"> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="string10Parm" idltype="string10" /> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="myString10Parm" idltype="myString10" /> - <corba:return xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; name="return" idltype="myString" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="string10Parm" idltype="string10" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="myString10Parm" idltype="myString10" /> + <corba:return xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="return" idltype="myString" /> </corba:operation> <wsdl:input name="combineStringsRequest"> </wsdl:input> @@ -135,9 +135,9 @@ </wsdl:operation> <wsdl:operation name="combineWstrings"> <corba:operation name="combineWstrings"> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="wstring20Parm" idltype="wstring20" /> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; mode="in" name="myWString20Parm" idltype="myWString20" /> - <corba:return xmlns="http://schemas.apache.org/yoko/idl/String/typemap"; name="return" idltype="myWString" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="wstring20Parm" idltype="wstring20" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; mode="in" name="myWString20Parm" idltype="myWString20" /> + <corba:return xmlns="http://cxf.apache.org/bindings/corba/idl/String/typemap"; name="return" idltype="myWString" /> </corba:operation> <wsdl:input name="combineWstringsRequest"> </wsdl:input> Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct.wsdl?rev=619688&r1=619687&r2=619688&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct.wsdl (original) +++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct.wsdl Thu Feb 7 15:47:23 2008 @@ -17,33 +17,33 @@ * specific language governing permissions and limitations * under the License. --> -<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Struct"; xmlns:tns="http://schemas.apache.org/yoko/idl/Struct"; xmlns:corba="http://schemas.apache.org/yoko/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://schemas.apache.org/yoko/idl/Struct/typemap";> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types"; repositoryID="IDL:OutsideStruct:1.0" type="OutsideStruct" name="OutsideStruct"> +<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:member name="number" idltype="corba:long" /> <corba:member name="word" idltype="corba:string" /> </corba:struct> - <corba:struct xmlns="http://schemas.apache.org/yoko/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/Exception/types"; 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://schemas.apache.org/yoko/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/Exception/types"; 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://schemas.apache.org/yoko/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/Exception/types"; 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://schemas.apache.org/yoko/idl/Struct/typemap"; name="outsider" idltype="ns4:OutsideStruct" /> + <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; name="outsider" idltype="ns4:OutsideStruct" /> </corba:struct> - <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types"; repositoryID="IDL:StructTest/NestedStructs:1.0" type="StructTest.NestedStructs" name="StructTest.NestedStructs"> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct/typemap"; name="employStruct" idltype="ns4:StructTest.Employee" /> - <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct/typemap"; name="compensationStruct" idltype="ns4:StructTest.Compensation" /> + <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: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> </corba:typeMapping> <wsdl:types> - <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Struct"; xmlns="http://schemas.apache.org/yoko/idl/Struct"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/Struct"; xmlns="http://cxf.apache.org/bindings/corba/idl/Struct"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:complexType name="OutsideStruct"> <xs:sequence> <xs:element name="number" type="xs:int"> @@ -156,8 +156,8 @@ <corba:binding repositoryID="IDL:StructTest:1.0" /> <wsdl:operation name="congratulate"> <corba:operation name="congratulate"> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap"; mode="in" idltype="StructTest.Employee" name="emp" /> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap"; mode="out" idltype="StructTest.Compensation" name="reward" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; mode="in" idltype="StructTest.Employee" name="emp" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; mode="out" idltype="StructTest.Compensation" name="reward" /> </corba:operation> <wsdl:input name="congratulateRequest"> </wsdl:input> @@ -166,8 +166,8 @@ </wsdl:operation> <wsdl:operation name="getCompensation"> <corba:operation name="getCompensation"> - <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap"; mode="in" idltype="StructTest.Employee" name="emp2" /> - <corba:return xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap"; idltype="StructTest.Compensation" name="return" /> + <corba:param xmlns="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; mode="in" idltype="StructTest.Employee" name="emp2" /> + <corba:return xmlns="http://cxf.apache.org/bindings/corba/idl/Struct/typemap"; idltype="StructTest.Compensation" name="return" /> </corba:operation> <wsdl:input name="getCompensationRequest"> </wsdl:input>
