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 2008/01/08 03:47:59 UTC
svn commit: r609848 [7/7] - in /incubator/cxf/trunk/tools/corba: ./
src/main/generated/ src/main/generated/org/ src/main/generated/org/apache/
src/main/generated/org/apache/yoko/ src/main/generated/org/apache/yoko/tools/
src/main/generated/org/apache/y...
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceArray.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceArray.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceArray.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceArray.wsdl Mon Jan 7 18:47:56 2008
@@ -19,17 +19,17 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:tns="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" 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/ForwardInterfaceArray/typemap">
- <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="10" repositoryID="IDL:org/cc/IpCallArray:1.0" type="ns4:org.cc.IpCall" name="org.cc.IpCallArray" />
- <corba:anonarray xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="2" type="ns4:org.cc.IpCall" name="org.cc.anonStruct._1_structLongArray" />
- <corba:anonarray xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="4" type="ns4:org.cc.IpCall" name="org.cc.anonStruct._1_structLongArrayArray" />
- <corba:anonarray xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="2" type="ns4:org.cc.anonStruct._1_structLongArrayArray" name="org.cc.anonStruct._2_structLongArrayArray" />
- <corba:anonarray xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="8" type="ns4:org.cc.IpCall" name="org.cc.anonStruct._1_structLongArrayArrayArray" />
- <corba:anonarray xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="4" type="ns4:org.cc.anonStruct._1_structLongArrayArrayArray" name="org.cc.anonStruct._2_structLongArrayArrayArray" />
- <corba:anonarray xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemname="item" bound="2" type="ns4:org.cc.anonStruct._2_structLongArrayArrayArray" name="org.cc.anonStruct._3_structLongArrayArrayArray" />
+ <corba:array xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="10" repositoryID="IDL:org/cc/IpCallArray:1.0" type="ns5:org.cc.IpCallArray" name="org.cc.IpCallArray" />
+ <corba:anonarray xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="2" type="ns5:org.cc.anonStruct._Anon1_structLongArray" name="org.cc.anonStruct._Anon1_structLongArray" />
+ <corba:anonarray xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="4" type="ns5:org.cc.anonStruct._Anon1_structLongArrayArray" name="org.cc.anonStruct._Anon1_structLongArrayArray" />
+ <corba:anonarray xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._Anon1_structLongArrayArray" elemname="item" bound="2" type="ns5:org.cc.anonStruct._Anon2_structLongArrayArray" name="org.cc.anonStruct._Anon2_structLongArrayArray" />
+ <corba:anonarray xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="8" type="ns5:org.cc.anonStruct._Anon1_structLongArrayArrayArray" name="org.cc.anonStruct._Anon1_structLongArrayArrayArray" />
+ <corba:anonarray xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._Anon1_structLongArrayArrayArray" elemname="item" bound="4" type="ns5:org.cc.anonStruct._Anon2_structLongArrayArrayArray" name="org.cc.anonStruct._Anon2_structLongArrayArrayArray" />
+ <corba:anonarray xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._Anon2_structLongArrayArrayArray" elemname="item" bound="2" type="ns5:org.cc.anonStruct._Anon3_structLongArrayArrayArray" name="org.cc.anonStruct._Anon3_structLongArrayArrayArray" />
<corba:struct xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" repositoryID="IDL:org/cc/anonStruct:1.0" type="org.cc.anonStruct" name="org.cc.anonStruct">
- <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" name="structLongArray" idltype="ns4:org.cc.anonStruct._1_structLongArray" />
- <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" name="structLongArrayArray" idltype="ns4:org.cc.anonStruct._2_structLongArrayArray" />
- <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" name="structLongArrayArrayArray" idltype="ns4:org.cc.anonStruct._3_structLongArrayArrayArray" />
+ <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" name="structLongArray" idltype="ns4:org.cc.anonStruct._Anon1_structLongArray" />
+ <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" name="structLongArrayArray" idltype="ns4:org.cc.anonStruct._Anon2_structLongArrayArray" />
+ <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray/typemap" name="structLongArrayArrayArray" idltype="ns4:org.cc.anonStruct._Anon3_structLongArrayArrayArray" />
</corba:struct>
<corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceArray" binding="org.cc.IpCallCORBABinding" repositoryID="IDL:org/cc/IpCall:1.0" type="ns4:EndpointReferenceType" name="org.cc.IpCall" />
</corba:typeMapping>
@@ -43,49 +43,49 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._1_structLongArray">
+ <xs:complexType name="org.cc.anonStruct._Anon1_structLongArray">
<xs:sequence>
<xs:element maxOccurs="2" minOccurs="2" name="item" nillable="true" type="wsa:EndpointReferenceType">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._1_structLongArrayArray">
+ <xs:complexType name="org.cc.anonStruct._Anon1_structLongArrayArray">
<xs:sequence>
<xs:element maxOccurs="4" minOccurs="4" name="item" nillable="true" type="wsa:EndpointReferenceType">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._2_structLongArrayArray">
+ <xs:complexType name="org.cc.anonStruct._Anon2_structLongArrayArray">
<xs:sequence>
- <xs:element maxOccurs="2" minOccurs="2" name="item" type="org.cc.anonStruct._1_structLongArrayArray">
+ <xs:element maxOccurs="2" minOccurs="2" name="item" type="org.cc.anonStruct._Anon1_structLongArrayArray">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._1_structLongArrayArrayArray">
+ <xs:complexType name="org.cc.anonStruct._Anon1_structLongArrayArrayArray">
<xs:sequence>
<xs:element maxOccurs="8" minOccurs="8" name="item" nillable="true" type="wsa:EndpointReferenceType">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._2_structLongArrayArrayArray">
+ <xs:complexType name="org.cc.anonStruct._Anon2_structLongArrayArrayArray">
<xs:sequence>
- <xs:element maxOccurs="4" minOccurs="4" name="item" type="org.cc.anonStruct._1_structLongArrayArrayArray">
+ <xs:element maxOccurs="4" minOccurs="4" name="item" type="org.cc.anonStruct._Anon1_structLongArrayArrayArray">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._3_structLongArrayArrayArray">
+ <xs:complexType name="org.cc.anonStruct._Anon3_structLongArrayArrayArray">
<xs:sequence>
- <xs:element maxOccurs="2" minOccurs="2" name="item" type="org.cc.anonStruct._2_structLongArrayArrayArray">
+ <xs:element maxOccurs="2" minOccurs="2" name="item" type="org.cc.anonStruct._Anon2_structLongArrayArrayArray">
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="org.cc.anonStruct">
<xs:sequence>
- <xs:element name="structLongArray" type="org.cc.anonStruct._1_structLongArray">
+ <xs:element name="structLongArray" type="org.cc.anonStruct._Anon1_structLongArray">
</xs:element>
- <xs:element name="structLongArrayArray" type="org.cc.anonStruct._2_structLongArrayArray">
+ <xs:element name="structLongArrayArray" type="org.cc.anonStruct._Anon2_structLongArrayArray">
</xs:element>
- <xs:element name="structLongArrayArrayArray" type="org.cc.anonStruct._3_structLongArrayArrayArray">
+ <xs:element name="structLongArrayArrayArray" type="org.cc.anonStruct._Anon3_structLongArrayArrayArray">
</xs:element>
</xs:sequence>
</xs:complexType>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceSequence.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceSequence.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceSequence.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceSequence.wsdl Mon Jan 7 18:47:56 2008
@@ -20,14 +20,14 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:tns="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" 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/ForwardInterfaceSequence/typemap">
<corba:sequence xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="0" repositoryID="IDL:org/cc/myIpCallSequence:1.0" type="ns5:EndpointReferenceType" name="org.cc.myIpCallSequence" />
- <corba:anonsequence xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="0" type="ns5:EndpointReferenceType" name="org.cc.myCallSeqSeqSeqLong._1_myCallSeqSeqSeqLong" />
- <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.myCallSeqSeqSeqLong._1_myCallSeqSeqSeqLong" elemname="item" bound="0" type="ns5:org.cc._1_myCallSeqSeqSeqLong" name="org.cc._1_myCallSeqSeqSeqLong" />
- <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc._1_myCallSeqSeqSeqLong" elemname="item" bound="0" repositoryID="IDL:org/cc/myCallSeqSeqSeqLong:1.0" type="ns5:org.cc.myCallSeqSeqSeqLong" name="org.cc.myCallSeqSeqSeqLong" />
- <corba:anonsequence xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="0" type="ns5:EndpointReferenceType" name="org.cc.anonStruct._1_anonStruct" />
- <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._1_anonStruct" elemname="item" bound="0" type="ns5:org.cc.anonStruct._2_anonStruct" name="org.cc.anonStruct._2_anonStruct" />
- <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._2_anonStruct" elemname="item" bound="0" type="ns5:org.cc._1_anonStruct" name="org.cc._1_anonStruct" />
+ <corba:anonsequence xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="0" type="ns5:EndpointReferenceType" name="org.cc.myCallSeqSeqSeqLong._Anon1_myCallSeqSeqSeqLong" />
+ <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.myCallSeqSeqSeqLong._Anon1_myCallSeqSeqSeqLong" elemname="item" bound="0" type="ns5:org.cc._Anon1_myCallSeqSeqSeqLong" name="org.cc._Anon1_myCallSeqSeqSeqLong" />
+ <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc._Anon1_myCallSeqSeqSeqLong" elemname="item" bound="0" repositoryID="IDL:org/cc/myCallSeqSeqSeqLong:1.0" type="ns5:org.cc.myCallSeqSeqSeqLong" name="org.cc.myCallSeqSeqSeqLong" />
+ <corba:anonsequence xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.IpCall" elemname="item" bound="0" type="ns5:EndpointReferenceType" name="org.cc.anonStruct._Anon1_anonStruct" />
+ <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._Anon1_anonStruct" elemname="item" bound="0" type="ns5:org.cc.anonStruct._Anon2_anonStruct" name="org.cc.anonStruct._Anon2_anonStruct" />
+ <corba:anonsequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" xmlns="" elemtype="ns4:org.cc.anonStruct._Anon2_anonStruct" elemname="item" bound="0" type="ns5:org.cc._Anon1_anonStruct" name="org.cc._Anon1_anonStruct" />
<corba:struct xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" repositoryID="IDL:org/cc/anonStruct:1.0" type="org.cc.anonStruct" name="org.cc.anonStruct">
- <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" name="structSeqSeqSeqLong" idltype="ns4:org.cc._1_anonStruct" />
+ <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence/typemap" name="structSeqSeqSeqLong" idltype="ns4:org.cc._Anon1_anonStruct" />
</corba:struct>
<corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceSequence" binding="org.cc.IpCallCORBABinding" repositoryID="IDL:org/cc/IpCall:1.0" type="ns4:EndpointReferenceType" name="org.cc.IpCall" />
</corba:typeMapping>
@@ -41,45 +41,45 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.myCallSeqSeqSeqLong._1_myCallSeqSeqSeqLong">
+ <xs:complexType name="org.cc.myCallSeqSeqSeqLong._Anon1_myCallSeqSeqSeqLong">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" nillable="true" type="wsa:EndpointReferenceType">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc._1_myCallSeqSeqSeqLong">
+ <xs:complexType name="org.cc._Anon1_myCallSeqSeqSeqLong">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc.myCallSeqSeqSeqLong._1_myCallSeqSeqSeqLong">
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc.myCallSeqSeqSeqLong._Anon1_myCallSeqSeqSeqLong">
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="org.cc.myCallSeqSeqSeqLong">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc._1_myCallSeqSeqSeqLong">
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc._Anon1_myCallSeqSeqSeqLong">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._1_anonStruct">
+ <xs:complexType name="org.cc.anonStruct._Anon1_anonStruct">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" nillable="true" type="wsa:EndpointReferenceType">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc.anonStruct._2_anonStruct">
+ <xs:complexType name="org.cc.anonStruct._Anon2_anonStruct">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc.anonStruct._1_anonStruct">
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc.anonStruct._Anon1_anonStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="org.cc._1_anonStruct">
+ <xs:complexType name="org.cc._Anon1_anonStruct">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc.anonStruct._2_anonStruct">
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="org.cc.anonStruct._Anon2_anonStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="org.cc.anonStruct">
<xs:sequence>
- <xs:element name="structSeqSeqSeqLong" type="org.cc._1_anonStruct">
+ <xs:element name="structSeqSeqSeqLong" type="org.cc._Anon1_anonStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl Mon Jan 7 18:47:56 2008
@@ -20,7 +20,7 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns:tns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" 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/ForwardInterfaceTypedef/typemap">
<corba:alias xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.IpCall" repositoryID="IDL:TypedefIf/typedefCall/myIpCall:1.0" type="ns4:EndpointReferenceType" name="TypedefIf.typedefCall.myIpCall" />
- <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" xmlns="" elemname="item" bound="2" repositoryID="IDL:TypedefIf/typedefCall/myIpCallArray:1.0" type="ns4:TypedefIf.IpCall" name="TypedefIf.typedefCall.myIpCallArray" />
+ <corba:array xmlns:ns5="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" xmlns="" elemtype="ns4:TypedefIf.IpCall" elemname="item" bound="2" repositoryID="IDL:TypedefIf/typedefCall/myIpCallArray:1.0" type="ns5:TypedefIf.typedefCall.myIpCallArray" name="TypedefIf.typedefCall.myIpCallArray" />
<corba:sequence xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" xmlns="" elemtype="ns4:TypedefIf.IpCall" elemname="item" bound="0" repositoryID="IDL:TypedefIf/typedefCall/mySeqIpCall:1.0" type="ns5:EndpointReferenceType" name="TypedefIf.typedefCall.mySeqIpCall" />
<corba:struct xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" repositoryID="IDL:TypedefIf/typedefCall/aStruct:1.0" type="TypedefIf.typedefCall.aStruct" name="TypedefIf.typedefCall.aStruct">
<corba:member name="aStructMyLong" />
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Inheritance.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Inheritance.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Inheritance.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Inheritance.wsdl Mon Jan 7 18:47:56 2008
@@ -183,8 +183,20 @@
</wsdl:operation>
</wsdl:portType>
<wsdl:portType name="X.Interface3">
+ <wsdl:operation name="testInterface1">
+ <wsdl:input name="testInterface1Request" message="tns:testInterface1">
+ </wsdl:input>
+ <wsdl:output name="testInterface1Response" message="tns:testInterface1Response">
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:portType name="A.B.C.E.Interface2">
+ <wsdl:operation name="testInterface1">
+ <wsdl:input name="testInterface1Request" message="tns:testInterface1">
+ </wsdl:input>
+ <wsdl:output name="testInterface1Response" message="tns:testInterface1Response">
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="testInterface2">
<wsdl:input name="testInterface2Request" message="tns:testInterface2">
</wsdl:input>
@@ -192,7 +204,21 @@
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
+ <wsdl:portType name="rootInterface">
+ </wsdl:portType>
<wsdl:portType name="A.B.C.E.Interface4">
+ <wsdl:operation name="testInterface1">
+ <wsdl:input name="testInterface1Request" message="tns:testInterface1">
+ </wsdl:input>
+ <wsdl:output name="testInterface1Response" message="tns:testInterface1Response">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="testInterface2">
+ <wsdl:input name="testInterface2Request" message="tns:testInterface2">
+ </wsdl:input>
+ <wsdl:output name="testInterface2Response" message="tns:testInterface2Response">
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:portType name="A.B.C.D.Interface1">
<wsdl:operation name="testInterface1">
@@ -203,6 +229,18 @@
</wsdl:operation>
</wsdl:portType>
<wsdl:portType name="org.apache.yoko.IpService">
+ <wsdl:operation name="setTest">
+ <wsdl:input name="setTestRequest" message="tns:setTest">
+ </wsdl:input>
+ <wsdl:output name="setTestResponse" message="tns:setTestResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="test">
+ <wsdl:input name="testRequest" message="tns:test">
+ </wsdl:input>
+ <wsdl:output name="testResponse" message="tns:testResponse">
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="setCallback">
<wsdl:input name="setCallbackRequest" message="tns:setCallback">
</wsdl:input>
@@ -218,6 +256,20 @@
</wsdl:portType>
<wsdl:binding name="A.B.C.E.Interface4CORBABinding" type="tns:A.B.C.E.Interface4">
<corba:binding repositoryID="IDL:A/B/C/E/Interface4:1.0" bases="IDL:A/B/C/E/Interface2:1.0" />
+ <wsdl:operation name="testInterface1">
+ <corba:operation name="testInterface1" />
+ <wsdl:input name="testInterface1Request">
+ </wsdl:input>
+ <wsdl:output name="testInterface1Response">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="testInterface2">
+ <corba:operation name="testInterface2" />
+ <wsdl:input name="testInterface2Request">
+ </wsdl:input>
+ <wsdl:output name="testInterface2Response">
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:binding name="org.apache.IpTestCORBABinding" type="tns:org.apache.IpTest">
<corba:binding repositoryID="IDL:org/apache/IpTest:1.0" />
@@ -243,6 +295,13 @@
</wsdl:binding>
<wsdl:binding name="A.B.C.E.Interface2CORBABinding" type="tns:A.B.C.E.Interface2">
<corba:binding repositoryID="IDL:A/B/C/E/Interface2:1.0" bases="IDL:A/B/C/D/Interface1:1.0" />
+ <wsdl:operation name="testInterface1">
+ <corba:operation name="testInterface1" />
+ <wsdl:input name="testInterface1Request">
+ </wsdl:input>
+ <wsdl:output name="testInterface1Response">
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="testInterface2">
<corba:operation name="testInterface2" />
<wsdl:input name="testInterface2Request">
@@ -252,7 +311,23 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:binding name="org.apache.yoko.IpServiceCORBABinding" type="tns:org.apache.yoko.IpService">
- <corba:binding repositoryID="IDL:org/apache/yoko/IpService:1.0" bases="IDL:org/apache/yoko/IpInterface:1.0 IDL:org/apache/IpTest:1.0" />
+ <corba:binding repositoryID="IDL:org/apache/yoko/IpService:1.0" bases="IDL:org/apache/yoko/IpInterface:1.0 IDL:org/apache/IpTest:1.0 IDL:rootInterface:1.0" />
+ <wsdl:operation name="setTest">
+ <corba:operation name="setTest">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/inheritance/typemap" mode="in" name="test" idltype="org.apache.IpTest" />
+ </corba:operation>
+ <wsdl:input name="setTestRequest">
+ </wsdl:input>
+ <wsdl:output name="setTestResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="test">
+ <corba:operation name="test" />
+ <wsdl:input name="testRequest">
+ </wsdl:input>
+ <wsdl:output name="testResponse">
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="setCallback">
<corba:operation name="setCallback">
<corba:param xmlns="http://schemas.apache.org/yoko/idl/inheritance/typemap" mode="in" name="appInterface" idltype="org.apache.yoko.IpInterface" />
@@ -272,6 +347,9 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
+ <wsdl:binding name="rootInterfaceCORBABinding" type="tns:rootInterface">
+ <corba:binding repositoryID="IDL:rootInterface:1.0" />
+ </wsdl:binding>
<wsdl:binding name="A.B.C.D.Interface1CORBABinding" type="tns:A.B.C.D.Interface1">
<corba:binding repositoryID="IDL:A/B/C/D/Interface1:1.0" />
<wsdl:operation name="testInterface1">
@@ -284,6 +362,13 @@
</wsdl:binding>
<wsdl:binding name="X.Interface3CORBABinding" type="tns:X.Interface3">
<corba:binding repositoryID="IDL:X/Interface3:1.0" bases="IDL:A/B/C/D/Interface1:1.0" />
+ <wsdl:operation name="testInterface1">
+ <corba:operation name="testInterface1" />
+ <wsdl:input name="testInterface1Request">
+ </wsdl:input>
+ <wsdl:output name="testInterface1Response">
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="A.B.C.E.Interface4CORBAService">
<wsdl:port name="A.B.C.E.Interface4CORBAPort" binding="tns:A.B.C.E.Interface4CORBABinding">
@@ -307,6 +392,11 @@
</wsdl:service>
<wsdl:service name="X.Interface3CORBAService">
<wsdl:port name="X.Interface3CORBAPort" binding="tns:X.Interface3CORBABinding">
+ <corba:address location="IOR:" />
+ </wsdl:port>
+ </wsdl:service>
+ <wsdl:service name="rootInterfaceCORBAService">
+ <wsdl:port name="rootInterfaceCORBAPort" binding="tns:rootInterfaceCORBABinding">
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLPT.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLPT.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLPT.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLPT.wsdl Mon Jan 7 18:47:56 2008
@@ -20,7 +20,7 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLPT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLPT" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd1="http://schemas.apache.org/yoko/idl/OptionsLPT-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xsd:schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLPT-types" schemaLocation="@LOCATION@"/>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLPT-types" />
</xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployee">
@@ -39,4 +39,4 @@
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLT.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLT.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLT.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_LogicalLT.wsdl Mon Jan 7 18:47:56 2008
@@ -20,7 +20,7 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLT" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd1="http://schemas.apache.org/yoko/idl/OptionsLT-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xsd:schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLT-types" schemaLocation="@LOCATION@"/>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLT-types" />
</xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployeeResponse">
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ObjectRef.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ObjectRef.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ObjectRef.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_ObjectRef.wsdl Mon Jan 7 18:47:56 2008
@@ -27,7 +27,7 @@
<corba:exception xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" repositoryID="IDL:TestException:1.0" type="TestExceptionType" name="TestException">
<corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" name="ref" idltype="ns4:ObjectRef" />
</corba:exception>
- <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" xmlns="" elemname="item" bound="5" repositoryID="IDL:TestArray:1.0" type="ns4:ObjectRef" name="TestArray" />
+ <corba:array xmlns:ns5="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" xmlns="" elemtype="ns4:ObjectRef" elemname="item" bound="5" repositoryID="IDL:TestArray:1.0" type="ns5:TestArray" name="TestArray" />
<corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" xmlns="" elemtype="ns4:ObjectRef" elemname="item" bound="0" repositoryID="IDL:TestSequence:1.0" type="ns5:TestSequence" name="TestSequence" />
<corba:union xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" discriminator="corba:short" repositoryID="IDL:TestUnion:1.0" type="TestUnion" name="TestUnion">
<corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" name="ref" idltype="ns4:ObjectRef">
@@ -220,6 +220,10 @@
</wsdl:message>
<wsdl:message name="_get_refResponse">
<wsdl:part name="parameters" element="tns:_get_refResult">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="TestException">
+ <wsdl:part name="exception" element="tns:TestException">
</wsdl:part>
</wsdl:message>
<wsdl:message name="_set_objResponse">
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Octet.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Octet.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Octet.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Octet.wsdl Mon Jan 7 18:47:56 2008
@@ -23,8 +23,8 @@
<corba:alias xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" basetype="TpOctet" repositoryID="IDL:myOctet:1.0" name="myOctet" />
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemtype="ns4:TpOctet" elemname="item" bound="0" repositoryID="IDL:TpOctetSet:1.0" type="xs:base64Binary" name="TpOctetSet" />
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemtype="ns4:myOctet" elemname="item" bound="0" repositoryID="IDL:TpOctetSet2:1.0" type="xs:base64Binary" name="TpOctetSet2" />
- <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemname="item" bound="6" repositoryID="IDL:TpArrayOctet:1.0" type="ns4:TpOctet" name="TpArrayOctet" />
- <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemname="item" bound="6" repositoryID="IDL:TpArrayOctet2:1.0" type="ns4:myOctet" name="TpArrayOctet2" />
+ <corba:array xmlns:ns5="http://schemas.apache.org/yoko/idl/Octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemtype="ns4:TpOctet" elemname="item" bound="6" repositoryID="IDL:TpArrayOctet:1.0" type="ns5:TpArrayOctet" name="TpArrayOctet" />
+ <corba:array xmlns:ns5="http://schemas.apache.org/yoko/idl/Octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemtype="ns4:myOctet" elemname="item" bound="6" repositoryID="IDL:TpArrayOctet2:1.0" type="ns5:TpArrayOctet2" name="TpArrayOctet2" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Octet" xmlns="http://schemas.apache.org/yoko/idl/Octet" xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -42,4 +42,4 @@
</xs:complexType>
</xs:schema>
</wsdl:types>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsPT.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsPT.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsPT.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsPT.wsdl Mon Jan 7 18:47:56 2008
@@ -20,7 +20,7 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsPT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsPT" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd1="http://schemas.apache.org/yoko/idl/OptionsPT-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xsd:schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsPT-types" schemaLocation="@LOCATION@"/>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsPT-types" />
</xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployee">
@@ -39,4 +39,4 @@
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsSchema.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsSchema.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsSchema.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_OptionsSchema.wsdl Mon Jan 7 18:47:56 2008
@@ -26,7 +26,7 @@
</corba:typeMapping>
<wsdl:types>
<xsd:schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsSchema-types" schemaLocation="@LOCATION@"/>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsSchema-types" />
</xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployee">
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=609848&r1=609847&r2=609848&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 Mon Jan 7 18:47:56 2008
@@ -19,15 +19,15 @@
-->
<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="_1_BasicTest" />
+ <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">
<corba:member name="member1" idltype="corba:string" />
- <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap" name="member2" idltype="ns4:_1_BasicTest" />
+ <corba:member xmlns:ns4="http://schemas.apache.org/yoko/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="_1_ForwardTest" />
+ <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:member name="member1" idltype="corba:string" />
- <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveStruct/typemap" name="member2" idltype="ns4:_1_ForwardTest" />
+ <corba:member xmlns:ns4="http://schemas.apache.org/yoko/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">
@@ -46,7 +46,7 @@
</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:complexType name="_1_BasicTest">
+ <xs:complexType name="_Anon1_BasicTest">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="BasicTest">
</xs:element>
@@ -56,11 +56,11 @@
<xs:sequence>
<xs:element name="member1" type="xs:string">
</xs:element>
- <xs:element name="member2" type="_1_BasicTest">
+ <xs:element name="member2" type="_Anon1_BasicTest">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="_1_ForwardTest">
+ <xs:complexType name="_Anon1_ForwardTest">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="ForwardTest">
</xs:element>
@@ -70,7 +70,7 @@
<xs:sequence>
<xs:element name="member1" type="xs:string">
</xs:element>
- <xs:element name="member2" type="_1_ForwardTest">
+ <xs:element name="member2" type="_Anon1_ForwardTest">
</xs:element>
</xs:sequence>
</xs:complexType>
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=609848&r1=609847&r2=609848&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 Mon Jan 7 18:47:56 2008
@@ -19,22 +19,22 @@
-->
<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="_1_BasicTest" />
+ <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">
<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:_1_BasicTest">
+ <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/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="_1_ForwardTest" />
+ <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: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:_1_ForwardTest">
+ <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/RecursiveUnion/typemap" name="case2" idltype="ns4:_Anon1_ForwardTest">
<corba:case label="2" />
</corba:unionbranch>
<corba:unionbranch name="caseDef" idltype="corba:string" default="true" />
@@ -66,7 +66,7 @@
</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:complexType name="_1_BasicTest">
+ <xs:complexType name="_Anon1_BasicTest">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="BasicTest">
</xs:element>
@@ -76,13 +76,13 @@
<xs:choice>
<xs:element name="case1" type="xs:int">
</xs:element>
- <xs:element name="case2" type="_1_BasicTest">
+ <xs:element name="case2" type="_Anon1_BasicTest">
</xs:element>
<xs:element name="caseDef" type="xs:string">
</xs:element>
</xs:choice>
</xs:complexType>
- <xs:complexType name="_1_ForwardTest">
+ <xs:complexType name="_Anon1_ForwardTest">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="ForwardTest">
</xs:element>
@@ -92,7 +92,7 @@
<xs:choice>
<xs:element name="case1" type="xs:int">
</xs:element>
- <xs:element name="case2" type="_1_ForwardTest">
+ <xs:element name="case2" type="_Anon1_ForwardTest">
</xs:element>
<xs:element name="caseDef" type="xs:string">
</xs:element>
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=609848&r1=609847&r2=609848&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 Mon Jan 7 18:47:56 2008
@@ -19,10 +19,10 @@
-->
<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="_1_string10" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_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="_1_wstring20" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_wstring20" repositoryID="IDL:wstring20:1.0" type="ns4:wstring20" name="wstring20" />
+ <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" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:myString:1.0" type="xs:string" name="myString" />
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Typedef.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Typedef.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Typedef.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_Typedef.wsdl Mon Jan 7 18:47:56 2008
@@ -35,8 +35,8 @@
<corba:alias basetype="corba:any" repositoryID="IDL:TypedefIf/myAny:1.0" name="TypedefIf.myAny" />
<corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:TypedefIf/SeqLong:1.0" type="ns4:TypedefIf.SeqLong" name="TypedefIf.SeqLong" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:TypedefIf/aString:1.0" type="xs:string" name="TypedefIf.aString" />
- <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/Typedef" bound="10" type="TypedefIf.aBoundedString" name="TypedefIf._1_aBoundedString" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf._1_aBoundedString" repositoryID="IDL:TypedefIf/aBoundedString:1.0" type="ns4:TypedefIf.aBoundedString" name="TypedefIf.aBoundedString" />
+ <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/Typedef" bound="10" type="TypedefIf.aBoundedString" name="TypedefIf._Anon1_aBoundedString" />
+ <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf._Anon1_aBoundedString" repositoryID="IDL:TypedefIf/aBoundedString:1.0" type="ns4:TypedefIf.aBoundedString" name="TypedefIf.aBoundedString" />
<corba:fixed xmlns="http://schemas.apache.org/yoko/idl/Typedef" scale="2" digits="5" repositoryID="IDL:TypedefIf/Fixed52:1.0" type="TypedefIf.Fixed52" name="TypedefIf.Fixed52" />
<corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.SeqLong" repositoryID="IDL:TypedefIf/mySeqLong:1.0" name="TypedefIf.mySeqLong" />
<corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aString" repositoryID="IDL:TypedefIf/myString:1.0" name="TypedefIf.myString" />
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl Mon Jan 7 18:47:56 2008
@@ -20,8 +20,8 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:tns="http://schemas.apache.org/yoko/idl/sequence_octet" 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_octet/typemap">
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:mySequenceOctet:1.0" type="xs:base64Binary" name="mySequenceOctet" />
- <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:base64Binary" name="_1_mySequenceSequenceOctet" />
- <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:_1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
+ <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:base64Binary" name="_Anon1_mySequenceSequenceOctet" />
+ <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:_Anon1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
<corba:alias basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:aliasOctet" elemname="item" bound="0" repositoryID="IDL:octetSeq:1.0" type="xs:base64Binary" name="octetSeq" />
</corba:typeMapping>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl Mon Jan 7 18:47:56 2008
@@ -20,8 +20,8 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:tns="http://schemas.apache.org/yoko/idl/sequence_octet" 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_octet/typemap">
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:mySequenceOctet:1.0" type="xs:hexBinary" name="mySequenceOctet" />
- <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:hexBinary" name="_1_mySequenceSequenceOctet" />
- <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:_1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
+ <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:hexBinary" name="_Anon1_mySequenceSequenceOctet" />
+ <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:_Anon1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
<corba:alias basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:aliasOctet" elemname="item" bound="0" repositoryID="IDL:octetSeq:1.0" type="xs:hexBinary" name="octetSeq" />
</corba:typeMapping>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_scopedString.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_scopedString.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_scopedString.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_scopedString.wsdl Mon Jan 7 18:47:56 2008
@@ -21,10 +21,10 @@
<corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/scopedString/typemap">
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:mod/int/str/myString:1.0" type="xs:string" name="mod.int.str.myString" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:wstring" repositoryID="IDL:mod/int/str/myWString:1.0" type="xs:string" name="mod.int.str.myWString" />
- <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/scopedString" bound="10" type="mod.int.str.myString10" name="mod.int.str._1_myString10" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._1_myString10" repositoryID="IDL:mod/int/str/myString10:1.0" type="ns4:mod.int.str.myString10" name="mod.int.str.myString10" />
- <corba:anonwstring xmlns="http://schemas.apache.org/yoko/idl/scopedString" bound="10" type="mod.int.str.myWString10" name="mod.int.str._1_myWString10" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._1_myWString10" repositoryID="IDL:mod/int/str/myWString10:1.0" type="ns4:mod.int.str.myWString10" name="mod.int.str.myWString10" />
+ <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/scopedString" bound="10" type="mod.int.str.myString10" name="mod.int.str._Anon1_myString10" />
+ <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._Anon1_myString10" repositoryID="IDL:mod/int/str/myString10:1.0" type="ns4:mod.int.str.myString10" name="mod.int.str.myString10" />
+ <corba:anonwstring xmlns="http://schemas.apache.org/yoko/idl/scopedString" bound="10" type="mod.int.str.myWString10" name="mod.int.str._Anon1_myWString10" />
+ <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._Anon1_myWString10" repositoryID="IDL:mod/int/str/myWString10:1.0" type="ns4:mod.int.str.myWString10" name="mod.int.str.myWString10" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString" xmlns:xs="http://www.w3.org/2001/XMLSchema">
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_sequence_octet_corba_typemap_tns.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_sequence_octet_corba_typemap_tns.wsdl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_sequence_octet_corba_typemap_tns.wsdl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/expected_sequence_octet_corba_typemap_tns.wsdl Mon Jan 7 18:47:56 2008
@@ -20,8 +20,8 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:tns="http://schemas.apache.org/yoko/idl/sequence_octet" 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://yoko.org/foobar/typemap">
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:mySequenceOctet:1.0" type="xs:base64Binary" name="mySequenceOctet" />
- <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:base64Binary" name="_1_mySequenceSequenceOctet" />
- <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://yoko.org/foobar/typemap" xmlns="" elemtype="ns4:_1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
+ <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:base64Binary" name="_Anon1_mySequenceSequenceOctet" />
+ <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://yoko.org/foobar/typemap" xmlns="" elemtype="ns4:_Anon1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
<corba:alias basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
<corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://yoko.org/foobar/typemap" xmlns="" elemtype="ns4:aliasOctet" elemname="item" bound="0" repositoryID="IDL:octetSeq:1.0" type="xs:base64Binary" name="octetSeq" />
</corba:typeMapping>
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/included.idl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/included.idl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/included.idl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/included.idl Mon Jan 7 18:47:56 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "include.idl"
+#include "include.idl" //Sample comment should not cause exception
module yoko {
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idl/inheritance.idl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idl/inheritance.idl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idl/inheritance.idl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idl/inheritance.idl Mon Jan 7 18:47:56 2008
@@ -17,6 +17,7 @@
* under the License.
*/
+interface rootInterface {};
module org {
module apache {
@@ -29,7 +30,7 @@
interface IpInterface {
void setTest(in IpTest test);
};
- interface IpService : IpInterface,::org::apache::IpTest {
+ interface IpService : IpInterface,::org::apache::IpTest,rootInterface {
void setCallback(in IpInterface appInterface);
void setTestCallback(in IpTest test);
};
@@ -56,8 +57,8 @@
interface Interface2 : D::Interface1 {
void testInterface2();
};
- interface Interface4 : E::Interface2 {
- };
+ interface Interface4 : E::Interface2 {
+ };
};
};
};
@@ -65,7 +66,7 @@
module X {
interface Interface3 : A::B::C::D::Interface1 {
- };
+ };
};
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/B.idl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/B.idl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/B.idl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/B.idl Mon Jan 7 18:47:56 2008
@@ -1,4 +1,4 @@
-#include "A.idl"
+#include <A.idl>
module a
{
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C-resolved.idl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C-resolved.idl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C-resolved.idl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C-resolved.idl Mon Jan 7 18:47:56 2008
@@ -14,13 +14,13 @@
const boolean b = TRUE;
-
+/* #endif _b */
const boolean c = FALSE;
-
+// endif _c
};
};
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C.idl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C.idl?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C.idl (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/idlpreprocessor/C.idl Mon Jan 7 18:47:56 2008
@@ -3,23 +3,23 @@
#ifdef _a
#define _b
#else
-#define _c
+ #define _c
#endif
module c
{
interface C {
-#ifdef _b
+ #ifdef _b
const boolean b = TRUE;
-#else
+ #else
const boolean b = FALSE;
-#endif
+ #endif /* #endif _b */
#ifndef _c
const boolean c = FALSE;
#else
const boolean c = TRUE;
-#endif
+#endif // endif _c
};
};
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml Mon Jan 7 18:47:56 2008
@@ -22,9 +22,9 @@
<!-- The xhtml namespace is for usage documentation -->
<toolspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xhtml="http://www.w3.org/TR/xhtml1/strict"
- xsi:schemaLocation="http://www.xsume.com/Xutil/ToolSpecification http://www.xsume.com/schema/xutil/tool-specification.xsd"
- xmlns="http://www.xsume.com/Xutil/ToolSpecification"
- xmlns:ts="http://www.xsume.com/Xutil/ToolSpecification">
+ xsi:schemaLocation="http://cxf.apache.org/Xutil/ToolSpecification http://cxf.apache.org/schema/xutil/tool-specification.xsd"
+ xmlns="http://cxf.apache.org/Xutil/ToolSpecification"
+ xmlns:ts="http://cxf.apache.org/Xutil/ToolSpecification">
<annotation> Examples :
idltowsdl HelloWorld.idl
Modified: incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml?rev=609848&r1=609847&r2=609848&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml (original)
+++ incubator/cxf/trunk/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml Mon Jan 7 18:47:56 2008
@@ -22,10 +22,10 @@
<!-- The xhtml namespace is for usage documentation -->
<toolspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xhtml="http://www.w3.org/TR/xhtml1/strict"
- xsi:schemaLocation="http://www.xsume.com/Xutil/ToolSpecification
- http://www.xsume.com/schema/xutil/tool-specification.xsd"
- xmlns="http://www.xsume.com/Xutil/ToolSpecification"
- xmlns:ts="http://www.xsume.com/Xutil/ToolSpecification">
+ xsi:schemaLocation="http://cxf.apache.org/Xutil/ToolSpecification
+ http://cxf.apache.org/schema/xutil/tool-specification.xsd"
+ xmlns="http://cxf.apache.org/Xutil/ToolSpecification"
+ xmlns:ts="http://cxf.apache.org/Xutil/ToolSpecification">
<annotation> Examples :
wsdltoidl HelloWorld.wsdl
wsdltoidl -corba -i GreetPortType -o Greeting.wsdl TestGreeting.wsdl