Author: dkulp
Date: Thu May 29 10:06:18 2008
New Revision: 661406
URL: http://svn.apache.org/viewvc?rev=661406&view=rev
Log:
[CXF-1611] Fix corba tests to use the cataloged schemas
Removed:
cxf/trunk/tools/corba/src/test/resources/wsdl/wsaddressing.xsd
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl
cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java?rev=661406&r1=661405&r2=661406&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
(original)
+++
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
Thu May 29 10:06:18 2008
@@ -593,9 +593,6 @@
}
}
- // The ws-addr import in this wsdl fails. Ignored until cataloged
- // or otherwise dealt with --bimargulies.
- @org.junit.Ignore
@Test
public void testWsaddressingServerIdlgen() throws Exception {
Modified:
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl
(original)
+++ cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl
Thu May 29 10:06:18 2008
@@ -26,7 +26,7 @@
<types>
<schema elementFormDefault="qualified"
targetNamespace="http://www.apache.org/bus/demos/bank";
xmlns="http://www.w3.org/2001/XMLSchema";>
- <import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="./src/test/resources/wsdl/wsaddressing.xsd"/>
+ <import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
<complexType name="AccountNames">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="name"
type="xsd:string"/>
Modified: cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl
(original)
+++ cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl Thu
May 29 10:06:18 2008
@@ -27,7 +27,7 @@
<types>
<schema elementFormDefault="qualified"
targetNamespace="http://www.apache.org/bus/demos/bank";
xmlns="http://www.w3.org/2001/XMLSchema";>
- <import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="./src/test/resources/wsdl/wsaddressing.xsd"/>
+ <import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
<complexType name="AccountNames">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="name"
type="xsd:string"/>
Modified:
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl
(original)
+++ cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl
Thu May 29 10:06:18 2008
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-addressing
+
<definitions name="c/epr.idl"
targetNamespace="http://schemas.apache.org/idl/c/epr.idl";
xmlns:tns="http://schemas.apache.org/idl/c/epr.idl";
@@ -34,15 +34,14 @@
</corba:typeMapping>
<types>
<schema targetNamespace="http://schemas.apache.org/idltypes/c/epr.idl";
xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
- <xsd:import xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- namespace="http://www.w3.org/2005/08/addressing";
- schemaLocation="./src/test/resources/wsdl/wsaddressing.xsd"/>
+ <import namespace="http://www.w3.org/2005/08/addressing";
+ schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
</schema>
</types>
<message name="TestServer.registerResponse">
</message>
<message name="TestServer.register">
- <part name="cb" element="addressing:EndpointReferenceType"/>
+ <part name="cb" element="addressing:EndpointReference"/>
</message>
<portType name="TestServer">
<operation name="register">
Modified: cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl
(original)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl Thu May
29 10:06:18 2008
@@ -13,7 +13,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="http://factory_pattern.cxf.apache.org/";>
- <xsd:import
namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="wsaddressing.xsd"/>
+ <xsd:import
namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
<xsd:element name="create">
<xsd:complexType>
<xsd:sequence>
