cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r790294 - in /cxf/trunk: rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/ rt/core/src/main/java/org/apache/cxf/endpoint/ systests/ systests/src/test/jav...
Date Wed, 01 Jul 2009 18:10:48 GMT
Author: dkulp
Date: Wed Jul  1 18:10:48 2009
New Revision: 790294

URL: http://svn.apache.org/viewvc?rev=790294&view=rev
Log:
[CXF-2328] Fix issues with Corba binding not deserializing/mapping user
exceptions properly.

Added:
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java   (with
props)
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java   (with props)
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java   (with props)
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml 
 (with props)
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml 
 (with props)
    cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl   (with props)
Modified:
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/systests/pom.xml

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=790294&r1=790293&r2=790294&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
(original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
Wed Jul  1 18:10:48 2009
@@ -391,11 +391,9 @@
             if (corbaMsg.getStreamableException() != null) {
                 exchange.setInFaultMessage(corbaMsg);
                 inCorbaMsg.setStreamableException(corbaMsg.getStreamableException());
-                inCorbaMsg.setContent(Exception.class, corbaMsg.getContent(Exception.class));
             } else if (corbaMsg.getSystemException() != null) {
                 exchange.setInFaultMessage(corbaMsg);
                 inCorbaMsg.setSystemException(corbaMsg.getSystemException());
-                inCorbaMsg.setContent(Exception.class, corbaMsg.getContent(Exception.class));
             }
             LOG.log(Level.FINE, "incoming observer is " + incomingObserver);
             incomingObserver.onMessage((Message)inCorbaMsg);

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java?rev=790294&r1=790293&r2=790294&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
(original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
Wed Jul  1 18:10:48 2009
@@ -91,6 +91,9 @@
 
         CorbaMessage message = (CorbaMessage)msg;
         if (message.getStreamableException() != null || message.getSystemException() != null)
{
+            message.setContent(Exception.class, 
+                               message.getExchange().getOutMessage().getContent(Exception.class));
+
             Endpoint ep = message.getExchange().get(Endpoint.class);
             message.getInterceptorChain().abort();
             if (ep.getInFaultObserver() != null) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=790294&r1=790293&r2=790294&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed Jul  1 18:10:48
2009
@@ -640,7 +640,7 @@
             } else if (startingInterceptorID != null) {
                 chain.doInterceptStartingAt(message, startingInterceptorID);
             } else if (message.getContent(Exception.class) != null) {
-                chain.getFaultObserver().onMessage(message);
+                outFaultObserver.onMessage(message);
             } else {
                 chain.doIntercept(message);
             }

Modified: cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/pom.xml?rev=790294&r1=790293&r2=790294&view=diff
==============================================================================
--- cxf/trunk/systests/pom.xml (original)
+++ cxf/trunk/systests/pom.xml Wed Jul  1 18:10:48 2009
@@ -124,6 +124,21 @@
                         </goals>
                     </execution>
                     <execution>
+                        <id>generate-corba-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                    </execution>
+                    <execution>
                         <id>generate-wssec10-test-sources</id>
                         <phase>generate-test-sources</phase>
                         <configuration>

Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java?rev=790294&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java Wed
Jul  1 18:10:48 2009
@@ -0,0 +1,86 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.corba;
+
+import java.util.ResourceBundle;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.hello_world_corba.Greeter;
+import org.apache.cxf.hello_world_corba.PingMeFault;
+import org.apache.cxf.hello_world_corba.types.FaultDetail;
+import org.apache.cxf.interceptor.Fault;
+import org.junit.Assert;
+
+/**
+ * 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.
+ */
+
+@javax.jws.WebService(portName = "GreeterCORBAPort", 
+        serviceName = "GreeterCORBAService",
+        targetNamespace = "http://cxf.apache.org/hello_world_corba",
+        wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+        endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
+        
+public class BaseGreeterImpl extends Assert implements Greeter {
+    public static final String GREETME_IN = "test in";
+    public static final String GREETME_OUT = "test out";
+    static final String EX_STRING = "CXF RUNTIME EXCEPTION";
+
+    public String greetMe(String me) {
+        return "Hello " + me;
+    }
+
+    public void greetMeOneWay(String me) {
+        assertEquals("William", me);
+    }
+
+    public String sayHi() {
+        return GREETME_OUT;
+    }
+
+    public void pingMe(String faultType) throws PingMeFault {
+        if ("USER".equals(faultType)) {
+
+            FaultDetail detail = new FaultDetail();
+            detail.setMajor((short)1);
+            detail.setMinor((short)2);
+            throw new PingMeFault("USER FAULT TEST", detail);
+        } else if ("SYSTEM".equals(faultType)) {
+            throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
+                    new Object[]{"FAULT TEST"}));
+        } else {
+            throw new IllegalArgumentException(EX_STRING);
+        }
+    }
+}

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java?rev=790294&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java Wed Jul 
1 18:10:48 2009
@@ -0,0 +1,96 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.systest.corba;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.hello_world_corba.Greeter;
+import org.apache.cxf.hello_world_corba.GreeterCORBAService;
+import org.apache.cxf.hello_world_corba.PingMeFault;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class CorbaTest extends AbstractBusClientServerTestBase {
+
+       
+    private static final QName SERVICE_NAME = 
+        new QName("http://cxf.apache.org/hello_world_corba", 
+                  "GreeterCORBAService");
+
+    @BeforeClass
+    public static void startServers() throws Exception {
+        assertTrue(
+            "Server failed to launch",
+            launchServer(Server.class)
+        );
+    }
+    
+    @AfterClass
+    public static void cleanupFile() throws Exception {
+        File file = new File("./HelloWorld.ref");
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+
+    @Test
+    public void testClientServer() throws Exception {
+        System.getProperties().remove("com.sun.CORBA.POA.ORBServerId");
+        System.getProperties().remove("com.sun.CORBA.POA.ORBPersistentServerPort");
+        URL wsdlUrl = this.getClass().getResource("/wsdl_systest/hello_world_corba.wsdl");
+        new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_client.xml");
+
+        GreeterCORBAService gcs = new GreeterCORBAService(wsdlUrl, SERVICE_NAME);
+        Greeter port = gcs.getGreeterCORBAPort();
+
+
+        String output = port.greetMe("Betty");
+        assertTrue("Unexpected returned string: " + output, "Hello Betty".equals(output));
+    }
+    
+    @Test
+    public void testException() throws Exception {
+        System.getProperties().remove("com.sun.CORBA.POA.ORBServerId");
+        System.getProperties().remove("com.sun.CORBA.POA.ORBPersistentServerPort");
+        URL wsdlUrl = this.getClass().getResource("/wsdl_systest/hello_world_corba.wsdl");
+        new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_client.xml");
+
+        GreeterCORBAService gcs = new GreeterCORBAService(wsdlUrl, SERVICE_NAME);
+        Greeter port = gcs.getGreeterCORBAPort();
+        try {
+            port.pingMe("USER");
+        } catch (PingMeFault pe) {
+            assertTrue("Caught right exception ", pe != null);
+            return;
+        }
+        fail("Didn't catch an exception");
+    }
+
+    
+}

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java?rev=790294&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java Wed Jul  1 18:10:48
2009
@@ -0,0 +1,51 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.systest.corba;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+
+public class Server extends AbstractBusTestServerBase {
+    
+    protected void run()  {
+        System.out.println("Starting Server");
+        System.setProperty("com.sun.CORBA.POA.ORBServerId", "1");
+        System.setProperty("com.sun.CORBA.POA.ORBPersistentServerPort", "40000");
+        new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_server.xml");
+        Object implementor = new BaseGreeterImpl();
+        String address = "file:./HelloWorld.ref";
+        Endpoint.publish(address, implementor);
+    }
+
+    public static void main(String[] args) {
+        try {
+            Server s = new Server();
+            s.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            System.exit(-1);
+        } finally {
+            System.out.println("done!");
+        }
+    }
+}

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml?rev=790294&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml Wed
Jul  1 18:10:48 2009
@@ -0,0 +1,36 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:soap="http://cxf.apache.org/bindings/soap"
+       xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"
+      >
+
+
+    <jaxws:client name="{http://schemas.apache.org/yoko/idl/HelloWorld}HelloWorldCORBAPort"
+		createdFromAPI="true">
+	</jaxws:client>
+
+    
+</beans>

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml?rev=790294&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml Wed
Jul  1 18:10:48 2009
@@ -0,0 +1,34 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:soap="http://cxf.apache.org/bindings/soap"
+       xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"
+      >
+
+    <jaxws:endpoint name="{http://schemas.apache.org/yoko/idl/HelloWorld}HelloWorldCORBAPort"
createdFromAPI="true">
+
+	</jaxws:endpoint>
+	
+</beans>

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl?rev=790294&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl (added)
+++ cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl Wed Jul  1 18:10:48
2009
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="HelloWorld" 
+    targetNamespace="http://cxf.apache.org/hello_world_corba" 
+    xmlns:tns="http://cxf.apache.org/hello_world_corba"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" 
+    xmlns:ns1="http://cxf.apache.org/hello_world_corba/corba/typemap/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+    xmlns:x1="http://cxf.apache.org/hello_world_corba/types" 
+    xmlns:x2="http://cxf.apache.org/hello_world_corba" 
+    >
+
+    <wsdl:types>
+        <schema targetNamespace="http://cxf.apache.org/hello_world_corba/types"
+            xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:tns="http://cxf.apache.org/hello_world_corba/types"
+            elementFormDefault="qualified">
+
+            <simpleType name="MyStringType">
+                <restriction base="string">
+                    <maxLength value="30" />
+                </restriction>
+            </simpleType>
+
+            <element name="sayHi">
+                <complexType/>
+            </element>
+            <element name="sayHiResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="tns:MyStringType"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeOneWay">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="pingMe">
+                <complexType>
+                    <sequence>
+                        <element name="faultType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="pingMeResponse">
+                <complexType/>
+            </element>
+            <element name="faultDetail">
+                <complexType>
+                    <sequence>
+                        <element name="minor" type="short"/>
+                        <element name="major" type="short"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="sayHiRequest">
+        <wsdl:part element="x1:sayHi" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+        <wsdl:part element="x1:sayHiResponse" name="out"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part element="x1:greetMe" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part element="x1:greetMeResponse" name="out"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeOneWayRequest">
+        <wsdl:part element="x1:greetMeOneWay" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeRequest">
+        <wsdl:part name="in" element="x1:pingMe"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeResponse">
+        <wsdl:part name="out" element="x1:pingMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeFault">
+        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+    </wsdl:message>
+
+    <wsdl:portType name="Greeter">
+        <wsdl:operation name="sayHi">
+            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="greetMeOneWay">
+            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="pingMe">
+            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+        </wsdl:operation>
+
+    </wsdl:portType>
+
+  <corba:typeMapping xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://cxf.apache.org/hello_world_corba/corba/typemap/">
+    <corba:anonstring bound="30" type="corba:string" name="MyStringType" />
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:pingMeResponse:1.0"
type="x1:pingMeResponse" name="pingMeResponse" />
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:sayHiResponse:1.0"
type="x1:sayHiResponse" name="sayHiResponse">
+      <corba:member qualified="true" name="responseType" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:pingMe:1.0"
type="x1:pingMe" name="pingMe">
+      <corba:member qualified="true" name="faultType" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:sayHi:1.0"
type="x1:sayHi" name="sayHi" />
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:greetMeOneWay:1.0"
type="x1:greetMeOneWay" name="greetMeOneWay">
+      <corba:member qualified="true" name="requestType" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:greetMe:1.0"
type="x1:greetMe" name="greetMe">
+      <corba:member xmlns:ns1="http://cxf.apache.org/hello_world_corba/corba/typemap/"
qualified="true" name="requestType" idltype="ns1:MyStringType" />
+    </corba:struct>
+    <corba:struct xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:greetMeResponse:1.0"
type="x1:greetMeResponse" name="greetMeResponse">
+      <corba:member qualified="true" name="responseType" idltype="corba:string" />
+    </corba:struct>
+    <corba:exception xmlns:x1="http://cxf.apache.org/hello_world_corba/types" repositoryID="IDL:faultDetail:1.0"
type="x1:faultDetail" name="faultDetail">
+      <corba:member qualified="true" name="minor" idltype="corba:short" />
+      <corba:member qualified="true" name="major" idltype="corba:short" />
+    </corba:exception>
+  </corba:typeMapping>
+
+  <wsdl:binding name="Greeter_CORBABinding" type="x2:Greeter">
+    <corba:binding xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" repositoryID="IDL:Greeter:1.0"
/>
+    <wsdl:operation name="sayHi">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="sayHi">
+        <corba:return name="responseType" idltype="corba:string" />
+      </corba:operation>
+      <wsdl:input name="sayHiRequest">
+      </wsdl:input>
+      <wsdl:output name="sayHiResponse">
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="greetMe">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="greetMe">
+        <corba:param xmlns:ns1="http://cxf.apache.org/hello_world_corba/corba/typemap/"
mode="in" name="requestType" idltype="ns1:MyStringType" />
+        <corba:return name="responseType" idltype="corba:string" />
+      </corba:operation>
+      <wsdl:input name="greetMeRequest">
+      </wsdl:input>
+      <wsdl:output name="greetMeResponse">
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="greetMeOneWay">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="greetMeOneWay">
+        <corba:param mode="in" name="requestType" idltype="corba:string" />
+      </corba:operation>
+      <wsdl:input name="greetMeOneWayRequest">
+      </wsdl:input>
+    </wsdl:operation>
+    <wsdl:operation name="pingMe">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="pingMe">
+        <corba:param mode="in" name="faultType" idltype="corba:string" />
+        <corba:raises xmlns:ns1="http://cxf.apache.org/hello_world_corba/corba/typemap/"
exception="ns1:faultDetail" />
+      </corba:operation>
+      <wsdl:input name="pingMeRequest">
+      </wsdl:input>
+      <wsdl:output name="pingMeResponse">
+      </wsdl:output>
+      <wsdl:fault name="pingMeFault">
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="GreeterCORBAService">
+    <wsdl:port name="GreeterCORBAPort" binding="tns:Greeter_CORBABinding">
+      <corba:address xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" location="file:./HelloWorld.ref"
/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message