incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r552558 - in /incubator/yoko/trunk: bindings/src/test/java/org/apache/yoko/bindings/corba/ bindings/src/test/resources/wsdl/ bindings/src/test/resources/wsdl/type_test/ tools/src/main/java/org/apache/yoko/tools/processors/idl/ tools/src/mai...
Date Mon, 02 Jul 2007 18:44:29 GMT
Author: bravi
Date: Mon Jul  2 11:44:27 2007
New Revision: 552558

URL: http://svn.apache.org/viewvc?view=rev&rev=552558
Log:
[YOKO-373, YOKO-393] - Added more tests to the corba binding for the nillable cases &
also updated the wsdltoidl tool to handle the empty complex type in the output parameter.
Also fixed some issues in the wsdltoidl w.r.t the exception types.

Modified:
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java
    incubator/yoko/trunk/bindings/src/test/resources/wsdl/NestedObjRef.wsdl
    incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd
    incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_impl_java.xsl
    incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_wsdl.xsl
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationDeferredAction.java
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLParameter.java
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
    incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java
    incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceParam.wsdl

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java
(original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient1.java
Mon Jul  2 11:44:27 2007
@@ -861,5 +861,43 @@
         }
     }
 
+    public void testNillableStruct() throws Exception {
+        SimpleStruct x = new SimpleStruct();
+        x.setVarFloat(3.14f);
+        x.setVarInt(new BigInteger("42"));
+        x.setVarString("Hello There");
+
+        SimpleStruct yOrig = null;
+        Holder<SimpleStruct> y = new Holder<SimpleStruct>(yOrig);
+        Holder<SimpleStruct> z = new Holder<SimpleStruct>();
+        SimpleStruct ret = client.testNillableStruct(x, y, z);
+
+        if (!perfTestOnly) {
+            assertTrue("testNillableStruct(): Incorrect value for inout param",
+                       equalsNilableStruct(x, y.value));
+            assertTrue("testNillableStruct(): Incorrect value for out param",
+                       equalsNilableStruct(yOrig, z.value));
+            assertTrue("testNillableStruct(): Incorrect return value", equalsNilableStruct(x,
ret));
+        }
+
+        x = null;
+
+        yOrig = new SimpleStruct();
+        yOrig.setVarFloat(1.414f);
+        yOrig.setVarInt(new BigInteger("13"));
+        yOrig.setVarString("Cheerio");
+
+        y = new Holder<SimpleStruct>(yOrig);
+        z = new Holder<SimpleStruct>();
+        ret = client.testNillableStruct(x, y, z);
+
+        if (!perfTestOnly) {
+            assertTrue("testNillableStruct(): Incorrect value for inout param",
+                       equalsNilableStruct(x, y.value));
+            assertTrue("testNillableStruct(): Incorrect value for out param",
+                       equalsNilableStruct(yOrig, z.value));
+            assertTrue("testNillableStruct(): Incorrect return value", equalsNilableStruct(x,
ret));
+        }
+    }
 
 }

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java
(original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java
Mon Jul  2 11:44:27 2007
@@ -138,7 +138,7 @@
     }
 
     public void testCreateFooRefInStruct() {
-        FooRefStruct ref = client.createFooRefInStruct();
+        FooRefStruct ref = client.createFooRefInStruct("FooRefInStruct");
         //EndpointReferenceType epr = createObjectFromEndpointReferenceType(ref.getRef());
         EndpointReferenceType epr = ref.getRef();
 
@@ -155,6 +155,10 @@
 
         String portName = EndpointReferenceUtils.getPortName(epr);
         assertTrue(portName.equals(OBJECT_PORT_NAME.getLocalPart()));
+
+        //Test for null for EPR.
+        ref = client.createFooRefInStruct("");
+        assertNull("Null EPR expected", ref.getRef());
     }
 
     public void testCreateFooRefInUnion() {
@@ -267,11 +271,15 @@
     public class FooFactoryImpl implements FooFactory {
 
         // TODO: Provide methods
-        public FooRefStruct createFooRefInStruct() {
+        public FooRefStruct createFooRefInStruct(String request) {
             FooRefStruct ref = new FooRefStruct();
-            ref.setName("FooRefStruct");
-            EndpointReferenceType epr = createEndpointReferenceType("StructRef", true);
-            ref.setRef(epr);
+            if (!request.equals("")) {
+                ref.setName(request);
+                EndpointReferenceType epr = createEndpointReferenceType("StructRef", true);
+                ref.setRef(epr);
+            } else {
+                ref.setName("error!!!");
+            }
             return ref;
         }
 

Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/NestedObjRef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/NestedObjRef.wsdl?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/NestedObjRef.wsdl (original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/NestedObjRef.wsdl Mon Jul  2 11:44:27
2007
@@ -86,6 +86,7 @@
       <xs:element name="createFooRefInStruct">
         <xs:complexType>
           <xs:sequence>
+              <xs:element name="request" type="xs:string"/>
           </xs:sequence>
         </xs:complexType>
       </xs:element>
@@ -163,6 +164,7 @@
     <corba:binding repositoryID="IDL:FooFactory:1.0" />
     <wsdl:operation name="createFooRefInStruct">
       <corba:operation name="createFooRefInStruct">
+        <corba:param name="request" mode="in" idltype="corba:string"/>
         <corba:return xmlns="http://schemas.apache.org/yoko/idl/NestedObjRef/typemap"
name="return" idltype="FooRefStruct" />
       </corba:operation>
       <wsdl:input name="createFooRefInStructRequest">

Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd (original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd Mon Jul
 2 11:44:27 2007
@@ -98,8 +98,9 @@
 
   <itst:it_test_group ID="1">
 
-    <!-- Nillable elements -->
+    <!-- Nillable elements
     <element name="NillableString" type="string" nillable="true"/>
+    -->
     <element name="NillableStruct" type="x1:SimpleStruct" nillable="true"/>
 
     <!-- Complex Types -->

Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_impl_java.xsl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_impl_java.xsl?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_impl_java.xsl
(original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_impl_java.xsl
Mon Jul  2 11:44:27 2007
@@ -73,7 +73,7 @@
         y.value = x;
         return x;
     }
-
+    */
     public SimpleStruct testNillableStruct(
             SimpleStruct x,
             Holder<SimpleStruct> y,
@@ -82,7 +82,7 @@
         y.value = x;
         return x;
     }
-   
+    /*
     public String testSimpleRestriction(String x, 
             Holder<String> y, 
             Holder<String> z) {
@@ -405,7 +405,6 @@
         <xsl:apply-templates select="xsd:element[not(
                 @name='AnonTypeElement'
                 or @name='NillableString'
-                or @name='NillableStruct'
                 or @itst:it_no_test='true')]"
             mode="definition"/>
         -->

Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_wsdl.xsl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_wsdl.xsl?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_wsdl.xsl (original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test_wsdl.xsl Mon
Jul  2 11:44:27 2007
@@ -447,10 +447,8 @@
         mode="test_operation"/>
     <xsl:apply-templates select="xsd:complexType[not(@itst:it_no_test='true')]"
         mode="test_operation"/>
-    <!--
     <xsl:apply-templates select="xsd:element[not(@itst:it_no_test='true')]"
         mode="test_operation"/>
-    -->
     <xsl:apply-templates select="itst:builtIn[not(@itst:it_no_test='true')]"
         mode="test_operation"/>
   </xsl:template>

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationDeferredAction.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationDeferredAction.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationDeferredAction.java
Mon Jul  2 11:44:27 2007
@@ -22,6 +22,7 @@
 import org.apache.schemas.yoko.bindings.corba.ArgType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.yoko.tools.common.ReferenceConstants;
 import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class OperationDeferredAction extends DeferredActionBase {
@@ -49,6 +50,9 @@
         }
         if (element != null) {
             element.setSchemaTypeName(stype.getQName());
+            if (stype.getQName().equals(ReferenceConstants.WSADDRESSING_TYPE)) {
+                element.setNillable(true);
+            }
         }                
     }
        

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLParameter.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLParameter.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLParameter.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLParameter.java
Mon Jul  2 11:44:27 2007
@@ -196,10 +196,12 @@
                 schemaType = (XmlSchemaComplexType) el.getSchemaType();
             }
             XmlSchemaSequence seq = (XmlSchemaSequence) schemaType.getParticle();
-            XmlSchemaObjectCollection items = seq.getItems();
-            for (int i = 0; i < items.getCount(); i++) {
-                el = (XmlSchemaElement) items.getItem(i);
-                processWrappedOutputParam(wsdlToCorbaBinding, el, inputs, outputs);
+            if (seq != null) {
+                XmlSchemaObjectCollection items = seq.getItems();
+                for (int i = 0; i < items.getCount(); i++) {
+                    el = (XmlSchemaElement) items.getItem(i);
+                    processWrappedOutputParam(wsdlToCorbaBinding, el, inputs, outputs);
+                }
             }
         }
     }

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
Mon Jul  2 11:44:27 2007
@@ -469,8 +469,7 @@
         while (i.hasNext()) {
             Fault fault = (Fault)i.next();
             RaisesType raisestype = new RaisesType();            
-            CorbaTypeImpl extype = convertFaultToCorbaType(xmlSchemaType, fault);
-
+            CorbaTypeImpl extype = convertFaultToCorbaType(xmlSchemaType, fault);       
   
             if (extype != null) {
                 raisestype.setException(helper.createQNameCorbaNamespace(extype.getName()));
               
                 operationType.getRaises().add(raisestype);
@@ -619,28 +618,36 @@
     private CorbaTypeImpl convertFaultToCorbaType(XmlSchema xmlSchema, Fault fault) throws
Exception {
         org.apache.schemas.yoko.bindings.corba.Exception corbaex = null;
         XmlSchemaType schemaType = null;
-        String faultName = fault.getMessage().getQName().getLocalPart();
-
-        int pos = faultName.indexOf("_exception.");
-
-        if (pos != -1) {
-            faultName = faultName.substring(pos + 11);
-            faultName = faultName + "Exception";
-        }
-
-        QName name = helper.createQNameCorbaNamespace(faultName);
         Iterator parts = fault.getMessage().getParts().values().iterator();
+        
+        if (!parts.hasNext()) {
+            String msgStr = "Fault " + fault.getMessage().getQName().getLocalPart() 
+                + " UNSUPPORTED_FAULT.";
+            org.apache.cxf.common.i18n.Message msg = 
+                new org.apache.cxf.common.i18n.Message(msgStr, LOG);
+            throw new Exception(msg.toString());            
+        }
 
-        if (parts.hasNext()) {
-            Part part = (Part)parts.next();
-            schemaType = helper.lookUpType(part);
-
-            if (schemaType != null && !helper.isSchemaTypeException(schemaType))
{
+        Part part = (Part)parts.next();
+        schemaType = helper.lookUpType(part);
+        if (schemaType != null) {
+            QName name = schemaType.getQName();
+            if (name == null) {
+                name = part.getElementName();
+            }
+            if (!helper.isSchemaTypeException(schemaType)) {
                 corbaex = new org.apache.schemas.yoko.bindings.corba.Exception();
-                corbaex.setName(schemaType.getName());
-                corbaex.setQName(schemaType.getQName());
+                String faultName = fault.getMessage().getQName().getLocalPart();
+                int pos = faultName.indexOf("_exception.");             
+                if (pos != -1) {
+                    faultName = faultName.substring(pos + 11);
+                    faultName = faultName + "Exception";
+                }
+                QName faultMsgName = helper.createQNameCorbaNamespace(faultName);
+                corbaex.setName(faultName);
+                corbaex.setQName(faultMsgName);
                 CorbaTypeImpl corbaTypeImpl = 
-                    helper.convertSchemaToCorbaType(schemaType, part.getTypeName(), null,
null, false);
+                    helper.convertSchemaToCorbaType(schemaType, name, null, null, false);
                 if (corbaTypeImpl != null) {
                     MemberType member = new MemberType();
                     member.setName(corbaTypeImpl.getQName().getLocalPart());
@@ -651,11 +658,10 @@
                     corbaex.getMember().add(member);
                 }
             } else {
-                QName elementName = part.getElementName();
-                QName schematypeName = helper.checkPrefix(schemaType.getQName());
-                corbaex = createCorbaException(name, schematypeName, schemaType, elementName);
+                corbaex = createCorbaException(name, schemaType);
             }
-        } else {            
+        }
+        if (schemaType == null) {
             String msgStr = "Fault " + fault.getMessage().getQName().getLocalPart() 
                  + " INCORRECT_FAULT_MSG.";
             org.apache.cxf.common.i18n.Message msg = 
@@ -685,14 +691,11 @@
                 }
             }
         }
-
         return corbaex;
     }
     
-    private org.apache.schemas.yoko.bindings.corba.Exception createCorbaException(QName name,
-                                                                                  QName schemaTypeName,
-                                                                                  XmlSchemaType
stype,
-                                                                                  QName elementName)
  
+    private org.apache.schemas.yoko.bindings.corba.Exception createCorbaException(QName schemaTypeName,
+                                                                                  XmlSchemaType
stype)
         throws Exception {
         org.apache.schemas.yoko.bindings.corba.Exception corbaex = null;
         XmlSchemaComplexType complex = null;
@@ -701,16 +704,14 @@
             QName defaultName = schemaTypeName;
             complex = (XmlSchemaComplexType)stype;
             corbaex = new org.apache.schemas.yoko.bindings.corba.Exception();
-            corbaex.setName(name.getLocalPart());
-            if (schemaTypeName != null) {
-                corbaex.setQName(schemaTypeName);
-                corbaex.setType(helper.checkPrefix(stype.getQName()));
-            } else {
-                corbaex.setQName(helper.checkPrefix(elementName));
-                corbaex.setType(helper.checkPrefix(elementName));
-                defaultName = elementName;
-            }            
-            corbaex.setRepositoryID(helper.REPO_STRING + "/" + name.getLocalPart() + helper.IDL_VERSION);
+            corbaex.setQName(schemaTypeName);
+            corbaex.setType(helper.checkPrefix(schemaTypeName));
+            corbaex.setName(schemaTypeName.getLocalPart());
+
+            corbaex.setRepositoryID(helper.REPO_STRING
+                                    + "/"
+                                    + defaultName.getLocalPart()
+                                    + helper.IDL_VERSION);
             String uri = defaultName.getNamespaceURI();
             List attributeMembers = helper.processAttributesAsMembers(complex.getAttributes().getIterator(),
                                                                       uri);

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java
Mon Jul  2 11:44:27 2007
@@ -163,8 +163,18 @@
                         }
                     }
                 } else {
-                    // generate idl for all bindings.                    
-                    idlAction.setGenerateAllBindings(true);                    
+                    //try to get the binding name from the wsdlToCorbaBinding
+                    java.util.List<String> bindingNames = wsdlToCorbaBinding.getGeneratedBindingNames();
+                    if ((bindingNames != null) && (bindingNames.size() > 0)) {
+                        idlAction.setBindingName(bindingNames.get(0));
+                        if (bindingNames.size() > 1) {
+                            System.err.println("Warning: Generating idl only for the binding
"
+                                               + bindingNames.get(0));
+                        }
+                    } else {
+                        // generate idl for all bindings.                    
+                        idlAction.setGenerateAllBindings(true);
+                    }
                 }
                 
             } else {

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
Mon Jul  2 11:44:27 2007
@@ -190,6 +190,8 @@
         List ext = binding.getExtensibilityElements();
         if (!(ext.get(0) instanceof BindingType)) {
             // throw an error not a corba binding
+            throw new RuntimeException(binding.getQName() + " is not a corba binding, "
+                                       + "please pass a corba binding/porttype to use");
         }
 
         if (printWriter == null) {
@@ -370,7 +372,7 @@
             }
             Iterator i = typeMappingType.getStructOrExceptionOrUnion().iterator();
             while (i.hasNext()) {
-                CorbaTypeImpl corbaType = (CorbaTypeImpl)i.next();                      
        
+                CorbaTypeImpl corbaType = (CorbaTypeImpl)i.next();
                 if (corbaType.getName().equals(qname.getLocalPart())) {                 
  
                     return corbaType;
                 }

Modified: incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java
(original)
+++ incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java
Mon Jul  2 11:44:27 2007
@@ -384,9 +384,9 @@
                     assertEquals(corbaOpType.getName(), "review_data");
                     assertEquals(1, corbaOpType.getParam().size());
                     assertEquals(corbaOpType.getRaises().get(0).getException().getLocalPart(),

-                                 "TestException.BadRecordException");
+                                 "TestException.BadRecord");
                     assertEquals(corbaOpType.getRaises().get(1).getException().getLocalPart(),

-                        "MyExceptionMessage");                          
+                                 "MyExceptionType");                          
                 }
             }
         }            

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceParam.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceParam.wsdl?view=diff&rev=552558&r1=552557&r2=552558
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceParam.wsdl
(original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceParam.wsdl
Mon Jul  2 11:44:27 2007
@@ -38,7 +38,7 @@
       <xs:element name="routeCAllParamResponse">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="return" type="wsa:EndpointReferenceType">
+            <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
             </xs:element>
             <xs:element name="outTp" nillable="true" type="wsa:EndpointReferenceType">
             </xs:element>



Mime
View raw message