Author: gmazza
Date: Wed Nov 2 17:23:53 2011
New Revision: 1196711
URL: http://svn.apache.org/viewvc?rev=1196711&view=rev
Log:
Rearranged files as part of new servlet deployment option
Added:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
(with props)
Removed:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/
Added:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl?rev=1196711&view=auto
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
(added)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
Wed Nov 2 17:23:53 2011
@@ -0,0 +1,124 @@
+<?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="CustomerServiceService"
targetNamespace="http://customerservice.example.com/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://customerservice.example.com/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://customerservice.example.com/"
attributeFormDefault="unqualified" elementFormDefault="unqualified"
targetNamespace="http://customerservice.example.com/">
+<xs:element name="getCustomersByName" type="tns:getCustomersByName"/>
+<xs:element name="getCustomersByNameResponse"
type="tns:getCustomersByNameResponse"/>
+<xs:element name="updateCustomer" type="tns:updateCustomer"/>
+<xs:complexType name="updateCustomer">
+<xs:sequence>
+<xs:element minOccurs="0" name="customer" type="tns:customer"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="customer">
+<xs:sequence>
+<xs:element name="customerId" type="xs:int"/>
+<xs:element minOccurs="0" name="name" type="xs:string"/>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="address" nillable="true"
type="xs:string"/>
+<xs:element minOccurs="0" name="numOrders" type="xs:int"/>
+<xs:element name="revenue" type="xs:double"/>
+<xs:element minOccurs="0" name="test" type="xs:decimal"/>
+<xs:element minOccurs="0" name="birthDate" type="xs:date"/>
+<xs:element minOccurs="0" name="type" type="tns:customerType"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getCustomersByName">
+<xs:sequence>
+<xs:element minOccurs="0" name="name" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getCustomersByNameResponse">
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="return"
type="tns:customer"/>
+</xs:sequence>
+</xs:complexType>
+<xs:simpleType name="customerType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="PRIVATE"/>
+<xs:enumeration value="BUSINESS"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:element name="NoSuchCustomer" type="tns:NoSuchCustomer"/>
+<xs:complexType name="NoSuchCustomer">
+<xs:sequence>
+<xs:element name="customerName" nillable="true" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="getCustomersByNameResponse">
+ <wsdl:part name="parameters" element="tns:getCustomersByNameResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getCustomersByName">
+ <wsdl:part name="parameters" element="tns:getCustomersByName">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateCustomer">
+ <wsdl:part name="parameters" element="tns:updateCustomer">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="NoSuchCustomerException">
+ <wsdl:part name="NoSuchCustomerException" element="tns:NoSuchCustomer">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="CustomerService">
+ <wsdl:operation name="updateCustomer">
+ <wsdl:input name="updateCustomer" message="tns:updateCustomer">
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="getCustomersByName">
+ <wsdl:input name="getCustomersByName" message="tns:getCustomersByName">
+ </wsdl:input>
+ <wsdl:output name="getCustomersByNameResponse"
message="tns:getCustomersByNameResponse">
+ </wsdl:output>
+ <wsdl:fault name="NoSuchCustomerException"
message="tns:NoSuchCustomerException">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CustomerServiceServiceSoapBinding"
type="tns:CustomerService">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="updateCustomer">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="updateCustomer">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="getCustomersByName">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="getCustomersByName">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getCustomersByNameResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="NoSuchCustomerException">
+ <soap:fault name="NoSuchCustomerException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CustomerServiceService">
+ <wsdl:port name="CustomerServicePort"
binding="tns:CustomerServiceServiceSoapBinding">
+ <soap:address location="http://localhost:9090/CustomerServicePort"/>
+ <!--soap:address
location="http://localhost:8080/wsdl_first-{CXFVersion}/services/CustomerServicePort?wsdl"/-->
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml?rev=1196711&view=auto
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
(added)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/binding.xml
Wed Nov 2 17:23:53 2011
@@ -0,0 +1,17 @@
+<jaxws:bindings wsdlLocation="CustomerService.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <!-- <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping> -->
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
+ <jxb:globalBindings>
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
+
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
+
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ <jxb:javaType name="java.util.Date" xmlType="xs:date"
+
parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDate"
+
printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDate"/>
+ </jxb:globalBindings>
+ </jaxws:bindings>
+</jaxws:bindings>
\ No newline at end of file
Added:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml?rev=1196711&view=auto
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
(added)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
Wed Nov 2 17:23:53 2011
@@ -0,0 +1,46 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <!-- comment this bean to disable schema validation in the client -->
+ <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort"
+ createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="schema-validation-enabled" value="true" />
+ </jaxws:properties>
+ </jaxws:client>
+
+ <jaxws:endpoint name="{http://apache.org/hello_world_soap_http}SoapPort"
+ wsdlLocation="wsdl/CustomerService.wsdl"
+ createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="schema-validation-enabled" value="true" />
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+</beans>
+
Added:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml?rev=1196711&view=auto
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
(added)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
Wed Nov 2 17:23:53 2011
@@ -0,0 +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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/bindings/soap
http://cxf.apache.org/schemas/configuration/soap.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <jaxws:endpoint xmlns:customer="http://customerservice.example.com/"
+ id="CustomerServiceHTTP" address="/CustomerServicePort"
+ serviceName="customer:CustomerServiceService"
endpointName="customer:CustomerServicePort"
+
implementor="com.example.customerservice.server.CustomerServiceImpl">
+ <!--jaxws:properties>
+ <entry key="schema-validation-enabled" value="true" />
+ </jaxws:properties-->
+ </jaxws:endpoint>
+
+</beans>
Propchange:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
------------------------------------------------------------------------------
svn:executable = *