cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r559909 [3/7] - in /incubator/cxf/trunk: benchmark/performance/soap_http_doc_lit/bin/ common/common/src/main/java/org/apache/cxf/configuration/spring/ common/common/src/main/java/org/apache/cxf/helpers/ rt/databinding/aegis/src/test/java/or...
Date Thu, 26 Jul 2007 17:57:59 GMT
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl Thu Jul 26 10:57:46 2007
@@ -1,54 +1,54 @@
-<?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="RPCHelloService" targetNamespace="http://cxf.apache.org/rpc" xmlns:ns1="http://cxf.apache.org/rpc" 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="helloResponse">
-    <wsdl:part name="return" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="hello">
-    <wsdl:part name="arg0" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="RPCHello">
-    <wsdl:operation name="hello">
-      <wsdl:input name="hello" message="ns1:hello">
-    </wsdl:input>
-      <wsdl:output name="helloResponse" message="ns1:helloResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="RPCHelloServiceSoapBinding" type="ns1:RPCHello">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="hello">
-      <soap:operation soapAction="" style="rpc"/>
-      <wsdl:input name="hello">
-        <soap:body use="literal" namespace="http://cxf.apache.org/rpc"/>
-      </wsdl:input>
-      <wsdl:output name="helloResponse">
-        <soap:body use="literal" namespace="http://cxf.apache.org/rpc"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="RPCHelloService">
-    <wsdl:port name="RPCHelloPort" binding="ns1:RPCHelloServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
+<?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="RPCHelloService" targetNamespace="http://cxf.apache.org/rpc" xmlns:ns1="http://cxf.apache.org/rpc" 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="helloResponse">
+    <wsdl:part name="return" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="hello">
+    <wsdl:part name="arg0" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="RPCHello">
+    <wsdl:operation name="hello">
+      <wsdl:input name="hello" message="ns1:hello">
+    </wsdl:input>
+      <wsdl:output name="helloResponse" message="ns1:helloResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="RPCHelloServiceSoapBinding" type="ns1:RPCHello">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="hello">
+      <soap:operation soapAction="" style="rpc"/>
+      <wsdl:input name="hello">
+        <soap:body use="literal" namespace="http://cxf.apache.org/rpc"/>
+      </wsdl:input>
+      <wsdl:output name="helloResponse">
+        <soap:body use="literal" namespace="http://cxf.apache.org/rpc"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="RPCHelloService">
+    <wsdl:port name="RPCHelloPort" binding="ns1:RPCHelloServiceSoapBinding">
+      <soap:address location="http://localhost:9090/hello"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Thu Jul 26 10:57:46 2007
@@ -1,142 +1,142 @@
-<?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://apache.org/xml_bare" xmlns:ns1="http://apache.org/xml_bare" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/xml_bare/types" 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/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/xml_bare/types">
-<xs:element name="myComplexStruct" nillable="true" type="tns:myComplexStructType"/>
-<xs:element name="requestType" nillable="true" type="xs:string"/>
-<xs:element name="responseType" nillable="true" type="xs:string"/>
-<xs:complexType name="myComplexStructType">
-<xs:sequence>
-<xs:element form="qualified" name="elem1" type="xs:string"/>
-<xs:element form="qualified" name="elem2" type="xs:string"/>
-<xs:element form="qualified" name="elem3" type="xs:int"/>
-</xs:sequence>
-</xs:complexType>
-</xs:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/xml_bare" xmlns:ns0="http://apache.org/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare">
-<xsd:import namespace="http://apache.org/xml_bare/types"/>
-<xsd:element name="out" nillable="true" type="xsd:string"/>
-<xsd:element name="in" nillable="true" type="ns0:myComplexStructType"/>
-</xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="sendReceiveData">
-    <wsdl:part name="in" element="ns1:in">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="testMultiParamPart">
-    <wsdl:part name="in2" element="ns2:myComplexStruct">
-    </wsdl:part>
-    <wsdl:part name="in1" element="ns2:requestType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="greetMe">
-    <wsdl:part name="me" element="ns2:requestType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHiResponse">
-    <wsdl:part name="out" element="ns1:out">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sendReceiveDataResponse">
-    <wsdl:part name="out" element="ns1:out">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="testMultiParamPartResponse">
-    <wsdl:part name="out1" element="ns2:responseType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHi">
-  </wsdl:message>
-  <wsdl:message name="greetMeResponse">
-    <wsdl:part name="theResponse" element="ns2:responseType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Greeter">
-    <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
-    </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="testMultiParamPart">
-      <wsdl:input name="testMultiParamPart" message="ns1:testMultiParamPart">
-    </wsdl:input>
-      <wsdl:output name="testMultiParamPartResponse" message="ns1:testMultiParamPartResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetMe">
-      <wsdl:input name="greetMe" message="ns1:greetMe">
-    </wsdl:input>
-      <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sendReceiveData">
-      <wsdl:input name="sendReceiveData" message="ns1:sendReceiveData">
-    </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse" message="ns1:sendReceiveDataResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="sayHi">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="sayHi">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sayHiResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="testMultiParamPart">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="testMultiParamPart">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="testMultiParamPartResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetMe">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="greetMe">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="greetMeResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sendReceiveData">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="sendReceiveData">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="GreeterService">
-    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
+<?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://apache.org/xml_bare" xmlns:ns1="http://apache.org/xml_bare" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/xml_bare/types" 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/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/xml_bare/types">
+<xs:element name="myComplexStruct" nillable="true" type="tns:myComplexStructType"/>
+<xs:element name="requestType" nillable="true" type="xs:string"/>
+<xs:element name="responseType" nillable="true" type="xs:string"/>
+<xs:complexType name="myComplexStructType">
+<xs:sequence>
+<xs:element form="qualified" name="elem1" type="xs:string"/>
+<xs:element form="qualified" name="elem2" type="xs:string"/>
+<xs:element form="qualified" name="elem3" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/xml_bare" xmlns:ns0="http://apache.org/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare">
+<xsd:import namespace="http://apache.org/xml_bare/types"/>
+<xsd:element name="out" nillable="true" type="xsd:string"/>
+<xsd:element name="in" nillable="true" type="ns0:myComplexStructType"/>
+</xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="sendReceiveData">
+    <wsdl:part name="in" element="ns1:in">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="testMultiParamPart">
+    <wsdl:part name="in2" element="ns2:myComplexStruct">
+    </wsdl:part>
+    <wsdl:part name="in1" element="ns2:requestType">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="greetMe">
+    <wsdl:part name="me" element="ns2:requestType">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sayHiResponse">
+    <wsdl:part name="out" element="ns1:out">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sendReceiveDataResponse">
+    <wsdl:part name="out" element="ns1:out">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="testMultiParamPartResponse">
+    <wsdl:part name="out1" element="ns2:responseType">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sayHi">
+  </wsdl:message>
+  <wsdl:message name="greetMeResponse">
+    <wsdl:part name="theResponse" element="ns2:responseType">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Greeter">
+    <wsdl:operation name="sayHi">
+      <wsdl:input name="sayHi" message="ns1:sayHi">
+    </wsdl:input>
+      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="testMultiParamPart">
+      <wsdl:input name="testMultiParamPart" message="ns1:testMultiParamPart">
+    </wsdl:input>
+      <wsdl:output name="testMultiParamPartResponse" message="ns1:testMultiParamPartResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="greetMe">
+      <wsdl:input name="greetMe" message="ns1:greetMe">
+    </wsdl:input>
+      <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="sendReceiveData">
+      <wsdl:input name="sendReceiveData" message="ns1:sendReceiveData">
+    </wsdl:input>
+      <wsdl:output name="sendReceiveDataResponse" message="ns1:sendReceiveDataResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="sayHi">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="sayHi">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="sayHiResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="testMultiParamPart">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="testMultiParamPart">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="testMultiParamPartResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="greetMe">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="greetMe">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="greetMeResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="sendReceiveData">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="sendReceiveData">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="sendReceiveDataResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="GreeterService">
+    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+      <soap:address location="http://localhost:9090/hello"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl Thu Jul 26 10:57:46 2007
@@ -1,109 +1,109 @@
-<?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="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: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">
-<xs:sequence>
-<xs:element form="qualified" name="elem1" type="xs:string"/>
-<xs:element form="qualified" name="elem2" type="xs:string"/>
-<xs:element form="qualified" name="elem3" type="xs:int"/>
-</xs:sequence>
-</xs:complexType>
-</xs:schema>
-  </wsdl:types>
-  <wsdl:message name="greetMeResponse">
-    <wsdl:part name="out" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHiResponse">
-    <wsdl:part name="out" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHi">
-  </wsdl:message>
-  <wsdl:message name="sendReceiveDataResponse">
-    <wsdl:part name="out" type="ns2:myComplexStruct">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sendReceiveData">
-    <wsdl:part name="in" type="ns2:myComplexStruct">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="greetMe">
-    <wsdl:part name="in" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="GreeterRPCLit">
-    <wsdl:operation name="sendReceiveData">
-      <wsdl:input name="sendReceiveData" message="ns1:sendReceiveData">
-    </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse" message="ns1:sendReceiveDataResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetMe">
-      <wsdl:input name="greetMe" message="ns1:greetMe">
-    </wsdl:input>
-      <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
-    </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="GreeterRPCLitServiceSoapBinding" type="ns1:GreeterRPCLit">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="sendReceiveData">
-      <soap:operation soapAction="" style="rpc"/>
-      <wsdl:input name="sendReceiveData">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
-      </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetMe">
-      <soap:operation soapAction="" style="rpc"/>
-      <wsdl:input name="greetMe">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
-      </wsdl:input>
-      <wsdl:output name="greetMeResponse">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sayHi">
-      <soap:operation soapAction="" style="rpc"/>
-      <wsdl:input name="sayHi">
-        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
-      </wsdl:input>
-      <wsdl:output name="sayHiResponse">
-        <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">
-      <soap:address location="http://localhost"/>
-    </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 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: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">
+<xs:sequence>
+<xs:element form="qualified" name="elem1" type="xs:string"/>
+<xs:element form="qualified" name="elem2" type="xs:string"/>
+<xs:element form="qualified" name="elem3" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+  </wsdl:types>
+  <wsdl:message name="greetMeResponse">
+    <wsdl:part name="out" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sayHiResponse">
+    <wsdl:part name="out" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sayHi">
+  </wsdl:message>
+  <wsdl:message name="sendReceiveDataResponse">
+    <wsdl:part name="out" type="ns2:myComplexStruct">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="sendReceiveData">
+    <wsdl:part name="in" type="ns2:myComplexStruct">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="greetMe">
+    <wsdl:part name="in" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="GreeterRPCLit">
+    <wsdl:operation name="sendReceiveData">
+      <wsdl:input name="sendReceiveData" message="ns1:sendReceiveData">
+    </wsdl:input>
+      <wsdl:output name="sendReceiveDataResponse" message="ns1:sendReceiveDataResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="greetMe">
+      <wsdl:input name="greetMe" message="ns1:greetMe">
+    </wsdl:input>
+      <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="sayHi">
+      <wsdl:input name="sayHi" message="ns1:sayHi">
+    </wsdl:input>
+      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="GreeterRPCLitServiceSoapBinding" type="ns1:GreeterRPCLit">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="sendReceiveData">
+      <soap:operation soapAction="" style="rpc"/>
+      <wsdl:input name="sendReceiveData">
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
+      </wsdl:input>
+      <wsdl:output name="sendReceiveDataResponse">
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="greetMe">
+      <soap:operation soapAction="" style="rpc"/>
+      <wsdl:input name="greetMe">
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
+      </wsdl:input>
+      <wsdl:output name="greetMeResponse">
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="sayHi">
+      <soap:operation soapAction="" style="rpc"/>
+      <wsdl:input name="sayHi">
+        <soap:body use="literal" namespace="http://apache.org/hello_world_rpclit/javato"/>
+      </wsdl:input>
+      <wsdl:output name="sayHiResponse">
+        <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">
+      <soap:address location="http://localhost"/>
+    </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/test/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/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl Thu Jul 26 10:57:46 2007
@@ -1,54 +1,54 @@
-<?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:message name="echoStringResponse">
-    <wsdl:part name="return" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="echoString">
-    <wsdl:part name="arg0" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Echo">
-    <wsdl:operation name="echoString">
-      <wsdl:input name="echoString" message="ns1:echoString">
-    </wsdl:input>
-      <wsdl:output name="echoStringResponse" message="ns1:echoStringResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="EchoServiceSoapBinding" type="ns1:Echo">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="echoString">
-      <soap:operation soapAction="" style="rpc"/>
-      <wsdl:input name="echoString">
-        <soap:body use="literal" namespace="http://cxf.apache.org/echotest"/>
-      </wsdl:input>
-      <wsdl:output name="echoStringResponse">
-        <soap:body use="literal" namespace="http://cxf.apache.org/echotest"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="EchoService">
-    <wsdl:port name="EchoPort" binding="ns1:EchoServiceSoapBinding">
-      <soap:address location="http://localhost:9090"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
+<?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:message name="echoStringResponse">
+    <wsdl:part name="return" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="echoString">
+    <wsdl:part name="arg0" type="xsd:string">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Echo">
+    <wsdl:operation name="echoString">
+      <wsdl:input name="echoString" message="ns1:echoString">
+    </wsdl:input>
+      <wsdl:output name="echoStringResponse" message="ns1:echoStringResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="EchoServiceSoapBinding" type="ns1:Echo">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="echoString">
+      <soap:operation soapAction="" style="rpc"/>
+      <wsdl:input name="echoString">
+        <soap:body use="literal" namespace="http://cxf.apache.org/echotest"/>
+      </wsdl:input>
+      <wsdl:output name="echoStringResponse">
+        <soap:body use="literal" namespace="http://cxf.apache.org/echotest"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="EchoService">
+    <wsdl:port name="EchoPort" binding="ns1:EchoServiceSoapBinding">
+      <soap:address location="http://localhost:9090"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Thu Jul 26 10:57:46 2007
@@ -1,133 +1,133 @@
-<?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="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>
-    </wsdl:types>
-    
-    <wsdl:message name="sayHiRequest"/>
-    
-    <wsdl:message name="sayHiResponse">
-	<wsdl:part type="xsd:string" name="out"/>
-    </wsdl:message>
-    
-    <wsdl:message name="greetMeRequest">
-	<wsdl:part element="x1:requestType" name="me"/>
-    </wsdl:message>
-    
-    <wsdl:message name="greetMeResponse">
-	<wsdl:part element="x1:responseType" name="theResponse"/>
-    </wsdl:message>
-    
-    <wsdl:message name="sendReceiveDataRequest">
-	<wsdl:part type="x1:myComplexStructType" name="in"/>
-    </wsdl:message>
-    
-    <wsdl:message name="sendReceiveDataResponse">
-	<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:message>
-    
-    <wsdl:message name="multiParamPartResponse">
-	<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:portType>
-    
-    <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
-
-	<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:binding>
-    
-    <wsdl:service name="XMLService">
-	<wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
-	    <http:address location="http://localhost:9000/XMLService/XMLPort"/>
-	</wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
+<?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="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>
+    </wsdl:types>
+    
+    <wsdl:message name="sayHiRequest"/>
+    
+    <wsdl:message name="sayHiResponse">
+	<wsdl:part type="xsd:string" name="out"/>
+    </wsdl:message>
+    
+    <wsdl:message name="greetMeRequest">
+	<wsdl:part element="x1:requestType" name="me"/>
+    </wsdl:message>
+    
+    <wsdl:message name="greetMeResponse">
+	<wsdl:part element="x1:responseType" name="theResponse"/>
+    </wsdl:message>
+    
+    <wsdl:message name="sendReceiveDataRequest">
+	<wsdl:part type="x1:myComplexStructType" name="in"/>
+    </wsdl:message>
+    
+    <wsdl:message name="sendReceiveDataResponse">
+	<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:message>
+    
+    <wsdl:message name="multiParamPartResponse">
+	<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:portType>
+    
+    <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
+
+	<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:binding>
+    
+    <wsdl:service name="XMLService">
+	<wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
+	    <http:address location="http://localhost:9000/XMLService/XMLPort"/>
+	</wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl Thu Jul 26 10:57:46 2007
@@ -1,154 +1,154 @@
-<?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="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:tns="http://apache.org/fault"
-    xmlns:x1="http://apache.org/fault/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://apache.org/fault" name="HelloWorld">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/fault/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/fault/types" elementFormDefault="qualified">
-           
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-
-            <element name="testDocLitFault">
-                <complexType>
-                    <sequence>
-                        <element name="faultType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="testDocLitFaultResponse">
-                <complexType>
-                    <sequence/>
-                </complexType>
-            </element>
-            <complexType name="ErrorCode">
-                <sequence>
-                    <element name="minor" type="short"/>
-                    <element name="major" type="short"/>
-                </sequence>
-            </complexType>
-            <element name="NoSuchCodeLit">
-                <complexType>
-                    <sequence>
-                        <element name="code" type="x1:ErrorCode"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="BadRecordLit" type="string"/>
-            <complexType name="BadRecord">
-                <sequence>
-                    <element name="reason" type="string"/>
-                    <element name="code" type="short"/>
-                </sequence>
-            </complexType>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part name="in" element="x1:greetMe"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part name="out" element="x1:greetMeResponse"/>
-    </wsdl:message>
-
-    <wsdl:message name="testDocLitFaultRequest">
-        <wsdl:part name="in" element="x1:testDocLitFault"/>
-    </wsdl:message>
-    <wsdl:message name="testDocLitFaultResponse">
-        <wsdl:part name="out" element="x1:testDocLitFaultResponse"/>
-    </wsdl:message>
-    <wsdl:message name="NoSuchCodeLitFault">
-        <wsdl:part name="NoSuchCodeLit" element="x1:NoSuchCodeLit"/>
-    </wsdl:message>
-    <wsdl:message name="BadRecordLitFault">
-        <wsdl:part name="BadRecordLit" element="x1:BadRecordLit"/>
-    </wsdl:message>
- 
-    <wsdl:portType name="Greeter">
-        <wsdl:operation name="greetMe">
-            <wsdl:input name="greetMeRequest" message="tns:greetMeRequest"/>
-            <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
-            <wsdl:fault name="greetMeFault" message="tns:NoSuchCodeLitFault"/>
-        </wsdl:operation>
- 
-        <wsdl:operation name="testDocLitFault">
-            <wsdl:input name="testDocLitFaultRequest" message="tns:testDocLitFaultRequest"/>
-            <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse"/>
-            <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
-            <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
-        </wsdl:operation>
-       
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-       
-        <wsdl:operation name="greetMe">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="testDocLitFault">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="NoSuchCodeLitFault">
-                <soap:fault name="NoSuchCodeLitFault" use="literal"/>
-            </wsdl:fault>
-            <wsdl:fault name="BadRecordLitFault">
-                <soap:fault name="BadRecordLitFault" use="literal"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
-
+<?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="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/fault"
+    xmlns:x1="http://apache.org/fault/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://apache.org/fault" name="HelloWorld">
+    <wsdl:types>
+        <schema targetNamespace="http://apache.org/fault/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/fault/types" elementFormDefault="qualified">
+           
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+
+
+            <element name="testDocLitFault">
+                <complexType>
+                    <sequence>
+                        <element name="faultType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="testDocLitFaultResponse">
+                <complexType>
+                    <sequence/>
+                </complexType>
+            </element>
+            <complexType name="ErrorCode">
+                <sequence>
+                    <element name="minor" type="short"/>
+                    <element name="major" type="short"/>
+                </sequence>
+            </complexType>
+            <element name="NoSuchCodeLit">
+                <complexType>
+                    <sequence>
+                        <element name="code" type="x1:ErrorCode"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="BadRecordLit" type="string"/>
+            <complexType name="BadRecord">
+                <sequence>
+                    <element name="reason" type="string"/>
+                    <element name="code" type="short"/>
+                </sequence>
+            </complexType>
+            
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part name="in" element="x1:greetMe"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part name="out" element="x1:greetMeResponse"/>
+    </wsdl:message>
+
+    <wsdl:message name="testDocLitFaultRequest">
+        <wsdl:part name="in" element="x1:testDocLitFault"/>
+    </wsdl:message>
+    <wsdl:message name="testDocLitFaultResponse">
+        <wsdl:part name="out" element="x1:testDocLitFaultResponse"/>
+    </wsdl:message>
+    <wsdl:message name="NoSuchCodeLitFault">
+        <wsdl:part name="NoSuchCodeLit" element="x1:NoSuchCodeLit"/>
+    </wsdl:message>
+    <wsdl:message name="BadRecordLitFault">
+        <wsdl:part name="BadRecordLit" element="x1:BadRecordLit"/>
+    </wsdl:message>
+ 
+    <wsdl:portType name="Greeter">
+        <wsdl:operation name="greetMe">
+            <wsdl:input name="greetMeRequest" message="tns:greetMeRequest"/>
+            <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
+            <wsdl:fault name="greetMeFault" message="tns:NoSuchCodeLitFault"/>
+        </wsdl:operation>
+ 
+        <wsdl:operation name="testDocLitFault">
+            <wsdl:input name="testDocLitFaultRequest" message="tns:testDocLitFaultRequest"/>
+            <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse"/>
+            <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
+            <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
+        </wsdl:operation>
+       
+    </wsdl:portType>
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+       
+        <wsdl:operation name="greetMe">
+            <soap:operation style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        
+        <wsdl:operation name="testDocLitFault">
+            <soap:operation style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="NoSuchCodeLitFault">
+                <soap:fault name="NoSuchCodeLitFault" use="literal"/>
+            </wsdl:fault>
+            <wsdl:fault name="BadRecordLitFault">
+                <soap:fault name="BadRecordLitFault" use="literal"/>
+            </wsdl:fault>
+        </wsdl:operation>
+        
+    </wsdl:binding>
+    <wsdl:service name="SOAPService">
+        <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
+            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
+

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java Thu Jul 26 10:57:46 2007
@@ -1,73 +1,73 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.xpath.XPathConstants;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import org.apache.cxf.helpers.MapNamespaceContext;
-import org.apache.cxf.helpers.XPathUtils;
-import org.apache.cxf.tools.common.ToolConstants;
-
-public final class CustomNodeSelector {
-    private static final Map<String, String> BINDING_NS_MAP = new HashMap<String, String>();
-
-    private MapNamespaceContext context = new MapNamespaceContext();
-
-    static {
-        BINDING_NS_MAP.put("jaxws", ToolConstants.NS_JAXWS_BINDINGS);
-        BINDING_NS_MAP.put("jaxb", ToolConstants.NS_JAXB_BINDINGS);
-        BINDING_NS_MAP.put("wsdl", ToolConstants.WSDL_NAMESPACE_URI);
-        BINDING_NS_MAP.put("xsd", ToolConstants.SCHEMA_URI);
-    }
-
-    public CustomNodeSelector() {
-        context.addNamespaces(BINDING_NS_MAP);
-    }
-
-    public MapNamespaceContext getNamespaceContext() {
-        return context;
-    }
-
-    public void addNamespaces(final Node targetNode) {
-        NamedNodeMap attributes = targetNode.getAttributes();
-        for (int i = 0; i < attributes.getLength(); i++) {
-            Node a = attributes.item(i);
-            String prefix = a.getLocalName();
-            String ns = a.getNodeValue();
-            if (prefix != null
-                && !context.getUsedNamespaces().containsKey(prefix)
-                && targetNode.lookupPrefix(ns) != null) {
-                context.addNamespace(prefix, ns);
-            }
-        }
-    }
-
-    public Node queryNode(final Node target, final String expression) {
-        XPathUtils xpath = new XPathUtils(context);
-
-        Node node = (Node) xpath.getValue(expression, target, XPathConstants.NODE);
-
-        return node;
-    }
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.xpath.XPathConstants;
+
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import org.apache.cxf.helpers.MapNamespaceContext;
+import org.apache.cxf.helpers.XPathUtils;
+import org.apache.cxf.tools.common.ToolConstants;
+
+public final class CustomNodeSelector {
+    private static final Map<String, String> BINDING_NS_MAP = new HashMap<String, String>();
+
+    private MapNamespaceContext context = new MapNamespaceContext();
+
+    static {
+        BINDING_NS_MAP.put("jaxws", ToolConstants.NS_JAXWS_BINDINGS);
+        BINDING_NS_MAP.put("jaxb", ToolConstants.NS_JAXB_BINDINGS);
+        BINDING_NS_MAP.put("wsdl", ToolConstants.WSDL_NAMESPACE_URI);
+        BINDING_NS_MAP.put("xsd", ToolConstants.SCHEMA_URI);
+    }
+
+    public CustomNodeSelector() {
+        context.addNamespaces(BINDING_NS_MAP);
+    }
+
+    public MapNamespaceContext getNamespaceContext() {
+        return context;
+    }
+
+    public void addNamespaces(final Node targetNode) {
+        NamedNodeMap attributes = targetNode.getAttributes();
+        for (int i = 0; i < attributes.getLength(); i++) {
+            Node a = attributes.item(i);
+            String prefix = a.getLocalName();
+            String ns = a.getNodeValue();
+            if (prefix != null
+                && !context.getUsedNamespaces().containsKey(prefix)
+                && targetNode.lookupPrefix(ns) != null) {
+                context.addNamespace(prefix, ns);
+            }
+        }
+    }
+
+    public Node queryNode(final Node target, final String expression) {
+        XPathUtils xpath = new XPathUtils(context);
+
+        Node node = (Node) xpath.getValue(expression, target, XPathConstants.NODE);
+
+        return node;
+    }
 }

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml Thu Jul 26 10:57:46 2007
@@ -1,22 +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.
--->
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
-    <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/>
-</catalog>
+<?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.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+    <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/>
+</catalog>

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java Thu Jul 26 10:57:46 2007
@@ -1,54 +1,54 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.tools.wsdlto.frontend.jaxws;
-
-import java.net.URL;
-
-import org.xml.sax.InputSource;
-
-import org.apache.cxf.catalog.OASISCatalogManager;
-import org.apache.cxf.resource.ExtendedURIResolver;
-import org.apache.xml.resolver.Catalog;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CatalogTest extends Assert {
-    @Test
-    public void testCatalog() throws Exception {
-        OASISCatalogManager catalogManager = new OASISCatalogManager();
-
-        URL jaxwscatalog = getClass().getResource("/META-INF/jax-ws-catalog.xml");
-        assertNotNull(jaxwscatalog);
-
-        catalogManager.loadCatalog(jaxwscatalog);
-
-        Catalog catalogResolver = catalogManager.getCatalog();
-        assertNotNull(catalogResolver);
-
-        String xsd = "http://www.w3.org/2005/08/addressing/ws-addr.xsd";
-        String resolvedSchemaLocation = catalogResolver.resolveSystem(xsd);
-        assertEquals("classpath:/schemas/wsdl/ws-addr.xsd", resolvedSchemaLocation);
-
-        ExtendedURIResolver resolver = new ExtendedURIResolver();
-        InputSource in = resolver.resolve(resolvedSchemaLocation, null);
-        assertTrue(in.getSystemId().indexOf("common") != -1);
-        assertTrue(in.getSystemId().indexOf("/schemas/wsdl/ws-addr.xsd") != -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.
+ */
+
+package org.apache.cxf.tools.wsdlto.frontend.jaxws;
+
+import java.net.URL;
+
+import org.xml.sax.InputSource;
+
+import org.apache.cxf.catalog.OASISCatalogManager;
+import org.apache.cxf.resource.ExtendedURIResolver;
+import org.apache.xml.resolver.Catalog;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CatalogTest extends Assert {
+    @Test
+    public void testCatalog() throws Exception {
+        OASISCatalogManager catalogManager = new OASISCatalogManager();
+
+        URL jaxwscatalog = getClass().getResource("/META-INF/jax-ws-catalog.xml");
+        assertNotNull(jaxwscatalog);
+
+        catalogManager.loadCatalog(jaxwscatalog);
+
+        Catalog catalogResolver = catalogManager.getCatalog();
+        assertNotNull(catalogResolver);
+
+        String xsd = "http://www.w3.org/2005/08/addressing/ws-addr.xsd";
+        String resolvedSchemaLocation = catalogResolver.resolveSystem(xsd);
+        assertEquals("classpath:/schemas/wsdl/ws-addr.xsd", resolvedSchemaLocation);
+
+        ExtendedURIResolver resolver = new ExtendedURIResolver();
+        InputSource in = resolver.resolve(resolvedSchemaLocation, null);
+        assertTrue(in.getSystemId().indexOf("common") != -1);
+        assertTrue(in.getSystemId().indexOf("/schemas/wsdl/ws-addr.xsd") != -1);
+    }
 }

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message