Author: dkulp
Date: Thu Mar 12 18:26:02 2009
New Revision: 752961
URL: http://svn.apache.org/viewvc?rev=752961&view=rev
Log:
[CXF-2108] Make sure Array's have the correct scopes in idl2wsdl so that they
can be found.
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
cxf/trunk/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java?rev=752961&r1=752960&r2=752961&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
(original)
+++
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
Thu Mar 12 18:26:02 2009
@@ -99,7 +99,8 @@
while (identifierNode != null) {
if (ArrayVisitor.accept(identifierNode)) {
- ArrayVisitor arrayVisitor = new
ArrayVisitor(getScope(),
+ ArrayVisitor arrayVisitor = new ArrayVisitor(new
Scope(getScope(),
+
identifierNode.getText()),
definition,
schema,
wsdlVisitor,
Modified:
cxf/trunk/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl?rev=752961&r1=752960&r2=752961&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl
(original)
+++
cxf/trunk/tools/corba/src/test/resources/idl/expected_Anonstring_unbounded.wsdl
Thu Mar 12 18:26:02 2009
@@ -1,67 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
<wsdl:definitions
targetNamespace="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:tns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:corba="http://cxf.apache.org/bindings/corba";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
<corba:typeMapping
targetNamespace="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";>
- <corba:array
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemtype="corba:string" elemname="item" bound="10"
repositoryID="IDL:AnonStrings:1.0" type="ns4:AnonStrings" name="AnonStrings" />
- <corba:sequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemtype="corba:string" elemname="item" bound="0"
repositoryID="IDL:AnonStrings/SequenceBoundedString:1.0"
type="ns4:AnonStrings.SequenceBoundedString"
name="AnonStrings.SequenceBoundedString" />
- <corba:anonsequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemtype="corba:string" elemname="item" bound="0"
type="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString"
name="AnonStrings._Anon1_SequenceSequenceBoundedString" />
- <corba:sequence
xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";
xmlns="" elemtype="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString"
elemname="item" bound="0"
repositoryID="IDL:AnonStrings/SequenceSequenceBoundedString:1.0"
type="ns5:AnonStrings.SequenceSequenceBoundedString"
name="AnonStrings.SequenceSequenceBoundedString" />
- <corba:sequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemtype="corba:string" elemname="item" bound="20"
repositoryID="IDL:AnonStrings/BoundedSequenceBoundedString:1.0"
type="ns4:AnonStrings.BoundedSequenceBoundedString"
name="AnonStrings.BoundedSequenceBoundedString" />
- <corba:anonsequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemtype="corba:string" elemname="item" bound="20"
type="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString"
name="AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" />
- <corba:sequence
xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";
xmlns="" elemtype="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString"
elemname="item" bound="0"
repositoryID="IDL:AnonStrings/SequenceBoundedSequenceBoundedString:1.0"
type="ns5:AnonStrings.SequenceBoundedSequenceBoundedString"
name="AnonStrings.SequenceBoundedSequenceBoundedString" />
+ <corba:array
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemname="item" bound="10" elemtype="corba:string"
repositoryID="IDL:AnonStrings/String5Array:1.0"
type="ns4:AnonStrings.String5Array" name="AnonStrings.String5Array" />
+ <corba:sequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemname="item" bound="0" elemtype="corba:string"
repositoryID="IDL:AnonStrings/SequenceBoundedString:1.0"
type="ns4:AnonStrings.SequenceBoundedString"
name="AnonStrings.SequenceBoundedString" />
+ <corba:anonsequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemname="item" bound="0" elemtype="corba:string"
type="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString"
name="AnonStrings._Anon1_SequenceSequenceBoundedString" />
+ <corba:sequence
xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";
xmlns="" elemname="item" bound="0"
elemtype="ns4:AnonStrings._Anon1_SequenceSequenceBoundedString"
repositoryID="IDL:AnonStrings/SequenceSequenceBoundedString:1.0"
type="ns5:AnonStrings.SequenceSequenceBoundedString"
name="AnonStrings.SequenceSequenceBoundedString" />
+ <corba:sequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemname="item" bound="20" elemtype="corba:string"
repositoryID="IDL:AnonStrings/BoundedSequenceBoundedString:1.0"
type="ns4:AnonStrings.BoundedSequenceBoundedString"
name="AnonStrings.BoundedSequenceBoundedString" />
+ <corba:anonsequence
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring"; xmlns=""
elemname="item" bound="20" elemtype="corba:string"
type="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString"
name="AnonStrings._Anon1_SequenceBoundedSequenceBoundedString" />
+ <corba:sequence
xmlns:ns5="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";
xmlns="" elemname="item" bound="0"
elemtype="ns4:AnonStrings._Anon1_SequenceBoundedSequenceBoundedString"
repositoryID="IDL:AnonStrings/SequenceBoundedSequenceBoundedString:1.0"
type="ns5:AnonStrings.SequenceBoundedSequenceBoundedString"
name="AnonStrings.SequenceBoundedSequenceBoundedString" />
<corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
repositoryID="IDL:AnonStrings/anonStringStruct:1.0"
type="AnonStrings.anonStringStruct" name="AnonStrings.anonStringStruct">
- <corba:member name="unboundedString" idltype="corba:string" />
- <corba:member name="anotherUnboundedString" idltype="corba:string" />
- <corba:member name="anonBoundedString" idltype="corba:string" />
- <corba:member name="anotherAnonBoundedString" idltype="corba:string" />
+ <corba:member idltype="corba:string" name="unboundedString" />
+ <corba:member idltype="corba:string" name="anotherUnboundedString" />
+ <corba:member idltype="corba:string" name="anonBoundedString" />
+ <corba:member idltype="corba:string" name="anotherAnonBoundedString" />
</corba:struct>
<corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
repositoryID="IDL:AnonStrings/typedefAnonStringStruct:1.0"
type="AnonStrings.typedefAnonStringStruct"
name="AnonStrings.typedefAnonStringStruct">
- <corba:member name="unboundedString" idltype="corba:string" />
- <corba:member name="anotherUnboundedString" idltype="corba:string" />
- <corba:member name="anonBoundedString" idltype="corba:string" />
- <corba:member name="anotherAnonBoundedString" idltype="corba:string" />
+ <corba:member idltype="corba:string" name="unboundedString" />
+ <corba:member idltype="corba:string" name="anotherUnboundedString" />
+ <corba:member idltype="corba:string" name="anonBoundedString" />
+ <corba:member idltype="corba:string" name="anotherAnonBoundedString" />
</corba:struct>
<corba:alias
xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";
basetype="AnonStrings.typedefAnonStringStruct"
repositoryID="IDL:AnonStrings/myTypedefAnonStringStruct:1.0"
name="AnonStrings.myTypedefAnonStringStruct" />
<corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
discriminator="corba:long" repositoryID="IDL:AnonStrings/anonStringUnion:1.0"
type="AnonStrings.anonStringUnion" name="AnonStrings.anonStringUnion">
- <corba:unionbranch name="anonStringUnion1" idltype="corba:string">
+ <corba:unionbranch idltype="corba:string" name="anonStringUnion1">
<corba:case label="1" />
</corba:unionbranch>
- <corba:unionbranch name="anonStringUnionDefault" idltype="corba:string"
default="true" />
+ <corba:unionbranch default="true" idltype="corba:string"
name="anonStringUnionDefault" />
</corba:union>
<corba:union xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
discriminator="corba:long"
repositoryID="IDL:AnonStrings/typedefAnonStringUnion:1.0"
type="AnonStrings.typedefAnonStringUnion"
name="AnonStrings.typedefAnonStringUnion">
- <corba:unionbranch name="anonStringUnion1" idltype="corba:string">
+ <corba:unionbranch idltype="corba:string" name="anonStringUnion1">
<corba:case label="1" />
</corba:unionbranch>
- <corba:unionbranch name="anonStringUnionDefault" idltype="corba:string"
default="true" />
+ <corba:unionbranch default="true" idltype="corba:string"
name="anonStringUnionDefault" />
</corba:union>
<corba:alias
xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring/typemap";
basetype="AnonStrings.typedefAnonStringUnion"
repositoryID="IDL:AnonStrings/myTypedefAnonStringUnion:1.0"
name="AnonStrings.myTypedefAnonStringUnion" />
<corba:exception
xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
repositoryID="IDL:AnonStrings/anonException:1.0"
type="AnonStrings.anonExceptionType" name="AnonStrings.anonException">
- <corba:member name="unboundedString" idltype="corba:string" />
- <corba:member name="anotherUnboundedString" idltype="corba:string" />
- <corba:member name="anonBoundedAnonString" idltype="corba:string" />
- <corba:member name="anotherBoundedAnonString" idltype="corba:string" />
+ <corba:member idltype="corba:string" name="unboundedString" />
+ <corba:member idltype="corba:string" name="anotherUnboundedString" />
+ <corba:member idltype="corba:string" name="anonBoundedAnonString" />
+ <corba:member idltype="corba:string" name="anotherBoundedAnonString" />
</corba:exception>
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified"
elementFormDefault="unqualified"
targetNamespace="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns="http://cxf.apache.org/bindings/corba/idl/Anonstring";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:complexType name="AnonStrings">
+ <xs:complexType name="AnonStrings.String5Array">
<xs:sequence>
<xs:element maxOccurs="10" minOccurs="10" name="item"
type="xs:string">
</xs:element>
@@ -191,10 +173,6 @@
</xs:complexType>
</xs:schema>
</wsdl:types>
- <wsdl:message name="anonStringOperation">
- <wsdl:part name="inparameter" element="tns:anonStringOperation">
- </wsdl:part>
- </wsdl:message>
<wsdl:message name="anotherAnonStringOperation">
<wsdl:part name="inparameter" element="tns:anotherAnonStringOperation">
</wsdl:part>
@@ -203,14 +181,18 @@
<wsdl:part name="exception" element="tns:AnonStrings.anonException">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="anotherAnonStringOperationResponse">
- <wsdl:part name="outparameter"
element="tns:anotherAnonStringOperationResponse">
- </wsdl:part>
- </wsdl:message>
<wsdl:message name="anonStringOperationResponse">
<wsdl:part name="outparameter" element="tns:anonStringOperationResponse">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="anonStringOperation">
+ <wsdl:part name="inparameter" element="tns:anonStringOperation">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="anotherAnonStringOperationResponse">
+ <wsdl:part name="outparameter"
element="tns:anotherAnonStringOperationResponse">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:portType name="AnonStrings.anonStringIf">
<wsdl:operation name="anonStringOperation">
<wsdl:input name="anonStringOperationRequest"
message="tns:anonStringOperation">
@@ -229,8 +211,8 @@
<corba:binding repositoryID="IDL:AnonStrings/anonStringIf:1.0" />
<wsdl:operation name="anonStringOperation">
<corba:operation name="anonStringOperation">
- <corba:param mode="in" name="inString" idltype="corba:string" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="inString" />
+ <corba:return idltype="corba:string" name="return" />
</corba:operation>
<wsdl:input name="anonStringOperationRequest">
</wsdl:input>
@@ -239,8 +221,8 @@
</wsdl:operation>
<wsdl:operation name="anotherAnonStringOperation">
<corba:operation name="anotherAnonStringOperation">
- <corba:param mode="in" name="inString" idltype="corba:string" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="inString" />
+ <corba:return idltype="corba:string" name="return" />
</corba:operation>
<wsdl:input name="anotherAnonStringOperationRequest">
</wsdl:input>
