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 dm...@apache.org on 2007/04/20 14:47:25 UTC
svn commit: r530830 - in /incubator/yoko/trunk:
bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/
bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/
tools/src/main/java/org/apache/yoko/tools/processors/idl/
tools/src/test/java/...
Author: dmiddlem
Date: Fri Apr 20 07:47:24 2007
New Revision: 530830
URL: http://svn.apache.org/viewvc?view=rev&rev=530830
Log:
Commit for YOKO-351:
* Detecting duplicate schema element names and prefixing with scope information
* Updating binding to handle different CORBA and WSDL operation names in the
case where scopeing is prefixed to the operation name in WSDL.
* Adding test case for the IDLToWSDL tool. Binding testcase coming shortly.
Added:
incubator/yoko/trunk/tools/src/test/resources/idl/duplicateOpNames.idl
incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl (with props)
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java
incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl
incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl
incubator/yoko/trunk/tools/src/test/resources/idl/primitives.idl
incubator/yoko/trunk/tools/src/test/resources/idl/scopingObjectRef.idl
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java Fri Apr 20 07:47:24 2007
@@ -19,18 +19,25 @@
package org.apache.yoko.bindings.corba.runtime;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.schemas.yoko.bindings.corba.BindingType;
+import org.apache.schemas.yoko.bindings.corba.OperationType;
import org.apache.yoko.bindings.corba.CorbaBindingException;
import org.apache.yoko.bindings.corba.CorbaDestination;
import org.omg.CORBA.ORB;
@@ -46,6 +53,7 @@
private List<String> interfaces;
private MessageObserver incomingObserver;
private CorbaDestination destination;
+ private Map<String, QName> operationMap;
public CorbaDSIServant() {
//Complete
@@ -77,6 +85,21 @@
LOG.log(Level.SEVERE, "Couldn't initialize the corba DSI servant");
throw new CorbaBindingException(ex);
}
+
+ // Build the list of CORBA operations and the WSDL operations they map to. Note that
+ // the WSDL operation name may not always match the CORBA operation name.
+ BindingInfo bInfo = destination.getBindingInfo();
+ Iterator i = bInfo.getOperations().iterator();
+
+ operationMap = new HashMap<String, QName>(bInfo.getOperations().size());
+
+ while (i.hasNext()) {
+ BindingOperationInfo bopInfo = (BindingOperationInfo)i.next();
+ OperationType opType = bopInfo.getExtensor(OperationType.class);
+ if (opType != null) {
+ operationMap.put(opType.getName(), bopInfo.getName());
+ }
+ }
}
protected MessageObserver getObserver() {
@@ -94,12 +117,20 @@
public CorbaDestination getDestination() {
return destination;
}
+
+ public Map<String, QName> getOperationMapping() {
+ return operationMap;
+ }
+
+ public void setOperationMapping(Map<String, QName> map) {
+ operationMap = map;
+ }
public void invoke(ServerRequest request) throws CorbaBindingException {
MessageImpl msgImpl = new MessageImpl();
msgImpl.setDestination(getDestination());
Exchange exg = new ExchangeImpl();
- exg.put(String.class, request.operation());
+ exg.put(String.class, operationMap.get(request.operation()).getLocalPart());
exg.put(ORB.class, getOrb());
exg.put(ServerRequest.class, request);
msgImpl.setExchange(exg);
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java Fri Apr 20 07:47:24 2007
@@ -18,6 +18,11 @@
*/
package org.apache.yoko.bindings.corba.runtime;
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
import org.apache.cxf.Bus;
@@ -105,14 +110,23 @@
}*/
public void testInvoke() throws Exception {
- CorbaDSIServant dsiServant = new CorbaDSIServant();
+ CorbaDSIServant dsiServant = new CorbaDSIServant();
IMocksControl control = EasyMock.createNiceControl();
ServerRequest request = EasyMock.createMock(ServerRequest.class);
Message msg = EasyMock.createMock(Message.class);
String opName = "greetMe";
- EasyMock.expect(request.operation()).andReturn(opName);
+ EasyMock.expect(request.operation()).andReturn(opName);
MessageObserver incomingObserver = new TestObserver();
dsiServant.setObserver(incomingObserver);
+
+ Map<String, QName> map = new HashMap<String, QName>(2);
+ // REVISIT: Something is not setup quite right with this test. In
+ // the DSI Servant, we don't get the expected request operation name
+ // that we set above. Instead, we get a null value. For now, just
+ // add null to the operation map until we know how to fix the test.
+ map.put("greetMe", new QName("greetMe"));
+ map.put(null, new QName("greetMe"));
+ dsiServant.setOperationMapping(map);
control.replay();
dsiServant.invoke(request);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java Fri Apr 20 07:47:24 2007
@@ -118,11 +118,21 @@
// | "(" ")"
// <raises_expr> ::= "raises" "(" <scoped_name> {"," <scoped_name>}* ")"
// <context_expr> ::= "context" "(" <string_literal> {"," <string_literal>}* ")"
-
-
- Operation operation = generateOperation(node.toString());
+
+ QName operationQName = new QName(schema.getTargetNamespace(), node.toString());
+ boolean isDuplicate = false;
+ if (schema.getElements().contains(operationQName)) {
+ isDuplicate = true;
+ }
+
+ Operation operation = generateOperation(operationQName.getLocalPart(), isDuplicate);
- BindingOperation bindingOperation = generateBindingOperation(binding, operation);
+ BindingOperation bindingOperation = null;
+ if (isDuplicate) {
+ bindingOperation = generateBindingOperation(binding, operation, operationQName.getLocalPart());
+ } else {
+ bindingOperation = generateBindingOperation(binding, operation, operation.getName());
+ }
XmlSchemaSequence inputWrappingSequence = new XmlSchemaSequence();
XmlSchemaElement inputElement = generateWrapper(new QName(schema.getTargetNamespace(),
@@ -189,15 +199,23 @@
}
- private Operation generateOperation(String name) {
+ private Operation generateOperation(String name, boolean isDuplicate) {
Operation op = definition.createOperation();
+ if (isDuplicate) {
+ // Replace '.' in the scoping name with '_'. This results in the final
+ // operation name being more readable (otherwise generated code removes
+ // the '.' and merges all of the scoping names together)
+ String prefix = getScope().toString().replace('.', '_');
+ name = prefix + "_" + name;
+ }
op.setName(name);
op.setUndefined(false);
portType.addOperation(op);
return op;
}
- private BindingOperation generateBindingOperation(Binding wsdlBinding, Operation op) {
+ private BindingOperation generateBindingOperation(Binding wsdlBinding, Operation op,
+ String corbaOpName) {
BindingOperation bindingOperation = definition.createBindingOperation();
//OperationType operationType = null;
try {
@@ -206,7 +224,7 @@
} catch (WSDLException ex) {
throw new RuntimeException(ex);
}
- corbaOperation.setName(op.getName());
+ corbaOperation.setName(corbaOpName);
bindingOperation.addExtensibilityElement(corbaOperation);
bindingOperation.setOperation(op);
bindingOperation.setName(op.getName());
Modified: incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java (original)
+++ incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java Fri Apr 20 07:47:24 2007
@@ -222,4 +222,8 @@
testWSDLGeneration("/idl/inheritance.idl", "/idl/expected_Inheritance.wsdl");
}
+ public void testDuplicateOperationNames() throws Exception {
+ // This tests operations with the same name but in different scopes
+ testWSDLGeneration("/idl/duplicateOpNames.idl", "/idl/expected_duplicateOpNames.wsdl");
+ }
}
Added: incubator/yoko/trunk/tools/src/test/resources/idl/duplicateOpNames.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/duplicateOpNames.idl?view=auto&rev=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/duplicateOpNames.idl (added)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/duplicateOpNames.idl Fri Apr 20 07:47:24 2007
@@ -0,0 +1,29 @@
+/*
+ * 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.
+*/
+module ModuleA {
+ interface InterfaceA {
+ void testOperation();
+ };
+};
+
+module ModuleB {
+ interface InterfaceB {
+ void testOperation(in string param);
+ };
+};
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl Fri Apr 20 07:47:24 2007
@@ -19,7 +19,7 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/primitives" xmlns:tns="http://schemas.apache.org/yoko/idl/primitives" 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/primitives/typemap">
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" bound="0" elemtype="corba:string" repositoryID="IDL:stringArray:1.0" name="stringArray" type="ns4:stringArray" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" elemtype="corba:string" bound="0" repositoryID="IDL:stringArray:1.0" name="stringArray" type="ns4:stringArray" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives" xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -337,7 +337,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="testUnsignedLongLong">
+ <xs:element name="testLongLong">
<xs:complexType>
<xs:sequence>
<xs:element name="inLongLong" type="xs:long">
@@ -347,7 +347,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="testUnsignedLongLongResponse">
+ <xs:element name="testLongLongResponse">
<xs:complexType>
<xs:sequence>
<xs:element name="return" type="xs:long">
@@ -1105,6 +1105,10 @@
<wsdl:part name="inparameter" element="tns:setStringArray">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="testLongLongResponse">
+ <wsdl:part name="outparameter" element="tns:testLongLongResponse">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="getShort">
<wsdl:part name="inparameter" element="tns:getShort">
</wsdl:part>
@@ -1209,6 +1213,10 @@
<wsdl:part name="inparameter" element="tns:testChar">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="testLongLong">
+ <wsdl:part name="inparameter" element="tns:testLongLong">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="getSetShortResponse">
<wsdl:part name="outparameter" element="tns:getSetShortResponse">
</wsdl:part>
@@ -1676,10 +1684,10 @@
<wsdl:output name="getSetLongLongResponse" message="tns:getSetLongLongResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="testUnsignedLongLong">
- <wsdl:input name="testUnsignedLongLongRequest" message="tns:testUnsignedLongLong">
+ <wsdl:operation name="testLongLong">
+ <wsdl:input name="testLongLongRequest" message="tns:testLongLong">
</wsdl:input>
- <wsdl:output name="testUnsignedLongLongResponse" message="tns:testUnsignedLongLongResponse">
+ <wsdl:output name="testLongLongResponse" message="tns:testLongLongResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getUnsignedLongLong">
@@ -1945,7 +1953,7 @@
<corba:binding repositoryID="IDL:Primitives:1.0" />
<wsdl:operation name="getShort">
<corba:operation name="getShort">
- <corba:param mode="out" idltype="corba:short" name="outShort" />
+ <corba:param mode="out" name="outShort" idltype="corba:short" />
</corba:operation>
<wsdl:input name="getShortRequest">
</wsdl:input>
@@ -1954,7 +1962,7 @@
</wsdl:operation>
<wsdl:operation name="setShort">
<corba:operation name="setShort">
- <corba:param mode="in" idltype="corba:short" name="inShort" />
+ <corba:param mode="in" name="inShort" idltype="corba:short" />
</corba:operation>
<wsdl:input name="setShortRequest">
</wsdl:input>
@@ -1963,7 +1971,7 @@
</wsdl:operation>
<wsdl:operation name="getSetShort">
<corba:operation name="getSetShort">
- <corba:param mode="inout" idltype="corba:short" name="inOutShort" />
+ <corba:param mode="inout" name="inOutShort" idltype="corba:short" />
</corba:operation>
<wsdl:input name="getSetShortRequest">
</wsdl:input>
@@ -1972,10 +1980,10 @@
</wsdl:operation>
<wsdl:operation name="testShort">
<corba:operation name="testShort">
- <corba:param mode="in" idltype="corba:short" name="inShort" />
- <corba:param mode="inout" idltype="corba:short" name="inoutShort" />
- <corba:param mode="out" idltype="corba:short" name="outShort" />
- <corba:return idltype="corba:short" name="return" />
+ <corba:param mode="in" name="inShort" idltype="corba:short" />
+ <corba:param mode="inout" name="inoutShort" idltype="corba:short" />
+ <corba:param mode="out" name="outShort" idltype="corba:short" />
+ <corba:return name="return" idltype="corba:short" />
</corba:operation>
<wsdl:input name="testShortRequest">
</wsdl:input>
@@ -1984,7 +1992,7 @@
</wsdl:operation>
<wsdl:operation name="getUnsignedShort">
<corba:operation name="getUnsignedShort">
- <corba:param mode="out" idltype="corba:ushort" name="outUnsignedShort" />
+ <corba:param mode="out" name="outUnsignedShort" idltype="corba:ushort" />
</corba:operation>
<wsdl:input name="getUnsignedShortRequest">
</wsdl:input>
@@ -1993,7 +2001,7 @@
</wsdl:operation>
<wsdl:operation name="setUnsignedShort">
<corba:operation name="setUnsignedShort">
- <corba:param mode="in" idltype="corba:ushort" name="inUnsignedShort" />
+ <corba:param mode="in" name="inUnsignedShort" idltype="corba:ushort" />
</corba:operation>
<wsdl:input name="setUnsignedShortRequest">
</wsdl:input>
@@ -2002,7 +2010,7 @@
</wsdl:operation>
<wsdl:operation name="getSetUnsignedShort">
<corba:operation name="getSetUnsignedShort">
- <corba:param mode="inout" idltype="corba:ushort" name="inOutUnsignedShort" />
+ <corba:param mode="inout" name="inOutUnsignedShort" idltype="corba:ushort" />
</corba:operation>
<wsdl:input name="getSetUnsignedShortRequest">
</wsdl:input>
@@ -2011,10 +2019,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedShort">
<corba:operation name="testUnsignedShort">
- <corba:param mode="in" idltype="corba:ushort" name="inUnsignedShort" />
- <corba:param mode="out" idltype="corba:ushort" name="outUnsignedShort" />
- <corba:param mode="inout" idltype="corba:ushort" name="inoutUnsignedShort" />
- <corba:return idltype="corba:ushort" name="return" />
+ <corba:param mode="in" name="inUnsignedShort" idltype="corba:ushort" />
+ <corba:param mode="out" name="outUnsignedShort" idltype="corba:ushort" />
+ <corba:param mode="inout" name="inoutUnsignedShort" idltype="corba:ushort" />
+ <corba:return name="return" idltype="corba:ushort" />
</corba:operation>
<wsdl:input name="testUnsignedShortRequest">
</wsdl:input>
@@ -2023,7 +2031,7 @@
</wsdl:operation>
<wsdl:operation name="getLong">
<corba:operation name="getLong">
- <corba:param mode="out" idltype="corba:long" name="outLong" />
+ <corba:param mode="out" name="outLong" idltype="corba:long" />
</corba:operation>
<wsdl:input name="getLongRequest">
</wsdl:input>
@@ -2032,7 +2040,7 @@
</wsdl:operation>
<wsdl:operation name="setLong">
<corba:operation name="setLong">
- <corba:param mode="in" idltype="corba:long" name="inLong" />
+ <corba:param mode="in" name="inLong" idltype="corba:long" />
</corba:operation>
<wsdl:input name="setLongRequest">
</wsdl:input>
@@ -2041,7 +2049,7 @@
</wsdl:operation>
<wsdl:operation name="getSetLong">
<corba:operation name="getSetLong">
- <corba:param mode="inout" idltype="corba:long" name="inOutLong" />
+ <corba:param mode="inout" name="inOutLong" idltype="corba:long" />
</corba:operation>
<wsdl:input name="getSetLongRequest">
</wsdl:input>
@@ -2050,10 +2058,10 @@
</wsdl:operation>
<wsdl:operation name="testLong">
<corba:operation name="testLong">
- <corba:param mode="in" idltype="corba:long" name="inLong" />
- <corba:param mode="out" idltype="corba:long" name="outLong" />
- <corba:param mode="inout" idltype="corba:long" name="inoutLong" />
- <corba:return idltype="corba:long" name="return" />
+ <corba:param mode="in" name="inLong" idltype="corba:long" />
+ <corba:param mode="out" name="outLong" idltype="corba:long" />
+ <corba:param mode="inout" name="inoutLong" idltype="corba:long" />
+ <corba:return name="return" idltype="corba:long" />
</corba:operation>
<wsdl:input name="testLongRequest">
</wsdl:input>
@@ -2062,7 +2070,7 @@
</wsdl:operation>
<wsdl:operation name="getUnsignedLong">
<corba:operation name="getUnsignedLong">
- <corba:param mode="out" idltype="corba:ulong" name="outUnsignedLong" />
+ <corba:param mode="out" name="outUnsignedLong" idltype="corba:ulong" />
</corba:operation>
<wsdl:input name="getUnsignedLongRequest">
</wsdl:input>
@@ -2071,7 +2079,7 @@
</wsdl:operation>
<wsdl:operation name="setUnsignedLong">
<corba:operation name="setUnsignedLong">
- <corba:param mode="in" idltype="corba:ulong" name="inUnsignedLong" />
+ <corba:param mode="in" name="inUnsignedLong" idltype="corba:ulong" />
</corba:operation>
<wsdl:input name="setUnsignedLongRequest">
</wsdl:input>
@@ -2080,7 +2088,7 @@
</wsdl:operation>
<wsdl:operation name="getSetUnsignedLong">
<corba:operation name="getSetUnsignedLong">
- <corba:param mode="inout" idltype="corba:ulong" name="inOutUnsignedLong" />
+ <corba:param mode="inout" name="inOutUnsignedLong" idltype="corba:ulong" />
</corba:operation>
<wsdl:input name="getSetUnsignedLongRequest">
</wsdl:input>
@@ -2089,10 +2097,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedLong">
<corba:operation name="testUnsignedLong">
- <corba:param mode="in" idltype="corba:ulong" name="inUnsignedLong" />
- <corba:param mode="out" idltype="corba:ulong" name="outUnsignedLong" />
- <corba:param mode="inout" idltype="corba:ulong" name="inoutUnsignedLong" />
- <corba:return idltype="corba:ulong" name="return" />
+ <corba:param mode="in" name="inUnsignedLong" idltype="corba:ulong" />
+ <corba:param mode="out" name="outUnsignedLong" idltype="corba:ulong" />
+ <corba:param mode="inout" name="inoutUnsignedLong" idltype="corba:ulong" />
+ <corba:return name="return" idltype="corba:ulong" />
</corba:operation>
<wsdl:input name="testUnsignedLongRequest">
</wsdl:input>
@@ -2101,7 +2109,7 @@
</wsdl:operation>
<wsdl:operation name="getLongLong">
<corba:operation name="getLongLong">
- <corba:param mode="out" idltype="corba:longlong" name="outLong" />
+ <corba:param mode="out" name="outLong" idltype="corba:longlong" />
</corba:operation>
<wsdl:input name="getLongLongRequest">
</wsdl:input>
@@ -2110,7 +2118,7 @@
</wsdl:operation>
<wsdl:operation name="setLongLong">
<corba:operation name="setLongLong">
- <corba:param mode="in" idltype="corba:longlong" name="inLong" />
+ <corba:param mode="in" name="inLong" idltype="corba:longlong" />
</corba:operation>
<wsdl:input name="setLongLongRequest">
</wsdl:input>
@@ -2119,28 +2127,28 @@
</wsdl:operation>
<wsdl:operation name="getSetLongLong">
<corba:operation name="getSetLongLong">
- <corba:param mode="inout" idltype="corba:longlong" name="inoutLong" />
+ <corba:param mode="inout" name="inoutLong" idltype="corba:longlong" />
</corba:operation>
<wsdl:input name="getSetLongLongRequest">
</wsdl:input>
<wsdl:output name="getSetLongLongResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="testUnsignedLongLong">
- <corba:operation name="testUnsignedLongLong">
- <corba:param mode="in" idltype="corba:longlong" name="inLongLong" />
- <corba:param mode="out" idltype="corba:longlong" name="outLongLong" />
- <corba:param mode="inout" idltype="corba:longlong" name="inoutLongLong" />
- <corba:return idltype="corba:longlong" name="return" />
+ <wsdl:operation name="testLongLong">
+ <corba:operation name="testLongLong">
+ <corba:param mode="in" name="inLongLong" idltype="corba:longlong" />
+ <corba:param mode="out" name="outLongLong" idltype="corba:longlong" />
+ <corba:param mode="inout" name="inoutLongLong" idltype="corba:longlong" />
+ <corba:return name="return" idltype="corba:longlong" />
</corba:operation>
- <wsdl:input name="testUnsignedLongLongRequest">
+ <wsdl:input name="testLongLongRequest">
</wsdl:input>
- <wsdl:output name="testUnsignedLongLongResponse">
+ <wsdl:output name="testLongLongResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getUnsignedLongLong">
<corba:operation name="getUnsignedLongLong">
- <corba:param mode="out" idltype="corba:ulonglong" name="outUnsignedLongLong" />
+ <corba:param mode="out" name="outUnsignedLongLong" idltype="corba:ulonglong" />
</corba:operation>
<wsdl:input name="getUnsignedLongLongRequest">
</wsdl:input>
@@ -2149,7 +2157,7 @@
</wsdl:operation>
<wsdl:operation name="setUnsignedLongLong">
<corba:operation name="setUnsignedLongLong">
- <corba:param mode="in" idltype="corba:ulonglong" name="inUnsignedLongLong" />
+ <corba:param mode="in" name="inUnsignedLongLong" idltype="corba:ulonglong" />
</corba:operation>
<wsdl:input name="setUnsignedLongLongRequest">
</wsdl:input>
@@ -2158,7 +2166,7 @@
</wsdl:operation>
<wsdl:operation name="getSetUnsignedLongLong">
<corba:operation name="getSetUnsignedLongLong">
- <corba:param mode="inout" idltype="corba:ulonglong" name="inOutUnsignedLongLong" />
+ <corba:param mode="inout" name="inOutUnsignedLongLong" idltype="corba:ulonglong" />
</corba:operation>
<wsdl:input name="getSetUnsignedLongLongRequest">
</wsdl:input>
@@ -2167,10 +2175,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedLongLong">
<corba:operation name="testUnsignedLongLong">
- <corba:param mode="in" idltype="corba:ulonglong" name="inUnsignedLongLong" />
- <corba:param mode="out" idltype="corba:ulonglong" name="outUnsignedLongLong" />
- <corba:param mode="inout" idltype="corba:ulonglong" name="inoutUnsignedLongLong" />
- <corba:return idltype="corba:ulonglong" name="return" />
+ <corba:param mode="in" name="inUnsignedLongLong" idltype="corba:ulonglong" />
+ <corba:param mode="out" name="outUnsignedLongLong" idltype="corba:ulonglong" />
+ <corba:param mode="inout" name="inoutUnsignedLongLong" idltype="corba:ulonglong" />
+ <corba:return name="return" idltype="corba:ulonglong" />
</corba:operation>
<wsdl:input name="testUnsignedLongLongRequest">
</wsdl:input>
@@ -2179,7 +2187,7 @@
</wsdl:operation>
<wsdl:operation name="getFloat">
<corba:operation name="getFloat">
- <corba:param mode="out" idltype="corba:float" name="outFloat" />
+ <corba:param mode="out" name="outFloat" idltype="corba:float" />
</corba:operation>
<wsdl:input name="getFloatRequest">
</wsdl:input>
@@ -2188,7 +2196,7 @@
</wsdl:operation>
<wsdl:operation name="setFloat">
<corba:operation name="setFloat">
- <corba:param mode="in" idltype="corba:float" name="inFloat" />
+ <corba:param mode="in" name="inFloat" idltype="corba:float" />
</corba:operation>
<wsdl:input name="setFloatRequest">
</wsdl:input>
@@ -2197,7 +2205,7 @@
</wsdl:operation>
<wsdl:operation name="getSetFloat">
<corba:operation name="getSetFloat">
- <corba:param mode="inout" idltype="corba:float" name="inOutFloat" />
+ <corba:param mode="inout" name="inOutFloat" idltype="corba:float" />
</corba:operation>
<wsdl:input name="getSetFloatRequest">
</wsdl:input>
@@ -2206,10 +2214,10 @@
</wsdl:operation>
<wsdl:operation name="testFloat">
<corba:operation name="testFloat">
- <corba:param mode="in" idltype="corba:float" name="inFloat" />
- <corba:param mode="out" idltype="corba:float" name="outFloat" />
- <corba:param mode="inout" idltype="corba:float" name="inoutFloat" />
- <corba:return idltype="corba:float" name="return" />
+ <corba:param mode="in" name="inFloat" idltype="corba:float" />
+ <corba:param mode="out" name="outFloat" idltype="corba:float" />
+ <corba:param mode="inout" name="inoutFloat" idltype="corba:float" />
+ <corba:return name="return" idltype="corba:float" />
</corba:operation>
<wsdl:input name="testFloatRequest">
</wsdl:input>
@@ -2218,7 +2226,7 @@
</wsdl:operation>
<wsdl:operation name="getDouble">
<corba:operation name="getDouble">
- <corba:param mode="out" idltype="corba:double" name="outDouble" />
+ <corba:param mode="out" name="outDouble" idltype="corba:double" />
</corba:operation>
<wsdl:input name="getDoubleRequest">
</wsdl:input>
@@ -2227,7 +2235,7 @@
</wsdl:operation>
<wsdl:operation name="setDouble">
<corba:operation name="setDouble">
- <corba:param mode="in" idltype="corba:double" name="inDouble" />
+ <corba:param mode="in" name="inDouble" idltype="corba:double" />
</corba:operation>
<wsdl:input name="setDoubleRequest">
</wsdl:input>
@@ -2236,7 +2244,7 @@
</wsdl:operation>
<wsdl:operation name="getSetDouble">
<corba:operation name="getSetDouble">
- <corba:param mode="inout" idltype="corba:double" name="inOutDouble" />
+ <corba:param mode="inout" name="inOutDouble" idltype="corba:double" />
</corba:operation>
<wsdl:input name="getSetDoubleRequest">
</wsdl:input>
@@ -2245,10 +2253,10 @@
</wsdl:operation>
<wsdl:operation name="testDouble">
<corba:operation name="testDouble">
- <corba:param mode="in" idltype="corba:double" name="inDouble" />
- <corba:param mode="out" idltype="corba:double" name="outDouble" />
- <corba:param mode="inout" idltype="corba:double" name="inoutDouble" />
- <corba:return idltype="corba:double" name="return" />
+ <corba:param mode="in" name="inDouble" idltype="corba:double" />
+ <corba:param mode="out" name="outDouble" idltype="corba:double" />
+ <corba:param mode="inout" name="inoutDouble" idltype="corba:double" />
+ <corba:return name="return" idltype="corba:double" />
</corba:operation>
<wsdl:input name="testDoubleRequest">
</wsdl:input>
@@ -2257,7 +2265,7 @@
</wsdl:operation>
<wsdl:operation name="getChar">
<corba:operation name="getChar">
- <corba:param mode="out" idltype="corba:char" name="outChar" />
+ <corba:param mode="out" name="outChar" idltype="corba:char" />
</corba:operation>
<wsdl:input name="getCharRequest">
</wsdl:input>
@@ -2266,7 +2274,7 @@
</wsdl:operation>
<wsdl:operation name="setChar">
<corba:operation name="setChar">
- <corba:param mode="in" idltype="corba:char" name="inChar" />
+ <corba:param mode="in" name="inChar" idltype="corba:char" />
</corba:operation>
<wsdl:input name="setCharRequest">
</wsdl:input>
@@ -2275,7 +2283,7 @@
</wsdl:operation>
<wsdl:operation name="getSetChar">
<corba:operation name="getSetChar">
- <corba:param mode="inout" idltype="corba:char" name="inOutChar" />
+ <corba:param mode="inout" name="inOutChar" idltype="corba:char" />
</corba:operation>
<wsdl:input name="getSetCharRequest">
</wsdl:input>
@@ -2284,10 +2292,10 @@
</wsdl:operation>
<wsdl:operation name="testChar">
<corba:operation name="testChar">
- <corba:param mode="in" idltype="corba:char" name="inChar" />
- <corba:param mode="out" idltype="corba:char" name="outChar" />
- <corba:param mode="inout" idltype="corba:char" name="inoutChar" />
- <corba:return idltype="corba:char" name="return" />
+ <corba:param mode="in" name="inChar" idltype="corba:char" />
+ <corba:param mode="out" name="outChar" idltype="corba:char" />
+ <corba:param mode="inout" name="inoutChar" idltype="corba:char" />
+ <corba:return name="return" idltype="corba:char" />
</corba:operation>
<wsdl:input name="testCharRequest">
</wsdl:input>
@@ -2296,7 +2304,7 @@
</wsdl:operation>
<wsdl:operation name="getWChar">
<corba:operation name="getWChar">
- <corba:param mode="out" idltype="corba:wchar" name="outWChar" />
+ <corba:param mode="out" name="outWChar" idltype="corba:wchar" />
</corba:operation>
<wsdl:input name="getWCharRequest">
</wsdl:input>
@@ -2305,7 +2313,7 @@
</wsdl:operation>
<wsdl:operation name="setWChar">
<corba:operation name="setWChar">
- <corba:param mode="in" idltype="corba:wchar" name="inWChar" />
+ <corba:param mode="in" name="inWChar" idltype="corba:wchar" />
</corba:operation>
<wsdl:input name="setWCharRequest">
</wsdl:input>
@@ -2314,7 +2322,7 @@
</wsdl:operation>
<wsdl:operation name="getSetWChar">
<corba:operation name="getSetWChar">
- <corba:param mode="inout" idltype="corba:wchar" name="inOutWChar" />
+ <corba:param mode="inout" name="inOutWChar" idltype="corba:wchar" />
</corba:operation>
<wsdl:input name="getSetWCharRequest">
</wsdl:input>
@@ -2323,10 +2331,10 @@
</wsdl:operation>
<wsdl:operation name="testWchar">
<corba:operation name="testWchar">
- <corba:param mode="in" idltype="corba:wchar" name="inWchar" />
- <corba:param mode="out" idltype="corba:wchar" name="outWchar" />
- <corba:param mode="inout" idltype="corba:wchar" name="inoutWchar" />
- <corba:return idltype="corba:wchar" name="return" />
+ <corba:param mode="in" name="inWchar" idltype="corba:wchar" />
+ <corba:param mode="out" name="outWchar" idltype="corba:wchar" />
+ <corba:param mode="inout" name="inoutWchar" idltype="corba:wchar" />
+ <corba:return name="return" idltype="corba:wchar" />
</corba:operation>
<wsdl:input name="testWcharRequest">
</wsdl:input>
@@ -2335,7 +2343,7 @@
</wsdl:operation>
<wsdl:operation name="getBoolean">
<corba:operation name="getBoolean">
- <corba:param mode="out" idltype="corba:boolean" name="outBoolean" />
+ <corba:param mode="out" name="outBoolean" idltype="corba:boolean" />
</corba:operation>
<wsdl:input name="getBooleanRequest">
</wsdl:input>
@@ -2344,7 +2352,7 @@
</wsdl:operation>
<wsdl:operation name="setBoolean">
<corba:operation name="setBoolean">
- <corba:param mode="in" idltype="corba:boolean" name="inBoolean" />
+ <corba:param mode="in" name="inBoolean" idltype="corba:boolean" />
</corba:operation>
<wsdl:input name="setBooleanRequest">
</wsdl:input>
@@ -2353,7 +2361,7 @@
</wsdl:operation>
<wsdl:operation name="getSetBoolean">
<corba:operation name="getSetBoolean">
- <corba:param mode="inout" idltype="corba:boolean" name="inOutBoolean" />
+ <corba:param mode="inout" name="inOutBoolean" idltype="corba:boolean" />
</corba:operation>
<wsdl:input name="getSetBooleanRequest">
</wsdl:input>
@@ -2362,10 +2370,10 @@
</wsdl:operation>
<wsdl:operation name="testBoolean">
<corba:operation name="testBoolean">
- <corba:param mode="in" idltype="corba:boolean" name="inBoolean" />
- <corba:param mode="inout" idltype="corba:boolean" name="inoutBoolean" />
- <corba:param mode="out" idltype="corba:boolean" name="outBoolean" />
- <corba:return idltype="corba:boolean" name="return" />
+ <corba:param mode="in" name="inBoolean" idltype="corba:boolean" />
+ <corba:param mode="inout" name="inoutBoolean" idltype="corba:boolean" />
+ <corba:param mode="out" name="outBoolean" idltype="corba:boolean" />
+ <corba:return name="return" idltype="corba:boolean" />
</corba:operation>
<wsdl:input name="testBooleanRequest">
</wsdl:input>
@@ -2374,7 +2382,7 @@
</wsdl:operation>
<wsdl:operation name="getOctet">
<corba:operation name="getOctet">
- <corba:param mode="out" idltype="corba:octet" name="outOctet" />
+ <corba:param mode="out" name="outOctet" idltype="corba:octet" />
</corba:operation>
<wsdl:input name="getOctetRequest">
</wsdl:input>
@@ -2383,7 +2391,7 @@
</wsdl:operation>
<wsdl:operation name="setOctet">
<corba:operation name="setOctet">
- <corba:param mode="in" idltype="corba:octet" name="inOctet" />
+ <corba:param mode="in" name="inOctet" idltype="corba:octet" />
</corba:operation>
<wsdl:input name="setOctetRequest">
</wsdl:input>
@@ -2392,7 +2400,7 @@
</wsdl:operation>
<wsdl:operation name="getSetOctet">
<corba:operation name="getSetOctet">
- <corba:param mode="inout" idltype="corba:octet" name="inOutOctet" />
+ <corba:param mode="inout" name="inOutOctet" idltype="corba:octet" />
</corba:operation>
<wsdl:input name="getSetOctetRequest">
</wsdl:input>
@@ -2401,10 +2409,10 @@
</wsdl:operation>
<wsdl:operation name="testOctet">
<corba:operation name="testOctet">
- <corba:param mode="in" idltype="corba:octet" name="inOctet" />
- <corba:param mode="out" idltype="corba:octet" name="outOctet" />
- <corba:param mode="inout" idltype="corba:octet" name="inoutOctet" />
- <corba:return idltype="corba:octet" name="return" />
+ <corba:param mode="in" name="inOctet" idltype="corba:octet" />
+ <corba:param mode="out" name="outOctet" idltype="corba:octet" />
+ <corba:param mode="inout" name="inoutOctet" idltype="corba:octet" />
+ <corba:return name="return" idltype="corba:octet" />
</corba:operation>
<wsdl:input name="testOctetRequest">
</wsdl:input>
@@ -2413,7 +2421,7 @@
</wsdl:operation>
<wsdl:operation name="getAny">
<corba:operation name="getAny">
- <corba:param mode="out" idltype="corba:any" name="outAny" />
+ <corba:param mode="out" name="outAny" idltype="corba:any" />
</corba:operation>
<wsdl:input name="getAnyRequest">
</wsdl:input>
@@ -2422,7 +2430,7 @@
</wsdl:operation>
<wsdl:operation name="setAny">
<corba:operation name="setAny">
- <corba:param mode="in" idltype="corba:any" name="inAny" />
+ <corba:param mode="in" name="inAny" idltype="corba:any" />
</corba:operation>
<wsdl:input name="setAnyRequest">
</wsdl:input>
@@ -2431,7 +2439,7 @@
</wsdl:operation>
<wsdl:operation name="getSetAny">
<corba:operation name="getSetAny">
- <corba:param mode="inout" idltype="corba:any" name="inOutAny" />
+ <corba:param mode="inout" name="inOutAny" idltype="corba:any" />
</corba:operation>
<wsdl:input name="getSetAnyRequest">
</wsdl:input>
@@ -2440,10 +2448,10 @@
</wsdl:operation>
<wsdl:operation name="testAny">
<corba:operation name="testAny">
- <corba:param mode="in" idltype="corba:any" name="inAny" />
- <corba:param mode="out" idltype="corba:any" name="outAny" />
- <corba:param mode="inout" idltype="corba:any" name="inoutAny" />
- <corba:return idltype="corba:any" name="return" />
+ <corba:param mode="in" name="inAny" idltype="corba:any" />
+ <corba:param mode="out" name="outAny" idltype="corba:any" />
+ <corba:param mode="inout" name="inoutAny" idltype="corba:any" />
+ <corba:return name="return" idltype="corba:any" />
</corba:operation>
<wsdl:input name="testAnyRequest">
</wsdl:input>
@@ -2452,7 +2460,7 @@
</wsdl:operation>
<wsdl:operation name="getString">
<corba:operation name="getString">
- <corba:param mode="out" idltype="corba:string" name="outString" />
+ <corba:param mode="out" name="outString" idltype="corba:string" />
</corba:operation>
<wsdl:input name="getStringRequest">
</wsdl:input>
@@ -2461,7 +2469,7 @@
</wsdl:operation>
<wsdl:operation name="setString">
<corba:operation name="setString">
- <corba:param mode="in" idltype="corba:string" name="inString" />
+ <corba:param mode="in" name="inString" idltype="corba:string" />
</corba:operation>
<wsdl:input name="setStringRequest">
</wsdl:input>
@@ -2470,7 +2478,7 @@
</wsdl:operation>
<wsdl:operation name="getSetString">
<corba:operation name="getSetString">
- <corba:param mode="inout" idltype="corba:string" name="inOutString" />
+ <corba:param mode="inout" name="inOutString" idltype="corba:string" />
</corba:operation>
<wsdl:input name="getSetStringRequest">
</wsdl:input>
@@ -2479,10 +2487,10 @@
</wsdl:operation>
<wsdl:operation name="testString">
<corba:operation name="testString">
- <corba:param mode="in" idltype="corba:string" name="inString" />
- <corba:param mode="inout" idltype="corba:string" name="inoutString" />
- <corba:param mode="out" idltype="corba:string" name="outString" />
- <corba:return idltype="corba:string" name="return" />
+ <corba:param mode="in" name="inString" idltype="corba:string" />
+ <corba:param mode="inout" name="inoutString" idltype="corba:string" />
+ <corba:param mode="out" name="outString" idltype="corba:string" />
+ <corba:return name="return" idltype="corba:string" />
</corba:operation>
<wsdl:input name="testStringRequest">
</wsdl:input>
@@ -2491,7 +2499,7 @@
</wsdl:operation>
<wsdl:operation name="getWstring">
<corba:operation name="getWstring">
- <corba:param mode="out" idltype="corba:wstring" name="outWstring" />
+ <corba:param mode="out" name="outWstring" idltype="corba:wstring" />
</corba:operation>
<wsdl:input name="getWstringRequest">
</wsdl:input>
@@ -2500,7 +2508,7 @@
</wsdl:operation>
<wsdl:operation name="setWstring">
<corba:operation name="setWstring">
- <corba:param mode="in" idltype="corba:wstring" name="inWstring" />
+ <corba:param mode="in" name="inWstring" idltype="corba:wstring" />
</corba:operation>
<wsdl:input name="setWstringRequest">
</wsdl:input>
@@ -2509,7 +2517,7 @@
</wsdl:operation>
<wsdl:operation name="getSetWstring">
<corba:operation name="getSetWstring">
- <corba:param mode="inout" idltype="corba:wstring" name="inOutWstring" />
+ <corba:param mode="inout" name="inOutWstring" idltype="corba:wstring" />
</corba:operation>
<wsdl:input name="getSetWstringRequest">
</wsdl:input>
@@ -2518,10 +2526,10 @@
</wsdl:operation>
<wsdl:operation name="testWstring">
<corba:operation name="testWstring">
- <corba:param mode="in" idltype="corba:wstring" name="inWstring" />
- <corba:param mode="inout" idltype="corba:wstring" name="inoutWstring" />
- <corba:param mode="out" idltype="corba:wstring" name="outWstring" />
- <corba:return idltype="corba:wstring" name="return" />
+ <corba:param mode="in" name="inWstring" idltype="corba:wstring" />
+ <corba:param mode="inout" name="inoutWstring" idltype="corba:wstring" />
+ <corba:param mode="out" name="outWstring" idltype="corba:wstring" />
+ <corba:return name="return" idltype="corba:wstring" />
</corba:operation>
<wsdl:input name="testWstringRequest">
</wsdl:input>
@@ -2530,7 +2538,7 @@
</wsdl:operation>
<wsdl:operation name="getStringArray">
<corba:operation name="getStringArray">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="out" idltype="stringArray" name="outStringArray" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="out" name="outStringArray" idltype="stringArray" />
</corba:operation>
<wsdl:input name="getStringArrayRequest">
</wsdl:input>
@@ -2539,7 +2547,7 @@
</wsdl:operation>
<wsdl:operation name="setStringArray">
<corba:operation name="setStringArray">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="in" idltype="stringArray" name="inStringArray" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="in" name="inStringArray" idltype="stringArray" />
</corba:operation>
<wsdl:input name="setStringArrayRequest">
</wsdl:input>
@@ -2548,7 +2556,7 @@
</wsdl:operation>
<wsdl:operation name="getSetStringArray">
<corba:operation name="getSetStringArray">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="inout" idltype="stringArray" name="inOutStringArray" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="inout" name="inOutStringArray" idltype="stringArray" />
</corba:operation>
<wsdl:input name="getSetStringArrayRequest">
</wsdl:input>
Added: incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl?view=auto&rev=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl (added)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl Fri Apr 20 07:47:24 2007
@@ -0,0 +1,116 @@
+<?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://schemas.apache.org/yoko/idl/duplicateOpNames" xmlns:tns="http://schemas.apache.org/yoko/idl/duplicateOpNames" 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/duplicateOpNames/typemap" />
+ <wsdl:types>
+ <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/duplicateOpNames" xmlns="http://schemas.apache.org/yoko/idl/duplicateOpNames" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="testOperation">
+ <xs:complexType>
+ <xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="testOperationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ModuleB_InterfaceB_testOperation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="param" type="xs:string">
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ModuleB_InterfaceB_testOperationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:schema>
+ </wsdl:types>
+ <wsdl:message name="testOperationResponse">
+ <wsdl:part name="outparameter" element="tns:testOperationResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="ModuleB_InterfaceB_testOperationResponse">
+ <wsdl:part name="outparameter" element="tns:ModuleB_InterfaceB_testOperationResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="ModuleB_InterfaceB_testOperation">
+ <wsdl:part name="inparameter" element="tns:ModuleB_InterfaceB_testOperation">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="testOperation">
+ <wsdl:part name="inparameter" element="tns:testOperation">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="ModuleA.InterfaceA">
+ <wsdl:operation name="testOperation">
+ <wsdl:input name="testOperationRequest" message="tns:testOperation">
+ </wsdl:input>
+ <wsdl:output name="testOperationResponse" message="tns:testOperationResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:portType name="ModuleB.InterfaceB">
+ <wsdl:operation name="ModuleB_InterfaceB_testOperation">
+ <wsdl:input name="ModuleB_InterfaceB_testOperationRequest" message="tns:ModuleB_InterfaceB_testOperation">
+ </wsdl:input>
+ <wsdl:output name="ModuleB_InterfaceB_testOperationResponse" message="tns:ModuleB_InterfaceB_testOperationResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="ModuleA.InterfaceACORBABinding" type="tns:ModuleA.InterfaceA">
+ <corba:binding repositoryID="IDL:ModuleA/InterfaceA:1.0" />
+ <wsdl:operation name="testOperation">
+ <corba:operation name="testOperation" />
+ <wsdl:input name="testOperationRequest">
+ </wsdl:input>
+ <wsdl:output name="testOperationResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:binding name="ModuleB.InterfaceBCORBABinding" type="tns:ModuleB.InterfaceB">
+ <corba:binding repositoryID="IDL:ModuleB/InterfaceB:1.0" />
+ <wsdl:operation name="ModuleB_InterfaceB_testOperation">
+ <corba:operation name="testOperation">
+ <corba:param mode="in" name="param" idltype="corba:string" />
+ </corba:operation>
+ <wsdl:input name="ModuleB_InterfaceB_testOperationRequest">
+ </wsdl:input>
+ <wsdl:output name="ModuleB_InterfaceB_testOperationResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="ModuleB.InterfaceBCORBAService">
+ <wsdl:port name="ModuleB.InterfaceBCORBAPort" binding="tns:ModuleB.InterfaceBCORBABinding">
+ <corba:address location="IOR:" />
+ </wsdl:port>
+ </wsdl:service>
+ <wsdl:service name="ModuleA.InterfaceACORBAService">
+ <wsdl:port name="ModuleA.InterfaceACORBAPort" binding="tns:ModuleA.InterfaceACORBABinding">
+ <corba:address location="IOR:" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Propchange: incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/yoko/trunk/tools/src/test/resources/idl/expected_duplicateOpNames.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl Fri Apr 20 07:47:24 2007
@@ -121,7 +121,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="testCustomObjectParam">
+ <xs:element name="testCustomObjectParam2">
<xs:complexType>
<xs:sequence>
<xs:element name="param" type="wsa:EndpointReferenceType">
@@ -129,7 +129,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="testCustomObjectParamResponse">
+ <xs:element name="testCustomObjectParam2Response">
<xs:complexType>
<xs:sequence>
<xs:element name="return" type="xs:boolean">
@@ -137,13 +137,13 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="testCustomObjectReturn">
+ <xs:element name="testCustomObjectReturn2">
<xs:complexType>
<xs:sequence>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="testCustomObjectReturnResponse">
+ <xs:element name="testCustomObjectReturn2Response">
<xs:complexType>
<xs:sequence>
<xs:element name="return" type="wsa:EndpointReferenceType">
@@ -177,18 +177,22 @@
<wsdl:part name="outparameter" element="tns:testObjectValueResponse">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="testCustomObjectParamResponse">
- <wsdl:part name="outparameter" element="tns:testCustomObjectParamResponse">
+ <wsdl:message name="testCustomObjectParam2Response">
+ <wsdl:part name="outparameter" element="tns:testCustomObjectParam2Response">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="testDefaultObjectReturnResponse">
- <wsdl:part name="outparameter" element="tns:testDefaultObjectReturnResponse">
+ <wsdl:message name="testCustomObjectParamResponse">
+ <wsdl:part name="outparameter" element="tns:testCustomObjectParamResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="barOp">
<wsdl:part name="inparameter" element="tns:barOp">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="testDefaultObjectReturnResponse">
+ <wsdl:part name="outparameter" element="tns:testDefaultObjectReturnResponse">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="testObjectValueUpdate">
<wsdl:part name="inparameter" element="tns:testObjectValueUpdate">
</wsdl:part>
@@ -197,6 +201,14 @@
<wsdl:part name="inparameter" element="tns:testObjectValue">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="testCustomObjectParam2">
+ <wsdl:part name="inparameter" element="tns:testCustomObjectParam2">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="testCustomObjectReturn2">
+ <wsdl:part name="inparameter" element="tns:testCustomObjectReturn2">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="barOpResponse">
<wsdl:part name="outparameter" element="tns:barOpResponse">
</wsdl:part>
@@ -205,6 +217,10 @@
<wsdl:part name="outparameter" element="tns:testCustomObjectReturnResponse">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="testCustomObjectReturn2Response">
+ <wsdl:part name="outparameter" element="tns:testCustomObjectReturn2Response">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="testDefaultObjectReturn">
<wsdl:part name="inparameter" element="tns:testDefaultObjectReturn">
</wsdl:part>
@@ -256,16 +272,16 @@
<wsdl:output name="testCustomObjectReturnResponse" message="tns:testCustomObjectReturnResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="testCustomObjectParam">
- <wsdl:input name="testCustomObjectParamRequest" message="tns:testCustomObjectParam">
+ <wsdl:operation name="testCustomObjectParam2">
+ <wsdl:input name="testCustomObjectParam2Request" message="tns:testCustomObjectParam2">
</wsdl:input>
- <wsdl:output name="testCustomObjectParamResponse" message="tns:testCustomObjectParamResponse">
+ <wsdl:output name="testCustomObjectParam2Response" message="tns:testCustomObjectParam2Response">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="testCustomObjectReturn">
- <wsdl:input name="testCustomObjectReturnRequest" message="tns:testCustomObjectReturn">
+ <wsdl:operation name="testCustomObjectReturn2">
+ <wsdl:input name="testCustomObjectReturn2Request" message="tns:testCustomObjectReturn2">
</wsdl:input>
- <wsdl:output name="testCustomObjectReturnResponse" message="tns:testCustomObjectReturnResponse">
+ <wsdl:output name="testCustomObjectReturn2Response" message="tns:testCustomObjectReturn2Response">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
@@ -334,23 +350,23 @@
<wsdl:output name="testCustomObjectReturnResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="testCustomObjectParam">
- <corba:operation name="testCustomObjectParam">
+ <wsdl:operation name="testCustomObjectParam2">
+ <corba:operation name="testCustomObjectParam2">
<corba:param xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef/typemap" mode="in" name="param" idltype="TestModule.Test2.TestObject" />
<corba:return name="return" idltype="corba:boolean" />
</corba:operation>
- <wsdl:input name="testCustomObjectParamRequest">
+ <wsdl:input name="testCustomObjectParam2Request">
</wsdl:input>
- <wsdl:output name="testCustomObjectParamResponse">
+ <wsdl:output name="testCustomObjectParam2Response">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="testCustomObjectReturn">
- <corba:operation name="testCustomObjectReturn">
+ <wsdl:operation name="testCustomObjectReturn2">
+ <corba:operation name="testCustomObjectReturn2">
<corba:return xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef/typemap" name="return" idltype="TestModule.Test2.TestObject" />
</corba:operation>
- <wsdl:input name="testCustomObjectReturnRequest">
+ <wsdl:input name="testCustomObjectReturn2Request">
</wsdl:input>
- <wsdl:output name="testCustomObjectReturnResponse">
+ <wsdl:output name="testCustomObjectReturn2Response">
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/primitives.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/primitives.idl?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/primitives.idl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/primitives.idl Fri Apr 20 07:47:24 2007
@@ -52,9 +52,9 @@
void getLongLong (out long long outLong);
void setLongLong (in long long inLong);
void getSetLongLong(inout long long inoutLong);
- long long testUnsignedLongLong(in long long inLongLong,
- out long long outLongLong,
- inout long long inoutLongLong);
+ long long testLongLong(in long long inLongLong,
+ out long long outLongLong,
+ inout long long inoutLongLong);
void getUnsignedLongLong (out unsigned long long outUnsignedLongLong);
void setUnsignedLongLong (in unsigned long long inUnsignedLongLong);
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/scopingObjectRef.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/scopingObjectRef.idl?view=diff&rev=530830&r1=530829&r2=530830
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/scopingObjectRef.idl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/scopingObjectRef.idl Fri Apr 20 07:47:24 2007
@@ -35,8 +35,8 @@
TestModule::Test2::TestObject testCustomObjectReturn();
// Test a custom object reference type
- boolean testCustomObjectParam(in ::TestModule::Test2::TestObject param);
- ::TestModule::Test2::TestObject testCustomObjectReturn();
+ boolean testCustomObjectParam2(in ::TestModule::Test2::TestObject param);
+ ::TestModule::Test2::TestObject testCustomObjectReturn2();
};
module foobar {