You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by mv...@apache.org on 2006/11/27 16:04:38 UTC
svn commit: r479672 - in
/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src:
main/java/org/apache/yoko/tools/processors/idl/ test/resources/idl/
Author: mvescovi
Date: Mon Nov 27 08:04:38 2006
New Revision: 479672
URL: http://svn.apache.org/viewvc?view=rev&rev=479672
Log:
YOKO-67 Fixing scoped wsdl:portType, wsdl:binding, and wsdl:service scoped names
Modified:
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/Typedef.idl
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Anonstring.wsdl
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Enum.wsdl
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Fixed.wsdl
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java?view=diff&rev=479672&r1=479671&r2=479672
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java Mon Nov 27 08:04:38 2006
@@ -84,15 +84,12 @@
AST identifierNode = node.getFirstChild();
String interfaceName = identifierNode.toString();
- if (module != null) {
- interfaceName = module + "." + interfaceName;
- }
Scope interfaceScope = new Scope(getScope(), interfaceName);
//Scope interfaceScope = getScope();
portType = definition.createPortType();
- portType.setQName(new QName(definition.getTargetNamespace(), interfaceName));
+ portType.setQName(new QName(definition.getTargetNamespace(), interfaceScope.toString()));
portType.setUndefined(false);
definition.addPortType(portType);
Binding binding = createBinding();
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/Typedef.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/Typedef.idl?view=diff&rev=479672&r1=479671&r2=479672
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/Typedef.idl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/Typedef.idl Mon Nov 27 08:04:38 2006
@@ -95,8 +95,6 @@
void opIn(
in myFloat inMyFloat,
in myDouble inMyDouble,
- in myFloat inMyFloat,
- in myDouble inMyDouble,
in myLongDouble inMyLongDouble,
in myShort inMyShort,
in myLong inMyLong,
@@ -127,8 +125,6 @@
void opOut(
out myFloat outMyFloat,
out myDouble outMyDouble,
- out myFloat outMyFloat,
- out myDouble outMyDouble,
out myLongDouble outMyLongDouble,
out myShort outMyShort,
out myLong outMyLong,
@@ -157,8 +153,6 @@
);
void opInOut(
- inout myFloat inoutMyFloat,
- inout myDouble inoutMyDouble,
inout myFloat inoutMyFloat,
inout myDouble inoutMyDouble,
inout myLongDouble inoutMyLongDouble,
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Anonstring.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Anonstring.wsdl?view=diff&rev=479672&r1=479671&r2=479672
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Anonstring.wsdl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Anonstring.wsdl Mon Nov 27 08:04:38 2006
@@ -352,7 +352,7 @@
<wsdl:message name="anonStringOperationResponse">
<wsdl:part name="outparameter" element="tns:anonStringOperationResponse"/>
</wsdl:message>
- <wsdl:portType name="anonStringIf">
+ <wsdl:portType name="AnonStrings.anonStringIf">
<wsdl:operation name="anonStringOperation">
<wsdl:input name="anonStringOperationRequest" message="tns:anonStringOperation"/>
<wsdl:output name="anonStringOperationResponse" message="tns:anonStringOperationResponse"/>
@@ -362,8 +362,8 @@
<wsdl:output name="anotherAnonStringOperationResponse" message="tns:anotherAnonStringOperationResponse"/>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="anonStringIfCORBABinding" type="tns:anonStringIf">
- <corba:binding repositoryID="IDL:anonStringIf:1.0" />
+ <wsdl:binding name="AnonStrings.anonStringIfCORBABinding" type="tns:AnonStrings.anonStringIf">
+ <corba:binding repositoryID="IDL:AnonStrings/anonStringIf:1.0" />
<wsdl:operation name="anonStringOperation">
<corba:operation name="anonStringOperation">
<corba:param xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" mode="in" name="inString" idltype="AnonStrings._2_anonStringIf" />
@@ -385,8 +385,8 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="anonStringIfCORBAService">
- <wsdl:port name="anonStringIfCORBAPort" binding="tns:anonStringIfCORBABinding">
+ <wsdl:service name="AnonStrings.anonStringIfCORBAService">
+ <wsdl:port name="AnonStrings.anonStringIfCORBAPort" binding="tns:AnonStrings.anonStringIfCORBABinding">
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Enum.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Enum.wsdl?view=diff&rev=479672&r1=479671&r2=479672
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Enum.wsdl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Enum.wsdl Mon Nov 27 08:04:38 2006
@@ -248,6 +248,16 @@
<wsdl:message name="if3_op2">
<wsdl:part name="inparameter" element="tns:if3_op2"/>
</wsdl:message>
+ <wsdl:portType name="m1.if3">
+ <wsdl:operation name="if3_op1">
+ <wsdl:input name="if3_op1Request" message="tns:if3_op1"/>
+ <wsdl:output name="if3_op1Response" message="tns:if3_op1Response"/>
+ </wsdl:operation>
+ <wsdl:operation name="if3_op2">
+ <wsdl:input name="if3_op2Request" message="tns:if3_op2"/>
+ <wsdl:output name="if3_op2Response" message="tns:if3_op2Response"/>
+ </wsdl:operation>
+ </wsdl:portType>
<wsdl:portType name="if2">
<wsdl:operation name="if2_op1">
<wsdl:input name="if2_op1Request" message="tns:if2_op1"/>
@@ -262,16 +272,6 @@
<wsdl:output name="if2_op3Response" message="tns:if2_op3Response"/>
</wsdl:operation>
</wsdl:portType>
- <wsdl:portType name="if3">
- <wsdl:operation name="if3_op1">
- <wsdl:input name="if3_op1Request" message="tns:if3_op1"/>
- <wsdl:output name="if3_op1Response" message="tns:if3_op1Response"/>
- </wsdl:operation>
- <wsdl:operation name="if3_op2">
- <wsdl:input name="if3_op2Request" message="tns:if3_op2"/>
- <wsdl:output name="if3_op2Response" message="tns:if3_op2Response"/>
- </wsdl:operation>
- </wsdl:portType>
<wsdl:portType name="if1">
<wsdl:operation name="if1_op1">
<wsdl:input name="if1_op1Request" message="tns:if1_op1"/>
@@ -286,6 +286,27 @@
<wsdl:output name="if1_op3Response" message="tns:if1_op3Response"/>
</wsdl:operation>
</wsdl:portType>
+ <wsdl:binding name="m1.if3CORBABinding" type="tns:m1.if3">
+ <corba:binding repositoryID="IDL:m1/if3:1.0" />
+ <wsdl:operation name="if3_op1">
+ <corba:operation name="if3_op1">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type3" idltype="m1.e_type3" />
+ </corba:operation>
+ <wsdl:input name="if3_op1Request">
+ </wsdl:input>
+ <wsdl:output name="if3_op1Response">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="if3_op2">
+ <corba:operation name="if3_op2">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type4" idltype="m1.if3.e_type4" />
+ </corba:operation>
+ <wsdl:input name="if3_op2Request">
+ </wsdl:input>
+ <wsdl:output name="if3_op2Response">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
<wsdl:binding name="if1CORBABinding" type="tns:if1">
<corba:binding repositoryID="IDL:if1:1.0" />
<wsdl:operation name="if1_op1">
@@ -316,27 +337,6 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:binding name="if3CORBABinding" type="tns:if3">
- <corba:binding repositoryID="IDL:if3:1.0" />
- <wsdl:operation name="if3_op1">
- <corba:operation name="if3_op1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type3" idltype="m1.e_type3" />
- </corba:operation>
- <wsdl:input name="if3_op1Request">
- </wsdl:input>
- <wsdl:output name="if3_op1Response">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="if3_op2">
- <corba:operation name="if3_op2">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type4" idltype="m1.if3.e_type4" />
- </corba:operation>
- <wsdl:input name="if3_op2Request">
- </wsdl:input>
- <wsdl:output name="if3_op2Response">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
<wsdl:binding name="if2CORBABinding" type="tns:if2">
<corba:binding repositoryID="IDL:if2:1.0" />
<wsdl:operation name="if2_op1">
@@ -372,8 +372,8 @@
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>
- <wsdl:service name="if3CORBAService">
- <wsdl:port name="if3CORBAPort" binding="tns:if3CORBABinding">
+ <wsdl:service name="m1.if3CORBAService">
+ <wsdl:port name="m1.if3CORBAPort" binding="tns:m1.if3CORBABinding">
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Fixed.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Fixed.wsdl?view=diff&rev=479672&r1=479671&r2=479672
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Fixed.wsdl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Fixed.wsdl Mon Nov 27 08:04:38 2006
@@ -198,7 +198,17 @@
<wsdl:message name="op2_1Response">
<wsdl:part name="outparameter" element="tns:op2_1Response"/>
</wsdl:message>
- <wsdl:portType name="m_if">
+ <wsdl:portType name="if">
+ <wsdl:operation name="op2_1">
+ <wsdl:input name="op2_1Request" message="tns:op2_1"/>
+ <wsdl:output name="op2_1Response" message="tns:op2_1Response"/>
+ </wsdl:operation>
+ <wsdl:operation name="op2_2">
+ <wsdl:input name="op2_2Request" message="tns:op2_2"/>
+ <wsdl:output name="op2_2Response" message="tns:op2_2Response"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:portType name="m.m_if">
<wsdl:operation name="op4_1">
<wsdl:input name="op4_1Request" message="tns:op4_1"/>
<wsdl:output name="op4_1Response" message="tns:op4_1Response"/>
@@ -212,39 +222,8 @@
<wsdl:output name="op4_4Response" message="tns:op4_4Response"/>
</wsdl:operation>
</wsdl:portType>
- <wsdl:portType name="if">
- <wsdl:operation name="op2_1">
- <wsdl:input name="op2_1Request" message="tns:op2_1"/>
- <wsdl:output name="op2_1Response" message="tns:op2_1Response"/>
- </wsdl:operation>
- <wsdl:operation name="op2_2">
- <wsdl:input name="op2_2Request" message="tns:op2_2"/>
- <wsdl:output name="op2_2Response" message="tns:op2_2Response"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="ifCORBABinding" type="tns:if">
- <corba:binding repositoryID="IDL:if:1.0" />
- <wsdl:operation name="op2_1">
- <corba:operation name="op2_1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" name="in_op2_1_f1_1" idltype="f1_1" />
- </corba:operation>
- <wsdl:input name="op2_1Request">
- </wsdl:input>
- <wsdl:output name="op2_1Response">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="op2_2">
- <corba:operation name="op2_2">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="out" name="out_op2_2_f2_2" idltype="if.f2_2" />
- </corba:operation>
- <wsdl:input name="op2_2Request">
- </wsdl:input>
- <wsdl:output name="op2_2Response">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="m_ifCORBABinding" type="tns:m_if">
- <corba:binding repositoryID="IDL:m_if:1.0" />
+ <wsdl:binding name="m.m_ifCORBABinding" type="tns:m.m_if">
+ <corba:binding repositoryID="IDL:m/m_if:1.0" />
<wsdl:operation name="op4_1">
<corba:operation name="op4_1">
<corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" name="in_m_if_op4_1_f1_1" idltype="f1_1" />
@@ -273,13 +252,34 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="m_ifCORBAService">
- <wsdl:port name="m_ifCORBAPort" binding="tns:m_ifCORBABinding">
+ <wsdl:binding name="ifCORBABinding" type="tns:if">
+ <corba:binding repositoryID="IDL:if:1.0" />
+ <wsdl:operation name="op2_1">
+ <corba:operation name="op2_1">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" name="in_op2_1_f1_1" idltype="f1_1" />
+ </corba:operation>
+ <wsdl:input name="op2_1Request">
+ </wsdl:input>
+ <wsdl:output name="op2_1Response">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="op2_2">
+ <corba:operation name="op2_2">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="out" name="out_op2_2_f2_2" idltype="if.f2_2" />
+ </corba:operation>
+ <wsdl:input name="op2_2Request">
+ </wsdl:input>
+ <wsdl:output name="op2_2Response">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="ifCORBAService">
+ <wsdl:port name="ifCORBAPort" binding="tns:ifCORBABinding">
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>
- <wsdl:service name="ifCORBAService">
- <wsdl:port name="ifCORBAPort" binding="tns:ifCORBABinding">
+ <wsdl:service name="m.m_ifCORBAService">
+ <wsdl:port name="m.m_ifCORBAPort" binding="tns:m.m_ifCORBABinding">
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>