You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/11/14 17:30:49 UTC
svn commit: r1201776 [2/2] - in /cxf/branches/2.4.x-fixes: ./
maven-plugins/wsdl-validator-plugin/
rt/databinding/jibx/src/test/java/resources/
rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/
rt/databinding/xmlbeans/src/test/xsd/ rt/fron...
Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl?rev=1201776&r1=1201775&r2=1201776&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl Mon Nov 14 16:30:48 2011
@@ -1,3 +1,22 @@
+<?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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
<wsdl:import namespace="http://incorrect-namespace" location="child.wsdl" />
</wsdl:definitions>
\ No newline at end of file
Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl?rev=1201776&r1=1201775&r2=1201776&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl Mon Nov 14 16:30:48 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://reportincident.example.camel.apache.org"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1201776&r1=1201775&r2=1201776&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl Mon Nov 14 16:30:48 2011
@@ -1,71 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
- <wsdl:types>
- <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
- <xsd:complexType name="loginrequesttype">
- <xsd:sequence>
- <xsd:element name="username" type="xsd:string"/>
- <xsd:element name="password" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="loginresponsetype">
- <xsd:sequence>
- <xsd:element name="userid" type="xsd:int"/>
- <xsd:element name="groupid" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-
-
- <xsd:element name="login">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="login" type="fc:loginrequesttype"/>
- <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="loginResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="login" type="fc:loginresponsetype"/>
- <xsd:element name="password_temp" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
-
- <wsdl:message name="loginRequest">
- <wsdl:part name="parameters" element="fc:login"/>
- </wsdl:message>
- <wsdl:message name="loginResponse">
- <wsdl:part name="parameters" element="fc:loginResponse"/>
- </wsdl:message>
-
-
- <wsdl:portType name="Login">
- <wsdl:operation name="login">
- <wsdl:input message="fc:loginRequest"/>
- <wsdl:output message="fc:loginResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="Login" type="fc:Login">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="login">
- <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="Login">
- <wsdl:port binding="fc:Login" name="center">
- <soap:address location="http://localhost:9000/"/>
- </wsdl:port>
- </wsdl:service>
-
+<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+ <xsd:complexType name="loginrequesttype">
+ <xsd:sequence>
+ <xsd:element name="username" type="xsd:string"/>
+ <xsd:element name="password" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="loginresponsetype">
+ <xsd:sequence>
+ <xsd:element name="userid" type="xsd:int"/>
+ <xsd:element name="groupid" type="xsd:int"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+ <xsd:element name="login">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="login" type="fc:loginrequesttype"/>
+ <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="loginResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="login" type="fc:loginresponsetype"/>
+ <xsd:element name="password_temp" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="loginRequest">
+ <wsdl:part name="parameters" element="fc:login"/>
+ </wsdl:message>
+ <wsdl:message name="loginResponse">
+ <wsdl:part name="parameters" element="fc:loginResponse"/>
+ </wsdl:message>
+
+
+ <wsdl:portType name="Login">
+ <wsdl:operation name="login">
+ <wsdl:input message="fc:loginRequest"/>
+ <wsdl:output message="fc:loginResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Login" type="fc:Login">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="login">
+ <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="Login">
+ <wsdl:port binding="fc:Login" name="center">
+ <soap:address location="http://localhost:9000/"/>
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
\ No newline at end of file
Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml?rev=1201776&r1=1201775&r2=1201776&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml Mon Nov 14 16:30:48 2011
@@ -1,31 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jaxws:bindings wsdlLocation="cxf3105.wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
- http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
- <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
- <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
- <jaxb:property name="LoginRequest"/>
- </jaxb:bindings>
- <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
- <jaxb:property name="LoginResponse"/>
- </jaxb:bindings>
- <jaxb:bindings node="xs:element[@name='login']">
- <jaxb:class name="LoginRequest"/>
- </jaxb:bindings>
- </jaxws:bindings>
-
-
-
- <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
- <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
- <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
- </jaxws:bindings>
-
- <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
-</jaxws:bindings>
+<?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.
+-->
+<jaxws:bindings wsdlLocation="cxf3105.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+ http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
+ <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
+ <jaxb:property name="LoginRequest"/>
+ </jaxb:bindings>
+ <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
+ <jaxb:property name="LoginResponse"/>
+ </jaxb:bindings>
+ <jaxb:bindings node="xs:element[@name='login']">
+ <jaxb:class name="LoginRequest"/>
+ </jaxb:bindings>
+ </jaxws:bindings>
+
+
+
+ <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
+ </jaxws:bindings>
+
+ <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
+</jaxws:bindings>
+