You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jl...@apache.org on 2007/10/25 19:10:56 UTC
svn commit: r588283 [16/18] - in /incubator/cxf/branches/jliu: ./ api/
api/src/main/java/org/apache/cxf/databinding/
api/src/main/java/org/apache/cxf/io/
api/src/main/java/org/apache/cxf/message/
api/src/main/java/org/apache/cxf/phase/ api/src/main/jav...
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl Thu Oct 25 10:09:20 2007
@@ -1,30 +1,12 @@
-<!--
- 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.
--->
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HelloWrappedService" targetNamespace="http://cxf.com/" xmlns:ns1="http://cxf.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="HelloWrappedService" targetNamespace="http://cxf.com/" xmlns:tns="http://cxf.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.com/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.com/">
-<xsd:element name="sayHiWithoutWrapperClass" type="sayHiWithoutWrapperClass"/>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.com/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.com/">
+<xsd:element name="sayHiWithoutWrapperClass" type="tns:sayHiWithoutWrapperClass"/>
<xsd:complexType name="sayHiWithoutWrapperClass">
<xsd:sequence/>
</xsd:complexType>
-<xsd:element name="sayHiWithoutWrapperClassResponse" type="sayHiWithoutWrapperClassResponse"/>
+<xsd:element name="sayHiWithoutWrapperClassResponse" type="tns:sayHiWithoutWrapperClassResponse"/>
<xsd:complexType name="sayHiWithoutWrapperClassResponse">
<xsd:sequence>
<xsd:element minOccurs="0" name="return" type="xsd:string"/>
@@ -33,22 +15,22 @@
</xsd:schema>
</wsdl:types>
<wsdl:message name="sayHiWithoutWrapperClass">
- <wsdl:part name="parameters" element="ns1:sayHiWithoutWrapperClass">
+ <wsdl:part name="parameters" element="tns:sayHiWithoutWrapperClass">
</wsdl:part>
</wsdl:message>
<wsdl:message name="sayHiWithoutWrapperClassResponse">
- <wsdl:part name="result" element="ns1:sayHiWithoutWrapperClassResponse">
+ <wsdl:part name="parameters" element="tns:sayHiWithoutWrapperClassResponse">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Hello">
<wsdl:operation name="sayHiWithoutWrapperClass">
- <wsdl:input name="sayHiWithoutWrapperClass" message="ns1:sayHiWithoutWrapperClass">
+ <wsdl:input name="sayHiWithoutWrapperClass" message="tns:sayHiWithoutWrapperClass">
</wsdl:input>
- <wsdl:output name="sayHiWithoutWrapperClassResponse" message="ns1:sayHiWithoutWrapperClassResponse">
+ <wsdl:output name="sayHiWithoutWrapperClassResponse" message="tns:sayHiWithoutWrapperClassResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="HelloWrappedServiceSoapBinding" type="ns1:Hello">
+ <wsdl:binding name="HelloWrappedServiceSoapBinding" type="tns:Hello">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="sayHiWithoutWrapperClass">
<soap:operation soapAction="" style="document"/>
@@ -61,7 +43,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HelloWrappedService">
- <wsdl:port name="HelloPort" binding="ns1:HelloWrappedServiceSoapBinding">
+ <wsdl:port name="HelloPort" binding="tns:HelloWrappedServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl Thu Oct 25 10:09:20 2007
@@ -1,58 +1,38 @@
<?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 name="StockWrappedService" targetNamespace="http://cxf.com/" xmlns:ns1="http://cxf.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="StockWrappedService" targetNamespace="http://cxf.com/" xmlns:tns="http://cxf.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.com/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.com/">
-<xs:element name="getPrice">
-<xs:complexType>
-<xs:sequence>
-<xs:element name="responseType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="getPriceResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element name="responseType" type="xs:float"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
+ <xs:element name="getPrice" type="getPrice"/>
+ <xs:element name="getPriceResponse" type="getPriceResponse"/>
+ <xs:complexType name="getPrice">
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getPriceResponse">
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:float"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="getPrice">
- <wsdl:part name="parameters" element="ns1:getPrice">
+ <wsdl:part name="parameters" element="tns:getPrice">
</wsdl:part>
</wsdl:message>
<wsdl:message name="getPriceResponse">
- <wsdl:part name="result" element="ns1:getPriceResponse">
+ <wsdl:part name="parameters" element="tns:getPriceResponse">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="StockWrapped">
<wsdl:operation name="getPrice">
- <wsdl:input name="getPrice" message="ns1:getPrice">
+ <wsdl:input name="getPrice" message="tns:getPrice">
</wsdl:input>
- <wsdl:output name="getPriceResponse" message="ns1:getPriceResponse">
+ <wsdl:output name="getPriceResponse" message="tns:getPriceResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="StockWrappedServiceSoapBinding" type="ns1:StockWrapped">
+ <wsdl:binding name="StockWrappedServiceSoapBinding" type="tns:StockWrapped">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="getPrice">
<soap:operation soapAction="" style="document"/>
@@ -65,7 +45,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="StockWrappedService">
- <wsdl:port name="StockWrappedPort" binding="ns1:StockWrappedServiceSoapBinding">
+ <wsdl:port name="StockWrappedPort" binding="tns:StockWrappedServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl Thu Oct 25 10:09:20 2007
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<wsdl:definitions name="GreeterAsyncService" targetNamespace="http://apache.org/hello_world_async_soap_http" xmlns:ns1="http://apache.org/hello_world_async_soap_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_async_soap_http/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterAsyncService" targetNamespace="http://apache.org/hello_world_async_soap_http" xmlns:tns="http://apache.org/hello_world_async_soap_http" xmlns:ns1="http://apache.org/hello_world_async_soap_http/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_async_soap_http/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_async_soap_http/types">
<xs:element name="greetMeSometime">
@@ -37,22 +37,22 @@
</xs:schema>
</wsdl:types>
<wsdl:message name="greetMeSometime">
- <wsdl:part name="parameters" element="ns2:greetMeSometime">
+ <wsdl:part name="parameters" element="ns1:greetMeSometime">
</wsdl:part>
</wsdl:message>
<wsdl:message name="greetMeSometimeResponse">
- <wsdl:part name="result" element="ns2:greetMeSometimeResponse">
+ <wsdl:part name="parameters" element="ns1:greetMeSometimeResponse">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="GreeterAsync">
<wsdl:operation name="greetMeSometime">
- <wsdl:input name="greetMeSometime" message="ns1:greetMeSometime">
+ <wsdl:input name="greetMeSometime" message="tns:greetMeSometime">
</wsdl:input>
- <wsdl:output name="greetMeSometimeResponse" message="ns1:greetMeSometimeResponse">
+ <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="GreeterAsyncServiceSoapBinding" type="ns1:GreeterAsync">
+ <wsdl:binding name="GreeterAsyncServiceSoapBinding" type="tns:GreeterAsync">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="greetMeSometime">
<soap:operation soapAction="" style="document"/>
@@ -65,7 +65,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="GreeterAsyncService">
- <wsdl:port name="GreeterAsyncPort" binding="ns1:GreeterAsyncServiceSoapBinding">
+ <wsdl:port name="GreeterAsyncPort" binding="tns:GreeterAsyncServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl Thu Oct 25 10:09:20 2007
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_doc_lit" xmlns:ns1="http://apache.org/hello_world_doc_lit" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_doc_lit/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_doc_lit" xmlns:tns="http://apache.org/hello_world_doc_lit" xmlns:ns1="http://apache.org/hello_world_doc_lit/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_doc_lit/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_doc_lit/types">
<xs:element name="faultDetail">
@@ -67,65 +67,65 @@
</xs:element>
</xs:schema>
</wsdl:types>
- <wsdl:message name="PingMeFault">
- <wsdl:part name="fault" element="ns2:faultDetail">
- </wsdl:part>
- </wsdl:message>
<wsdl:message name="sayHiResponse">
- <wsdl:part name="result" element="ns2:sayHiResponse">
+ <wsdl:part name="parameters" element="ns1:sayHiResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="greetMeResponse">
- <wsdl:part name="result" element="ns2:greetMeResponse">
+ <wsdl:part name="parameters" element="ns1:greetMeResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="greetMe">
- <wsdl:part name="parameters" element="ns2:greetMe">
+ <wsdl:part name="parameters" element="ns1:greetMe">
</wsdl:part>
</wsdl:message>
<wsdl:message name="pingMe">
- <wsdl:part name="parameters" element="ns2:pingMe">
+ <wsdl:part name="parameters" element="ns1:pingMe">
</wsdl:part>
</wsdl:message>
<wsdl:message name="pingMeResponse">
- <wsdl:part name="result" element="ns2:pingMeResponse">
+ <wsdl:part name="parameters" element="ns1:pingMeResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="sayHi">
- <wsdl:part name="parameters" element="ns2:sayHi">
+ <wsdl:part name="parameters" element="ns1:sayHi">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="PingMeFault">
+ <wsdl:part name="PingMeFault" element="ns1:faultDetail">
</wsdl:part>
</wsdl:message>
<wsdl:message name="greetMeOneWay">
- <wsdl:part name="parameters" element="ns2:greetMeOneWay">
+ <wsdl:part name="parameters" element="ns1:greetMeOneWay">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Greeter">
<wsdl:operation name="greetMe">
- <wsdl:input name="greetMe" message="ns1:greetMe">
+ <wsdl:input name="greetMe" message="tns:greetMe">
</wsdl:input>
- <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+ <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="greetMeOneWay">
- <wsdl:input name="greetMeOneWay" message="ns1:greetMeOneWay">
+ <wsdl:input name="greetMeOneWay" message="tns:greetMeOneWay">
</wsdl:input>
</wsdl:operation>
<wsdl:operation name="sayHi">
- <wsdl:input name="sayHi" message="ns1:sayHi">
+ <wsdl:input name="sayHi" message="tns:sayHi">
</wsdl:input>
- <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+ <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="pingMe">
- <wsdl:input name="pingMe" message="ns1:pingMe">
+ <wsdl:input name="pingMe" message="tns:pingMe">
</wsdl:input>
- <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
+ <wsdl:output name="pingMeResponse" message="tns:pingMeResponse">
</wsdl:output>
- <wsdl:fault name="PingMeFault" message="ns1:PingMeFault">
+ <wsdl:fault name="PingMeFault" message="tns:PingMeFault">
</wsdl:fault>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+ <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="greetMe">
<soap:operation soapAction="" style="document"/>
@@ -165,7 +165,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="GreeterService">
- <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+ <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl Thu Oct 25 10:09:20 2007
@@ -1,60 +1,42 @@
<?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 name="HolderServiceService" targetNamespace="http://holder.fortest.tools.cxf.apache.org/" xmlns:ns1="http://holder.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="HolderServiceService" targetNamespace="http://holder.fortest.tools.cxf.apache.org/" xmlns:tns="http://holder.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://holder.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://holder.fortest.tools.cxf.apache.org/">
-<xsd:element name="echo" type="echo"/>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://holder.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://holder.fortest.tools.cxf.apache.org/">
+<xsd:element name="echo" type="tns:echo"/>
<xsd:complexType name="echo">
<xsd:sequence>
<xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
<xsd:element minOccurs="0" name="arg1" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
-<xsd:element name="echoResponse" type="echoResponse"/>
+<xsd:element name="echoResponse" type="tns:echoResponse"/>
<xsd:complexType name="echoResponse">
<xsd:sequence>
<xsd:element minOccurs="0" name="return" type="xsd:string"/>
<xsd:element minOccurs="0" name="return1" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
-<xsd:element name="echo3" type="echo3"/>
+<xsd:element name="echo3" type="tns:echo3"/>
<xsd:complexType name="echo3">
<xsd:sequence>
<xsd:element minOccurs="0" name="arg1" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="header" type="xsd:string"/>
-<xsd:element name="echo3Response" type="echo3Response"/>
+<xsd:element name="echo3Response" type="tns:echo3Response"/>
<xsd:complexType name="echo3Response">
<xsd:sequence>
<xsd:element minOccurs="0" name="return" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
-<xsd:element name="echo2" type="echo2"/>
+<xsd:element name="echo2" type="tns:echo2"/>
<xsd:complexType name="echo2">
<xsd:sequence>
<xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
<xsd:element minOccurs="0" name="arg1" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
-<xsd:element name="echo2Response" type="echo2Response"/>
+<xsd:element name="echo2Response" type="tns:echo2Response"/>
<xsd:complexType name="echo2Response">
<xsd:sequence>
<xsd:element minOccurs="0" name="return" type="xsd:string"/>
@@ -64,54 +46,54 @@
</xsd:schema>
</wsdl:types>
<wsdl:message name="echo">
- <wsdl:part name="parameters" element="ns1:echo">
+ <wsdl:part name="parameters" element="tns:echo">
</wsdl:part>
</wsdl:message>
<wsdl:message name="echo3Response">
- <wsdl:part name="result" element="ns1:echo3Response">
+ <wsdl:part name="parameters" element="tns:echo3Response">
</wsdl:part>
- <wsdl:part name="header" element="ns1:header">
+ <wsdl:part name="header" element="tns:header">
</wsdl:part>
</wsdl:message>
<wsdl:message name="echo2">
- <wsdl:part name="parameters" element="ns1:echo2">
+ <wsdl:part name="parameters" element="tns:echo2">
</wsdl:part>
</wsdl:message>
<wsdl:message name="echoResponse">
- <wsdl:part name="result" element="ns1:echoResponse">
+ <wsdl:part name="parameters" element="tns:echoResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="echo2Response">
- <wsdl:part name="result" element="ns1:echo2Response">
+ <wsdl:part name="parameters" element="tns:echo2Response">
</wsdl:part>
</wsdl:message>
<wsdl:message name="echo3">
- <wsdl:part name="parameters" element="ns1:echo3">
+ <wsdl:part name="parameters" element="tns:echo3">
</wsdl:part>
- <wsdl:part name="header" element="ns1:header">
+ <wsdl:part name="header" element="tns:header">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="HolderService">
<wsdl:operation name="echo">
- <wsdl:input name="echo" message="ns1:echo">
+ <wsdl:input name="echo" message="tns:echo">
</wsdl:input>
- <wsdl:output name="echoResponse" message="ns1:echoResponse">
+ <wsdl:output name="echoResponse" message="tns:echoResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="echo3">
- <wsdl:input name="echo3" message="ns1:echo3">
+ <wsdl:input name="echo3" message="tns:echo3">
</wsdl:input>
- <wsdl:output name="echo3Response" message="ns1:echo3Response">
+ <wsdl:output name="echo3Response" message="tns:echo3Response">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="echo2">
- <wsdl:input name="echo2" message="ns1:echo2">
+ <wsdl:input name="echo2" message="tns:echo2">
</wsdl:input>
- <wsdl:output name="echo2Response" message="ns1:echo2Response">
+ <wsdl:output name="echo2Response" message="tns:echo2Response">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="HolderServiceServiceSoapBinding" type="ns1:HolderService">
+ <wsdl:binding name="HolderServiceServiceSoapBinding" type="tns:HolderService">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="echo">
<soap:operation soapAction="" style="document"/>
@@ -134,19 +116,19 @@
<wsdl:operation name="echo3">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="echo3">
- <soap:header message="ns1:echo3" part="header" use="literal">
+ <soap:header message="tns:echo3" part="header" use="literal">
</soap:header>
<soap:body parts="parameters" use="literal"/>
</wsdl:input>
<wsdl:output name="echo3Response">
- <soap:header message="ns1:echo3Response" part="header" use="literal">
+ <soap:header message="tns:echo3Response" part="header" use="literal">
</soap:header>
- <soap:body parts="result" use="literal"/>
+ <soap:body parts="parameters" use="literal"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HolderServiceService">
- <wsdl:port name="HolderServicePort" binding="ns1:HolderServiceServiceSoapBinding">
+ <wsdl:port name="HolderServicePort" binding="tns:HolderServiceServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl Thu Oct 25 10:09:20 2007
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<wsdl:definitions name="GreeterRPCLitService" targetNamespace="http://apache.org/hello_world_rpclit/javato" xmlns:ns1="http://apache.org/hello_world_rpclit/javato" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_rpclit/javato/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterRPCLitService" targetNamespace="http://apache.org/hello_world_rpclit/javato" xmlns:tns="http://apache.org/hello_world_rpclit/javato" xmlns:ns1="http://apache.org/hello_world_rpclit/javato/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_rpclit/javato/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_rpclit/javato/types">
<xs:complexType name="myComplexStruct">
@@ -29,8 +29,8 @@
</xs:complexType>
</xs:schema>
</wsdl:types>
- <wsdl:message name="greetMeResponse">
- <wsdl:part name="out" type="xsd:string">
+ <wsdl:message name="sendReceiveData">
+ <wsdl:part name="in" type="ns1:myComplexStruct">
</wsdl:part>
</wsdl:message>
<wsdl:message name="sayHiResponse">
@@ -39,12 +39,12 @@
</wsdl:message>
<wsdl:message name="sayHi">
</wsdl:message>
- <wsdl:message name="sendReceiveDataResponse">
- <wsdl:part name="out" type="ns2:myComplexStruct">
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part name="out" type="xsd:string">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="sendReceiveData">
- <wsdl:part name="in" type="ns2:myComplexStruct">
+ <wsdl:message name="sendReceiveDataResponse">
+ <wsdl:part name="out" type="ns1:myComplexStruct">
</wsdl:part>
</wsdl:message>
<wsdl:message name="greetMe">
@@ -52,57 +52,57 @@
</wsdl:part>
</wsdl:message>
<wsdl:portType name="GreeterRPCLit">
- <wsdl:operation name="sendReceiveData">
- <wsdl:input name="sendReceiveData" message="ns1:sendReceiveData">
+ <wsdl:operation name="sayHi">
+ <wsdl:input name="sayHi" message="tns:sayHi">
</wsdl:input>
- <wsdl:output name="sendReceiveDataResponse" message="ns1:sendReceiveDataResponse">
+ <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="greetMe">
- <wsdl:input name="greetMe" message="ns1:greetMe">
+ <wsdl:operation name="sendReceiveData">
+ <wsdl:input name="sendReceiveData" message="tns:sendReceiveData">
</wsdl:input>
- <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+ <wsdl:output name="sendReceiveDataResponse" message="tns:sendReceiveDataResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="sayHi">
- <wsdl:input name="sayHi" message="ns1:sayHi">
+ <wsdl:operation name="greetMe">
+ <wsdl:input name="greetMe" message="tns:greetMe">
</wsdl:input>
- <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+ <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="GreeterRPCLitServiceSoapBinding" type="ns1:GreeterRPCLit">
+ <wsdl:binding name="GreeterRPCLitServiceSoapBinding" type="tns:GreeterRPCLit">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sendReceiveData">
+ <wsdl:operation name="sayHi">
<soap:operation soapAction="" style="rpc"/>
- <wsdl:input name="sendReceiveData">
+ <wsdl:input name="sayHi">
<soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
</wsdl:input>
- <wsdl:output name="sendReceiveDataResponse">
+ <wsdl:output name="sayHiResponse">
<soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="greetMe">
+ <wsdl:operation name="sendReceiveData">
<soap:operation soapAction="" style="rpc"/>
- <wsdl:input name="greetMe">
+ <wsdl:input name="sendReceiveData">
<soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
</wsdl:input>
- <wsdl:output name="greetMeResponse">
+ <wsdl:output name="sendReceiveDataResponse">
<soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="sayHi">
+ <wsdl:operation name="greetMe">
<soap:operation soapAction="" style="rpc"/>
- <wsdl:input name="sayHi">
+ <wsdl:input name="greetMe">
<soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
</wsdl:input>
- <wsdl:output name="sayHiResponse">
+ <wsdl:output name="greetMeResponse">
<soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="GreeterRPCLitService">
- <wsdl:port name="GreeterRPCLitPort" binding="ns1:GreeterRPCLitServiceSoapBinding">
+ <wsdl:port name="GreeterRPCLitPort" binding="tns:GreeterRPCLitServiceSoapBinding">
<soap:address location="http://localhost"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl Thu Oct 25 10:09:20 2007
@@ -1,23 +1,5 @@
<?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 name="EchoService" targetNamespace="http://cxf.apache.org/echotest" xmlns:ns1="http://cxf.apache.org/echotest" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="EchoService" targetNamespace="http://cxf.apache.org/echotest" xmlns:tns="http://cxf.apache.org/echotest" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:message name="echoStringResponse">
<wsdl:part name="return" type="xsd:string">
</wsdl:part>
@@ -28,13 +10,13 @@
</wsdl:message>
<wsdl:portType name="Echo">
<wsdl:operation name="echoString">
- <wsdl:input name="echoString" message="ns1:echoString">
+ <wsdl:input name="echoString" message="tns:echoString">
</wsdl:input>
- <wsdl:output name="echoStringResponse" message="ns1:echoStringResponse">
+ <wsdl:output name="echoStringResponse" message="tns:echoStringResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="EchoServiceSoapBinding" type="ns1:Echo">
+ <wsdl:binding name="EchoServiceSoapBinding" type="tns:Echo">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="echoString">
<soap:operation soapAction="" style="rpc"/>
@@ -47,7 +29,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="EchoService">
- <wsdl:port name="EchoPort" binding="ns1:EchoServiceSoapBinding">
+ <wsdl:port name="EchoPort" binding="tns:EchoServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl Thu Oct 25 10:09:20 2007
@@ -1,25 +1,7 @@
<?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 name="GreeterService" targetNamespace="http://cxf.apache.org/" xmlns:ns1="http://cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://jaxb.dev.java.net/array" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterService" targetNamespace="http://cxf.apache.org/" xmlns:tns="http://cxf.apache.org/" xmlns:ns1="http://jaxb.dev.java.net/array" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://jaxb.dev.java.net/array" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://jaxb.dev.java.net/array">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://jaxb.dev.java.net/array" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://jaxb.dev.java.net/array">
<xs:complexType final="#all" name="stringArray">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="item" nillable="true" type="xs:string"/>
@@ -28,22 +10,22 @@
</xs:schema>
</wsdl:types>
<wsdl:message name="echoStringArrayResponse">
- <wsdl:part name="return" type="ns2:stringArray">
+ <wsdl:part name="return" type="ns1:stringArray">
</wsdl:part>
</wsdl:message>
<wsdl:message name="echoStringArray">
- <wsdl:part name="arg0" type="ns2:stringArray">
+ <wsdl:part name="arg0" type="ns1:stringArray">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Hello">
<wsdl:operation name="echoStringArray">
- <wsdl:input name="echoStringArray" message="ns1:echoStringArray">
+ <wsdl:input name="echoStringArray" message="tns:echoStringArray">
</wsdl:input>
- <wsdl:output name="echoStringArrayResponse" message="ns1:echoStringArrayResponse">
+ <wsdl:output name="echoStringArrayResponse" message="tns:echoStringArrayResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Hello">
+ <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Hello">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="echoStringArray">
<soap:operation soapAction="" style="rpc"/>
@@ -56,7 +38,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="GreeterService">
- <wsdl:port name="HelloPort" binding="ns1:GreeterServiceSoapBinding">
+ <wsdl:port name="HelloPort" binding="tns:GreeterServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl Thu Oct 25 10:09:20 2007
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<wsdl:definitions name="HeaderTesterService" targetNamespace="http://apache.org/samples/headers" xmlns:ns1="http://apache.org/samples/headers" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="HeaderTesterService" targetNamespace="http://apache.org/samples/headers" xmlns:tns="http://apache.org/samples/headers" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/samples/headers" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/samples/headers">
<xs:element name="SOAPHeaderInfo" nillable="true" type="tns:SOAPHeaderData"/>
@@ -72,58 +72,58 @@
</xs:schema>
</wsdl:types>
<wsdl:message name="inHeaderResponse">
- <wsdl:part name="the_response" element="ns1:inHeaderResponse">
+ <wsdl:part name="the_response" element="tns:inHeaderResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="outHeader">
- <wsdl:part name="me" element="ns1:outHeader">
+ <wsdl:part name="me" element="tns:outHeader">
</wsdl:part>
</wsdl:message>
<wsdl:message name="outHeaderResponse">
- <wsdl:part name="the_response" element="ns1:outHeaderResponse">
+ <wsdl:part name="the_response" element="tns:outHeaderResponse">
</wsdl:part>
- <wsdl:part name="header_info" element="ns1:SOAPHeaderInfo">
+ <wsdl:part name="header_info" element="tns:SOAPHeaderInfo">
</wsdl:part>
</wsdl:message>
<wsdl:message name="inoutHeader">
- <wsdl:part name="me" element="ns1:inoutHeader">
+ <wsdl:part name="me" element="tns:inoutHeader">
</wsdl:part>
- <wsdl:part name="header_info" element="ns1:SOAPHeaderInfo">
+ <wsdl:part name="header_info" element="tns:SOAPHeaderInfo">
</wsdl:part>
</wsdl:message>
<wsdl:message name="inoutHeaderResponse">
- <wsdl:part name="the_response" element="ns1:inoutHeaderResponse">
+ <wsdl:part name="the_response" element="tns:inoutHeaderResponse">
</wsdl:part>
- <wsdl:part name="header_info" element="ns1:SOAPHeaderInfo">
+ <wsdl:part name="header_info" element="tns:SOAPHeaderInfo">
</wsdl:part>
</wsdl:message>
<wsdl:message name="inHeader">
- <wsdl:part name="me" element="ns1:inHeader">
+ <wsdl:part name="me" element="tns:inHeader">
</wsdl:part>
- <wsdl:part name="header_info" element="ns1:SOAPHeaderInfo">
+ <wsdl:part name="header_info" element="tns:SOAPHeaderInfo">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="headerTester">
<wsdl:operation name="outHeader">
- <wsdl:input name="outHeader" message="ns1:outHeader">
+ <wsdl:input name="outHeader" message="tns:outHeader">
</wsdl:input>
- <wsdl:output name="outHeaderResponse" message="ns1:outHeaderResponse">
+ <wsdl:output name="outHeaderResponse" message="tns:outHeaderResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="inHeader">
- <wsdl:input name="inHeader" message="ns1:inHeader">
+ <wsdl:input name="inHeader" message="tns:inHeader">
</wsdl:input>
- <wsdl:output name="inHeaderResponse" message="ns1:inHeaderResponse">
+ <wsdl:output name="inHeaderResponse" message="tns:inHeaderResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="inoutHeader">
- <wsdl:input name="inoutHeader" message="ns1:inoutHeader">
+ <wsdl:input name="inoutHeader" message="tns:inoutHeader">
</wsdl:input>
- <wsdl:output name="inoutHeaderResponse" message="ns1:inoutHeaderResponse">
+ <wsdl:output name="inoutHeaderResponse" message="tns:inoutHeaderResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="HeaderTesterServiceSoapBinding" type="ns1:headerTester">
+ <wsdl:binding name="HeaderTesterServiceSoapBinding" type="tns:headerTester">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="outHeader">
<soap:operation soapAction="" style="document"/>
@@ -131,7 +131,7 @@
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output name="outHeaderResponse">
- <soap:header message="ns1:outHeaderResponse" part="header_info" use="literal">
+ <soap:header message="tns:outHeaderResponse" part="header_info" use="literal">
</soap:header>
<soap:body parts="the_response" use="literal"/>
</wsdl:output>
@@ -139,7 +139,7 @@
<wsdl:operation name="inHeader">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="inHeader">
- <soap:header message="ns1:inHeader" part="header_info" use="literal">
+ <soap:header message="tns:inHeader" part="header_info" use="literal">
</soap:header>
<soap:body parts="me" use="literal"/>
</wsdl:input>
@@ -150,19 +150,19 @@
<wsdl:operation name="inoutHeader">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="inoutHeader">
- <soap:header message="ns1:inoutHeader" part="header_info" use="literal">
+ <soap:header message="tns:inoutHeader" part="header_info" use="literal">
</soap:header>
<soap:body parts="me" use="literal"/>
</wsdl:input>
<wsdl:output name="inoutHeaderResponse">
- <soap:header message="ns1:inoutHeaderResponse" part="header_info" use="literal">
+ <soap:header message="tns:inoutHeaderResponse" part="header_info" use="literal">
</soap:header>
<soap:body parts="the_response" use="literal"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HeaderTesterService">
- <wsdl:port name="headerTesterPort" binding="ns1:HeaderTesterServiceSoapBinding">
+ <wsdl:port name="headerTesterPort" binding="tns:HeaderTesterServiceSoapBinding">
<soap:address location="http://localhost:9090"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl Thu Oct 25 10:09:20 2007
@@ -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
@@ -17,44 +17,44 @@
specific language governing permissions and limitations
under the License.
-->
-<wsdl:definitions name="StockService" targetNamespace="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docbare.classnoanno.fortest.tools.cxf.apache.org/">
- <xsd:element name="getPrice" nillable="true" type="xsd:string"/>
- <xsd:element name="getPriceResponse" nillable="true" type="xsd:float"/>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="getPriceResponse">
- <wsdl:part name="getPriceResponse" element="ns1:getPriceResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getPrice">
- <wsdl:part name="getPrice" element="ns1:getPrice">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="Stock">
- <wsdl:operation name="getPrice">
- <wsdl:input name="getPrice" message="ns1:getPrice">
- </wsdl:input>
- <wsdl:output name="getPriceResponse" message="ns1:getPriceResponse">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="StockServiceSoapBinding" type="ns1:Stock">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getPrice">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="getPrice">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getPriceResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="StockService">
- <wsdl:port name="StockPort" binding="ns1:StockServiceSoapBinding">
- <soap:address location="http://localhost"/>
- </wsdl:port>
- </wsdl:service>
+<wsdl:definitions name="StockService" targetNamespace="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" xmlns:tns="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://docbare.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docbare.classnoanno.fortest.tools.cxf.apache.org/">
+<xsd:element name="getPrice" nillable="true" type="xsd:string"/>
+<xsd:element name="getPriceResponse" nillable="true" type="xsd:float"/>
+</xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="getPriceResponse">
+ <wsdl:part name="getPriceResponse" element="tns:getPriceResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getPrice">
+ <wsdl:part name="getPrice" element="tns:getPrice">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Stock">
+ <wsdl:operation name="getPrice">
+ <wsdl:input name="getPrice" message="tns:getPrice">
+ </wsdl:input>
+ <wsdl:output name="getPriceResponse" message="tns:getPriceResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="StockServiceSoapBinding" type="tns:Stock">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getPrice">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="getPrice">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getPriceResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="StockService">
+ <wsdl:port name="StockPort" binding="tns:StockServiceSoapBinding">
+ <soap:address location="http://localhost"/>
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl Thu Oct 25 10:09:20 2007
@@ -1,23 +1,5 @@
<?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 name="StockService" targetNamespace="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="StockService" targetNamespace="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:tns="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:message name="getPrice">
<wsdl:part name="arg0" type="xsd:string">
</wsdl:part>
@@ -28,13 +10,13 @@
</wsdl:message>
<wsdl:portType name="Stock">
<wsdl:operation name="getPrice">
- <wsdl:input name="getPrice" message="ns1:getPrice">
+ <wsdl:input name="getPrice" message="tns:getPrice">
</wsdl:input>
- <wsdl:output name="getPriceResponse" message="ns1:getPriceResponse">
+ <wsdl:output name="getPriceResponse" message="tns:getPriceResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="StockServiceSoapBinding" type="ns1:Stock">
+ <wsdl:binding name="StockServiceSoapBinding" type="tns:Stock">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="getPrice">
<soap:operation soapAction="" style="rpc"/>
@@ -47,7 +29,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="StockService">
- <wsdl:port name="StockPort" binding="ns1:StockServiceSoapBinding">
+ <wsdl:port name="StockPort" binding="tns:StockServiceSoapBinding">
<soap:address location="http://localhost"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl Thu Oct 25 10:09:20 2007
@@ -1,3 +1,4 @@
+<?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
@@ -16,17 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="StockService" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="StockService" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:tns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
-<xsd:element name="getPrice" type="getPrice"/>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
+<xsd:element name="getPrice" type="tns:getPrice"/>
<xsd:complexType name="getPrice">
<xsd:sequence>
<xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
-<xsd:element name="getPriceResponse" type="getPriceResponse"/>
+<xsd:element name="getPriceResponse" type="tns:getPriceResponse"/>
<xsd:complexType name="getPriceResponse">
<xsd:sequence>
<xsd:element name="return" type="xsd:float"/>
@@ -35,22 +35,22 @@
</xsd:schema>
</wsdl:types>
<wsdl:message name="getPriceResponse">
- <wsdl:part name="result" element="ns1:getPriceResponse">
+ <wsdl:part name="parameters" element="tns:getPriceResponse">
</wsdl:part>
</wsdl:message>
<wsdl:message name="getPrice">
- <wsdl:part name="parameters" element="ns1:getPrice">
+ <wsdl:part name="parameters" element="tns:getPrice">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Stock">
<wsdl:operation name="getPrice">
- <wsdl:input name="getPrice" message="ns1:getPrice">
+ <wsdl:input name="getPrice" message="tns:getPrice">
</wsdl:input>
- <wsdl:output name="getPriceResponse" message="ns1:getPriceResponse">
+ <wsdl:output name="getPriceResponse" message="tns:getPriceResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="StockServiceSoapBinding" type="ns1:Stock">
+ <wsdl:binding name="StockServiceSoapBinding" type="tns:Stock">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="getPrice">
<soap:operation soapAction="" style="document"/>
@@ -63,7 +63,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="StockService">
- <wsdl:port name="StockPort" binding="ns1:StockServiceSoapBinding">
+ <wsdl:port name="StockPort" binding="tns:StockServiceSoapBinding">
<soap:address location="http://localhost"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/cxf/branches/jliu/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (original)
+++ incubator/cxf/branches/jliu/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Thu Oct 25 10:09:20 2007
@@ -17,117 +17,117 @@
specific language governing permissions and limitations
under the License.
-->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/xml_bare"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:xformat="http://cxf.apache.org/bindings/xformat"
- xmlns:tns="http://apache.org/xml_bare"
- xmlns:x1="http://apache.org/xml_bare/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/xml_bare"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:xformat="http://cxf.apache.org/bindings/xformat"
+ xmlns:tns="http://apache.org/xml_bare"
+ xmlns:x1="http://apache.org/xml_bare/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
<wsdl:types>
- <schema targetNamespace="http://apache.org/xml_bare/types"
- xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
-
- <element name="responseType" type="xsd:string"/>
- <element name="requestType" type="xsd:string"/>
- <element name="myComplexStruct" type="x1:myComplexStructType"/>
-
- <complexType name="myComplexStructType">
- <sequence>
- <element name="elem1" type="xsd:string"/>
- <element name="elem2" type="xsd:string"/>
- <element name="elem3" type="xsd:int"/>
- </sequence>
- </complexType>
- </schema>
+ <schema targetNamespace="http://apache.org/xml_bare/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+
+ <element name="responseType" type="xsd:string"/>
+ <element name="requestType" type="xsd:string"/>
+ <element name="myComplexStruct" type="x1:myComplexStructType"/>
+
+ <complexType name="myComplexStructType">
+ <sequence>
+ <element name="elem1" type="xsd:string"/>
+ <element name="elem2" type="xsd:string"/>
+ <element name="elem3" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </schema>
</wsdl:types>
-
+
<wsdl:message name="sayHiRequest"/>
-
+
<wsdl:message name="sayHiResponse">
- <wsdl:part type="xsd:string" name="out"/>
+ <wsdl:part type="xsd:string" name="out"/>
</wsdl:message>
-
+
<wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:requestType" name="me"/>
+ <wsdl:part element="x1:requestType" name="me"/>
</wsdl:message>
-
+
<wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:responseType" name="theResponse"/>
+ <wsdl:part element="x1:responseType" name="theResponse"/>
</wsdl:message>
-
+
<wsdl:message name="sendReceiveDataRequest">
- <wsdl:part type="x1:myComplexStructType" name="in"/>
+ <wsdl:part type="x1:myComplexStructType" name="in"/>
</wsdl:message>
-
+
<wsdl:message name="sendReceiveDataResponse">
- <wsdl:part type="x1:myComplexStructType" name="out"/>
+ <wsdl:part type="x1:myComplexStructType" name="out"/>
</wsdl:message>
<wsdl:message name="multiParamPartRequest">
- <wsdl:part element="x1:requestType" name="in1"/>
- <wsdl:part element="x1:myComplexStruct" name="in2"/>
+ <wsdl:part element="x1:requestType" name="in1"/>
+ <wsdl:part element="x1:myComplexStruct" name="in2"/>
</wsdl:message>
-
+
<wsdl:message name="multiParamPartResponse">
- <wsdl:part element="x1:responseType" name="out1"/>
+ <wsdl:part element="x1:responseType" name="out1"/>
</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="sendReceiveData">
- <wsdl:input message="tns:sendReceiveDataRequest" name="SendReceiveDataRequest"/>
- <wsdl:output message="tns:sendReceiveDataResponse" name="SendReceiveDataResponse"/>
- </wsdl:operation>
- <wsdl:operation name="testMultiParamPart" parameterOrder="in2 in1">
- <wsdl:input message="tns:multiParamPartRequest" name="multiParamPartRequest"/>
- <wsdl:output message="tns:multiParamPartResponse" name="multiParamPartResponse"/>
- </wsdl:operation>
+ <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="sendReceiveData">
+ <wsdl:input message="tns:sendReceiveDataRequest" name="SendReceiveDataRequest"/>
+ <wsdl:output message="tns:sendReceiveDataResponse" name="SendReceiveDataResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="testMultiParamPart" parameterOrder="in2 in1">
+ <wsdl:input message="tns:multiParamPartRequest" name="multiParamPartRequest"/>
+ <wsdl:output message="tns:multiParamPartResponse" name="multiParamPartResponse"/>
+ </wsdl:operation>
</wsdl:portType>
-
+
<wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
- <xformat:binding/>
+ <xformat:binding/>
- <wsdl:operation name="sayHi">
- <wsdl:input>
- <xformat:body rootNode="tns:sayHi"/>
- </wsdl:input>
- <wsdl:output/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input/>
- <wsdl:output/>
- </wsdl:operation>
-
- <wsdl:operation name="sendReceiveData">
- <wsdl:input/>
- <wsdl:output/>
- </wsdl:operation>
-
- <wsdl:operation name="testMultiParamPart">
- <wsdl:input>
- <xformat:body rootNode="tns:multiParamRootReq"/>
- </wsdl:input>
- <wsdl:output/>
- </wsdl:operation>
+ <wsdl:operation name="sayHi">
+ <wsdl:input>
+ <xformat:body rootNode="tns:sayHi"/>
+ </wsdl:input>
+ <wsdl:output/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input/>
+ <wsdl:output/>
+ </wsdl:operation>
+
+ <wsdl:operation name="sendReceiveData">
+ <wsdl:input/>
+ <wsdl:output/>
+ </wsdl:operation>
+
+ <wsdl:operation name="testMultiParamPart">
+ <wsdl:input>
+ <xformat:body rootNode="tns:testMultiParamPart"/>
+ </wsdl:input>
+ <wsdl:output/>
+ </wsdl:operation>
</wsdl:binding>
-
+
<wsdl:service name="XMLService">
- <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
- <http:address location="http://localhost:9000/XMLService/XMLPort"/>
- </wsdl:port>
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
+ <http:address location="http://localhost:9000/XMLService/XMLPort"/>
+ </wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java (original)
+++ incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java Thu Oct 25 10:09:20 2007
@@ -77,6 +77,7 @@
//
baseURI = baseURI.replaceAll(" ", "%20");
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
+ schemaCol.setBaseUri(baseURI);
NodeList nodes = document.getElementsByTagNameNS(
WSDLConstants.NU_SCHEMA_XSD, "schema");
for (int x = 0; x < nodes.getLength(); x++) {
Modified: incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original)
+++ incubator/cxf/branches/jliu/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Thu Oct 25 10:09:20 2007
@@ -78,7 +78,7 @@
SoapBody outSoapBody = SOAPBindingUtil.getBindingOutputSOAPBody(bop);
if (inSoapBody != null && !StringUtils.isEmpty(inSoapBody.getNamespaceURI())
|| outSoapBody != null && !StringUtils.isEmpty(outSoapBody.getNamespaceURI())) {
- addErrorMessage("Violate WSI-BP-1.0 R2716 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2716") + "Operation '"
+ bop.getName() + "' soapBody MUST NOT have namespace attribute");
return false;
}
@@ -87,7 +87,7 @@
SoapHeader outSoapHeader = SOAPBindingUtil.getBindingOutputSOAPHeader(bop);
if (inSoapHeader != null && !StringUtils.isEmpty(inSoapHeader.getNamespaceURI())
|| outSoapHeader != null && !StringUtils.isEmpty(outSoapHeader.getNamespaceURI())) {
- addErrorMessage("Violate WSI-BP-1.0 R2716 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2716") + "Operation '"
+ bop.getName() + "' soapHeader MUST NOT have namespace attribute");
return false;
}
@@ -95,7 +95,7 @@
List<SoapFault> soapFaults = SOAPBindingUtil.getBindingOperationSoapFaults(bop);
for (SoapFault fault : soapFaults) {
if (!StringUtils.isEmpty(fault.getNamespaceURI())) {
- addErrorMessage("Violate WSI-BP-1.0 R2716 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2716") + "Operation '"
+ bop.getName() + "' soapFault MUST NOT have namespace attribute");
return false;
}
@@ -111,8 +111,9 @@
SoapBody outSoapBody = SOAPBindingUtil.getBindingOutputSOAPBody(bop);
if (inSoapBody != null && StringUtils.isEmpty(inSoapBody.getNamespaceURI())
|| outSoapBody != null && StringUtils.isEmpty(outSoapBody.getNamespaceURI())) {
- addErrorMessage("Violate WSI-BP-1.0 R2717 soapBody in the input/output of the binding operation '"
- + bop.getName() + "' MUST have namespace attribute");
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2717")
+ + "soapBody in the input/output of the binding operation '"
+ + bop.getName() + "' MUST have namespace attribute");
return false;
}
@@ -120,7 +121,7 @@
SoapHeader outSoapHeader = SOAPBindingUtil.getBindingOutputSOAPHeader(bop);
if (inSoapHeader != null && !StringUtils.isEmpty(inSoapHeader.getNamespaceURI())
|| outSoapHeader != null && !StringUtils.isEmpty(outSoapHeader.getNamespaceURI())) {
- addErrorMessage("Violate WSI-BP-1.0 R2726 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2726") + "Operation '"
+ bop.getName() + "' soapHeader MUST NOT have namespace attribute");
return false;
}
@@ -128,7 +129,7 @@
List<SoapFault> soapFaults = SOAPBindingUtil.getBindingOperationSoapFaults(bop);
for (SoapFault fault : soapFaults) {
if (!StringUtils.isEmpty(fault.getNamespaceURI())) {
- addErrorMessage("Violate WSI-BP-1.0 R2726 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2726") + "Operation '"
+ bop.getName() + "' soapFault MUST NOT have namespace attribute");
return false;
}
@@ -163,7 +164,7 @@
}
}
if (!isDefined) {
- addErrorMessage("Violate WSI-BP-1.0 R2201 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2201") + "Operation '"
+ operation.getName() + "' soapBody parts : "
+ partName + " not found in the message, wrong WSDL");
return false;
@@ -171,7 +172,7 @@
}
} else {
if (partsList.size() > 1) {
- addErrorMessage("Violate WSI-BP-1.0 R2210: operation '" + operation.getName()
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2210") + "Operation '" + operation.getName()
+ "' more than one part bound to body");
return false;
}
@@ -179,7 +180,7 @@
if (boundPartSize > 1) {
- addErrorMessage("Violate WSI-BP-1.0 R2201 operation '" + operation.getName()
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2201") + "Operation '" + operation.getName()
+ "' more than one part bound to body");
return false;
}
@@ -212,7 +213,7 @@
}
}
if (!isDefined) {
- addErrorMessage("Violate WSI-BP-1.0 R2201 operation '"
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2201") + "Operation '"
+ operation.getName() + "' soapBody parts : "
+ partName + " not found in the message, wrong WSDL");
return false;
@@ -221,14 +222,14 @@
}
} else {
if (wsdlHelper.getOutMessageParts(operation).size() > 1) {
- addErrorMessage("Violate WSI-BP-1.0 R2210: operation '" + operation.getName()
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2210") + "Operation '" + operation.getName()
+ "' more than one part bound to body");
return false;
}
}
if (boundPartSize > 1) {
- addErrorMessage("Violate WSI-BP-1.0 R2201 operation '" + operation.getName()
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2201") + "Operation '" + operation.getName()
+ "' more than one part bound to body");
return false;
}
@@ -247,10 +248,9 @@
BindingOperation bop = wsdlHelper.getBindingOperation(def, operation.getName());
Binding binding = wsdlHelper.getBinding(bop, def);
String bindingStyle = binding != null ? SOAPBindingUtil.getBindingStyle(binding) : "";
-
String style = "".equals(SOAPBindingUtil.getSOAPOperationStyle(bop))
? bindingStyle : SOAPBindingUtil.getSOAPOperationStyle(bop);
- if ("DOCUMENT".equalsIgnoreCase(style)) {
+ if ("DOCUMENT".equalsIgnoreCase(style) || "".equals(style)) {
boolean passed = checkR2201Input(operation, bop)
&& checkR2201Output(operation, bop)
&& checkR2716(bop);
@@ -300,7 +300,7 @@
for (Iterator ite3 = inMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
- if (style.equalsIgnoreCase(SOAPBinding.Style.RPC.name()) && p.getTypeName() == null
+ if (SOAPBinding.Style.RPC.name().equalsIgnoreCase(style) && p.getTypeName() == null
&& !isHeaderPart(bop, p)) {
addErrorMessage("An rpc-literal binding in a DESCRIPTION MUST refer, "
+ "in its soapbind:body element(s), only to "
@@ -309,7 +309,7 @@
return false;
}
- if (style.equalsIgnoreCase(SOAPBinding.Style.DOCUMENT.name())
+ if (SOAPBinding.Style.DOCUMENT.name().equalsIgnoreCase(style)
&& p.getElementName() == null) {
addErrorMessage("A document-literal binding in a DESCRIPTION MUST refer, "
+ "in each of its soapbind:body element(s),"
@@ -374,9 +374,9 @@
Collection<Part> parts = message.getParts().values();
for (Part part : parts) {
if (part.getElementName() == null) {
- addErrorMessage("Violate WSI-BP-1.0 R2205: In Message " + message.getQName()
- + ", part " + part.getName()
- + " must specify a 'element' attribute");
+ addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2205") + "In Message "
+ + message.getQName() + ", part " + part.getName()
+ + " must specify a 'element' attribute");
return false;
}
}
@@ -408,4 +408,7 @@
return false;
}
+ private static String getErrorPrefix(String ruleBroken) {
+ return ruleBroken + " violation: ";
+ }
}
Modified: incubator/cxf/branches/jliu/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original)
+++ incubator/cxf/branches/jliu/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Thu Oct 25 10:09:20 2007
@@ -220,6 +220,26 @@
}
}
+ @Test
+ public void testBPR2717() throws Exception {
+ try {
+ String[] args = new String[] {"-verbose",
+ getLocation("/validator_wsdl/cxf996.wsdl")};
+ WSDLValidator.main(args);
+ } catch (Exception e) {
+ assertTrue(getStdErr().indexOf("WSI-BP-1.0 R2717") == -1);
+ assertTrue(getStdErr().indexOf("WSI-BP-1.0 R2210") != -1);
+ }
+
+ try {
+ String[] args = new String[] {"-verbose",
+ getLocation("/validator_wsdl/bp2717.wsdl")};
+ WSDLValidator.main(args);
+ } catch (Exception e) {
+ assertTrue(getStdErr().indexOf("WSI-BP-1.0 R2717") != -1);
+ }
+ }
+
@Override
protected String getLocation(String wsdlFile) throws Exception {
Enumeration<URL> e = WSDLValidationTest.class.getClassLoader().getResources(wsdlFile);
Modified: incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Thu Oct 25 10:09:20 2007
@@ -564,7 +564,11 @@
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Found service validator : " + validatorClass);
}
- ServiceValidator validator = (ServiceValidator)Class.forName(validatorClass).newInstance();
+ ServiceValidator validator =
+ (ServiceValidator)Class.forName(validatorClass,
+ true,
+ Thread.currentThread()
+ .getContextClassLoader()).newInstance();
validators.add(validator);
} catch (Exception ex) {
LOG.log(Level.WARNING, "EXTENSION_ADD_FAILED_MSG", ex);
Modified: incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java (original)
+++ incubator/cxf/branches/jliu/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java Thu Oct 25 10:09:20 2007
@@ -52,7 +52,7 @@
}
}
- protected boolean isCollision(String packageName, String filename) throws ToolException {
+ protected boolean isCollision(String packageName, String filename) throws ToolException {
return isCollision(packageName, filename, ".java");
}
@@ -78,7 +78,7 @@
return null;
}
- fw = new FileWriterUtil((String)env.get(ToolConstants.CFG_OUTPUTDIR));
+ fw = new FileWriterUtil(getOutputDir());
try {
writer = fw.getWriter(packageName, filename + ext);
} catch (IOException ioe) {
@@ -103,6 +103,8 @@
protected void setCommonAttributes() {
setAttributes("currentdate", Calendar.getInstance().getTime());
setAttributes("version", Version.getCurrentVersion());
+ setAttributes("fullversion", Version.getCompleteVersionString());
+ setAttributes("name", Version.getName());
}
protected void clearAttributes() {
@@ -111,11 +113,14 @@
public void setEnvironment(ToolContext penv) {
this.env = penv;
-
}
public ToolContext getEnvironment() {
return this.env;
+ }
+
+ public String getOutputDir() {
+ return (String)env.get(ToolConstants.CFG_OUTPUTDIR);
}
public String getName() {
Modified: incubator/cxf/branches/jliu/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java (original)
+++ incubator/cxf/branches/jliu/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java Thu Oct 25 10:09:20 2007
@@ -20,7 +20,6 @@
package org.apache.cxf.tools.wsdlto.databinding.jaxb;
import com.sun.tools.xjc.api.ClassNameAllocator;
-
import org.apache.cxf.tools.util.ClassCollector;
public class ClassNameAllocatorImpl implements ClassNameAllocator {
@@ -41,6 +40,7 @@
if (isNameCollision(packageName, className)) {
fullClzName = className + TYPE_SUFFIX;
}
+
collector.addTypesClassName(packageName, className, packageName + "." + fullClzName);
return fullClzName;
}