Author: bimargulies Date: Sun Oct 17 02:26:52 2010 New Revision: 1023405 URL: http://svn.apache.org/viewvc?rev=1023405&view=rev Log: fix invalid schemas in soap binding header test
Modified: cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-12-header.wsdl cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.wsdl cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml Modified: cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-12-header.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-12-header.wsdl?rev=1023405&r1=1023404&r2=1023405&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-12-header.wsdl (original) +++ cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-12-header.wsdl Sun Oct 17 02:26:52 2010 @@ -7,9 +7,9 @@ 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 @@ -20,11 +20,11 @@ <definitions name="soap_header" targetNamespace="http://org.apache.cxf/headers" xmlns:m="http://travelcompany.example.org/reservation" xmlns:n="http://mycompany.example.com/employees" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://org.apache.cxf/headers" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <types> <schema targetNamespace="http://org.apache.cxf/headers" @@ -33,7 +33,7 @@ <element name="inHeader"> <complexType> <sequence> - <element name="" type="xsd:string"/> + <element name="dummy" type="xsd:string"/> </sequence> </complexType> </element> @@ -41,10 +41,10 @@ <complexType/> </element> </schema> - + <schema targetNamespace="http://mycompany.example.com/employees" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> <element name="passenger"> <complexType> <sequence> @@ -53,7 +53,7 @@ </complexType> </element> </schema> - + </types> <message name="inHeaderRequest"> @@ -77,7 +77,7 @@ <soap12:operation soapAction="" style="document"/> <input name="inHeaderRequest"> <soap12:body parts="me" use="literal"/> - <soap12:header message="tns:inHeaderRequest" part="passenger" + <soap12:header message="tns:inHeaderRequest" part="passenger" use="literal"/> </input> <output name="inHeaderResponse"> Modified: cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.wsdl?rev=1023405&r1=1023404&r2=1023405&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.wsdl (original) +++ cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.wsdl Sun Oct 17 02:26:52 2010 @@ -7,9 +7,9 @@ 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 @@ -20,11 +20,11 @@ <definitions name="soap_header" targetNamespace="http://org.apache.cxf/headers" xmlns:m="http://travelcompany.example.org/reservation" xmlns:n="http://mycompany.example.com/employees" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.apache.cxf/headers" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <types> <schema targetNamespace="http://org.apache.cxf/headers" @@ -33,7 +33,8 @@ <element name="inHeader"> <complexType> <sequence> - <element name="" type="xsd:string"/> + <!-- every element must have a name or a ref --> + <element name="dummy" type="xsd:string"/> </sequence> </complexType> </element> @@ -41,10 +42,10 @@ <complexType/> </element> </schema> - + <schema targetNamespace="http://mycompany.example.com/employees" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> <element name="passenger"> <complexType> <sequence> @@ -53,7 +54,7 @@ </complexType> </element> </schema> - + </types> <message name="inHeaderRequest"> @@ -77,7 +78,7 @@ <soap:operation soapAction="" style="document"/> <input name="inHeaderRequest"> <soap:body parts="me" use="literal"/> - <soap:header message="tns:inHeaderRequest" part="passenger" + <soap:header message="tns:inHeaderRequest" part="passenger" use="literal"/> </input> <output name="inHeaderResponse"> Modified: cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml?rev=1023405&r1=1023404&r2=1023405&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml (original) +++ cxf/trunk/rt/bindings/soap/src/test/resources/org/apache/cxf/binding/soap/test-soap-header.xml Sun Oct 17 02:26:52 2010 @@ -6,9 +6,9 @@ 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 @@ -32,7 +32,7 @@ </env:Header> <!-- before body test for processing comment here --> <env:Body> - <!-- boyd test for processing comment here --> + <!-- body test for processing comment here --> <p:itinerary xmlns:p="http://travelcompany.example.org/reservation/travel"> <p:departure> <p:departing>New York</p:departing>