You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/03/30 23:53:15 UTC
svn commit: r524286 [2/2] - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/binding/
common/common/src/main/java/org/apache/cxf/configuration/spring/
rt/bindings/http/src/main/java/org/apache/cxf/binding/http/
rt/bindings/http/src/test/java/o...
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl?view=diff&rev=524286&r1=524285&r2=524286
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl Fri Mar 30 14:53:13 2007
@@ -1,190 +1,190 @@
<?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.
+ 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/hello_world_xml_http/wrapped"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:tns="http://apache.org/hello_world_xml_http/wrapped"
- xmlns:x1="http://apache.org/hello_world_xml_http/wrapped/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xformat="http://cxf.apache.org/bindings/xformat"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <schema
- targetNamespace="http://apache.org/hello_world_xml_http/wrapped/types"
- xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
- <element name="sayHi">
- <complexType />
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
-
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
- <element name="greetMeOneWay">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
-
- <element name="pingMe">
- <complexType />
- </element>
- <element name="pingMeResponse">
- <complexType />
- </element>
- <element name="faultDetail">
- <complexType>
- <sequence>
- <element name="minor" type="xsd:short" />
- <element name="major" type="xsd:short" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in" />
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out" />
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in" />
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out" />
- </wsdl:message>
- <wsdl:message name="greetMeOneWayRequest">
- <wsdl:part element="x1:greetMeOneWay" name="in" />
- </wsdl:message>
-
- <wsdl:message name="pingMeRequest">
- <wsdl:part name="in" element="x1:pingMe" />
- </wsdl:message>
- <wsdl:message name="pingMeResponse">
- <wsdl:part name="out" element="x1:pingMeResponse" />
- </wsdl:message>
- <wsdl:message name="pingMeFault">
- <wsdl:part name="faultDetail" element="x1:faultDetail" />
- </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="greetMeOneWay">
- <wsdl:input message="tns:greetMeOneWayRequest"
- name="greetMeOneWayRequest" />
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input name="pingMeRequest"
- message="tns:pingMeRequest" />
- <wsdl:output name="pingMeResponse"
- message="tns:pingMeResponse" />
- <wsdl:fault name="pingMeFault" message="tns:pingMeFault" />
- </wsdl:operation>
-
- </wsdl:portType>
- <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
- <xformat:binding />
-
- <wsdl:operation name="sayHi">
- <wsdl:input name="sayHiRequest" />
- <wsdl:output name="sayHiResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input name="greetMeRequest" />
- <wsdl:output name="greetMeResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <wsdl:input name="greetMeOneWayRequest" />
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input />
- <wsdl:output />
- <wsdl:fault name="pingMeFault" />
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="XMLService">
- <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
- <http:address
- location="http://localhost:9032/XMLService/XMLPort" />
- </wsdl:port>
-
- <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLDispatchPort">
- <http:address
- location="http://localhost:9007/XMLService/XMLDispatchPort" />
- </wsdl:port>
-
- <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLProviderPort">
- <http:address
- location="http://localhost:9022/XMLService/XMLProviderPort" />
- </wsdl:port>
-
- <wsdl:port binding="tns:Greeter_XMLBinding" name="RestProviderPort">
- <http:address
- location="http://localhost:9023/XMLService/RestProviderPort/Customer" />
- </wsdl:port>
-
- <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLFaultPort">
- <http:address
- location="http://localhost:9033/XMLService/XMLFaultPort" />
- </wsdl:port>
+ targetNamespace="http://apache.org/hello_world_xml_http/wrapped"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:tns="http://apache.org/hello_world_xml_http/wrapped"
+ xmlns:x1="http://apache.org/hello_world_xml_http/wrapped/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xformat="http://cxf.apache.org/bindings/xformat"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <schema
+ targetNamespace="http://apache.org/hello_world_xml_http/wrapped/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <element name="sayHi">
+ <complexType />
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeOneWay">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="pingMe">
+ <complexType />
+ </element>
+ <element name="pingMeResponse">
+ <complexType />
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor" type="xsd:short" />
+ <element name="major" type="xsd:short" />
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in" />
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out" />
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in" />
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out" />
+ </wsdl:message>
+ <wsdl:message name="greetMeOneWayRequest">
+ <wsdl:part element="x1:greetMeOneWay" name="in" />
+ </wsdl:message>
+
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe" />
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse" />
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail" />
+ </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="greetMeOneWay">
+ <wsdl:input message="tns:greetMeOneWayRequest"
+ name="greetMeOneWayRequest" />
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest"
+ message="tns:pingMeRequest" />
+ <wsdl:output name="pingMeResponse"
+ message="tns:pingMeResponse" />
+ <wsdl:fault name="pingMeFault" message="tns:pingMeFault" />
+ </wsdl:operation>
+
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
+ <xformat:binding />
+
+ <wsdl:operation name="sayHi">
+ <wsdl:input name="sayHiRequest" />
+ <wsdl:output name="sayHiResponse" />
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input name="greetMeRequest" />
+ <wsdl:output name="greetMeResponse" />
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input name="greetMeOneWayRequest" />
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input />
+ <wsdl:output />
+ <wsdl:fault name="pingMeFault" />
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="XMLService">
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
+ <http:address
+ location="http://localhost:9032/XMLService/XMLPort" />
+ </wsdl:port>
+
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLDispatchPort">
+ <http:address
+ location="http://localhost:9007/XMLService/XMLDispatchPort" />
+ </wsdl:port>
+
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLProviderPort">
+ <http:address
+ location="http://localhost:9022/XMLService/XMLProviderPort" />
+ </wsdl:port>
+
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="RestProviderPort">
+ <http:address
+ location="http://localhost:9023/XMLService/RestProviderPort/Customer" />
+ </wsdl:port>
+
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLFaultPort">
+ <http:address
+ location="http://localhost:9033/XMLService/XMLFaultPort" />
+ </wsdl:port>
- </wsdl:service>
+ </wsdl:service>
</wsdl:definitions>
Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilder.java?view=diff&rev=524286&r1=524285&r2=524286
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilder.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilder.java Fri Mar 30 14:53:13 2007
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.cxf.BusException;
-import org.apache.cxf.binding.soap.SoapBindingInfoFactoryBean;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.frontend.AbstractEndpointFactory;
@@ -33,7 +32,6 @@
public ServiceBuilder() {
super();
- setBindingFactory(new SoapBindingInfoFactoryBean());
}
public ServiceInfo build() {