From 01af6227758ab025371ceb398a1bbcd5bd839c09 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 29 Nov 2022 13:24:29 -0600
Subject: [PATCH] Polish.

---
 airline/client/airline.wsdl      | 281 +++++++++++++++++++++----------
 airline/client/spring-ws/pom.xml |   2 +-
 2 files changed, 197 insertions(+), 86 deletions(-)

diff --git a/airline/client/airline.wsdl b/airline/client/airline.wsdl
index 01a3976..e407288 100644
--- a/airline/client/airline.wsdl
+++ b/airline/client/airline.wsdl
@@ -1,85 +1,196 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:sch0="http://www.springframework.org/spring-ws/samples/airline/schemas/messages" xmlns:sch1="http://www.springframework.org/spring-ws/samples/airline/schemas/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/definitions" targetNamespace="http://www.springframework.org/spring-ws/samples/airline/definitions">
-  <wsdl:types>
-    <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/schemas/messages" xmlns:types="http://www.springframework.org/spring-ws/samples/airline/schemas/types" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/samples/airline/schemas/messages"><import namespace="http://www.springframework.org/spring-ws/samples/airline/schemas/types"/><element name="GetFlightsRequest"><complexType><all><element name="from" type="types:AirportCode"/><element name="to" type="types:AirportCode"/><element name="departureDate" type="date"/><element minOccurs="0" name="serviceClass" type="types:ServiceClass"/></all></complexType></element><element name="GetFlightsResponse"><complexType><sequence><element maxOccurs="unbounded" minOccurs="0" name="flight" type="types:Flight"/></sequence></complexType></element><element name="BookFlightRequest"><complexType><all><element name="flightNumber" type="types:FlightNumber"/><element name="departureTime" type="dateTime"/><element name="passengers"><complexType><choice maxOccurs="9"><element name="passenger" type="types:Name"/><element name="username" type="types:FrequentFlyerUsername"/></choice></complexType></element></all></complexType></element><element name="BookFlightResponse" type="types:Ticket"/><element name="GetFrequentFlyerMileageRequest" nillable="true" type="string"/><element name="GetFrequentFlyerMileageResponse" type="int"/></schema>
-    <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/schemas/types" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/samples/airline/schemas/types"><complexType name="Flight"><sequence><element name="number" type="tns:FlightNumber"/><element name="departureTime" type="dateTime"/><element name="from" type="tns:Airport"/><element name="arrivalTime" type="dateTime"/><element name="to" type="tns:Airport"/><element name="serviceClass" type="tns:ServiceClass"/></sequence></complexType><simpleType name="FlightNumber"><restriction base="string"><pattern value="[A-Z][A-Z][0-9][0-9][0-9][0-9]"/></restriction></simpleType><complexType name="Name"><sequence><element name="first" type="string"/><element name="last" type="string"/></sequence></complexType><simpleType name="FrequentFlyerUsername"><restriction base="string"/></simpleType><complexType name="Airport"><all><element name="code" type="tns:AirportCode"/><element name="name" type="string"/><element name="city" type="string"/></all></complexType><simpleType name="AirportCode"><restriction base="string"><pattern value="[A-Z][A-Z][A-Z]"/></restriction></simpleType><complexType name="Ticket"><all><element name="id" type="long"/><element name="issueDate" type="date"/><element name="passengers"><complexType><sequence><element maxOccurs="9" name="passenger" type="tns:Name"/></sequence></complexType></element><element name="flight" type="tns:Flight"/></all></complexType><simpleType name="ServiceClass"><restriction base="NCName"><enumeration value="economy"/><enumeration value="business"/><enumeration value="first"/></restriction></simpleType></schema>
-  </wsdl:types>
-  <wsdl:message name="BookFlightRequest">
-    <wsdl:part element="sch0:BookFlightRequest" name="BookFlightRequest">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="GetFlightsResponse">
-    <wsdl:part element="sch0:GetFlightsResponse" name="GetFlightsResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="BookFlightResponse">
-    <wsdl:part element="sch0:BookFlightResponse" name="BookFlightResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="GetFrequentFlyerMileageRequest">
-    <wsdl:part element="sch0:GetFrequentFlyerMileageRequest" name="GetFrequentFlyerMileageRequest">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="GetFlightsRequest">
-    <wsdl:part element="sch0:GetFlightsRequest" name="GetFlightsRequest">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="GetFrequentFlyerMileageResponse">
-    <wsdl:part element="sch0:GetFrequentFlyerMileageResponse" name="GetFrequentFlyerMileageResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Airline">
-    <wsdl:operation name="BookFlight">
-      <wsdl:input message="tns:BookFlightRequest" name="BookFlightRequest">
-    </wsdl:input>
-      <wsdl:output message="tns:BookFlightResponse" name="BookFlightResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetFlights">
-      <wsdl:input message="tns:GetFlightsRequest" name="GetFlightsRequest">
-    </wsdl:input>
-      <wsdl:output message="tns:GetFlightsResponse" name="GetFlightsResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetFrequentFlyerMileage">
-      <wsdl:input message="tns:GetFrequentFlyerMileageRequest" name="GetFrequentFlyerMileageRequest">
-    </wsdl:input>
-      <wsdl:output message="tns:GetFrequentFlyerMileageResponse" name="GetFrequentFlyerMileageResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AirlineSoap11" type="tns:Airline">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http/"/>
-    <wsdl:operation name="BookFlight">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="BookFlightRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="BookFlightResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetFlights">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="GetFlightsRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="GetFlightsResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetFrequentFlyerMileage">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="GetFrequentFlyerMileageRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="GetFrequentFlyerMileageResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AirlineService">
-    <wsdl:port binding="tns:AirlineSoap11" name="AirlineSoap11">
-      <soap:address location="http://localhost:8080/airline-server/services"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<wsdl:definitions
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:sch0="http://www.springframework.org/spring-ws/samples/airline/schemas/messages"
+    xmlns:sch1="http://www.springframework.org/spring-ws/samples/airline/schemas/types"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/definitions"
+    targetNamespace="http://www.springframework.org/spring-ws/samples/airline/definitions">
+    <wsdl:types>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema"
+                xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/schemas/messages"
+                xmlns:types="http://www.springframework.org/spring-ws/samples/airline/schemas/types"
+                attributeFormDefault="unqualified"
+                elementFormDefault="qualified"
+                targetNamespace="http://www.springframework.org/spring-ws/samples/airline/schemas/messages">
+            <import namespace="http://www.springframework.org/spring-ws/samples/airline/schemas/types"/>
+            <element name="GetFlightsRequest">
+                <complexType>
+                    <all>
+                        <element name="from" type="types:AirportCode"/>
+                        <element name="to" type="types:AirportCode"/>
+                        <element name="departureDate" type="date"/>
+                        <element minOccurs="0" name="serviceClass" type="types:ServiceClass"/>
+                    </all>
+                </complexType>
+            </element>
+            <element name="GetFlightsResponse">
+                <complexType>
+                    <sequence>
+                        <element maxOccurs="unbounded" minOccurs="0" name="flight" type="types:Flight"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="BookFlightRequest">
+                <complexType>
+                    <all>
+                        <element name="flightNumber" type="types:FlightNumber"/>
+                        <element name="departureTime" type="dateTime"/>
+                        <element name="passengers">
+                            <complexType>
+                                <choice maxOccurs="9">
+                                    <element name="passenger" type="types:Name"/>
+                                    <element name="username" type="types:FrequentFlyerUsername"/>
+                                </choice>
+                            </complexType>
+                        </element>
+                    </all>
+                </complexType>
+            </element>
+            <element name="BookFlightResponse" type="types:Ticket"/>
+            <element name="GetFrequentFlyerMileageRequest" nillable="true" type="string"/>
+            <element name="GetFrequentFlyerMileageResponse" type="int"/>
+        </schema>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema"
+                xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/schemas/types"
+                attributeFormDefault="unqualified" elementFormDefault="qualified"
+                targetNamespace="http://www.springframework.org/spring-ws/samples/airline/schemas/types">
+            <complexType name="Flight">
+                <sequence>
+                    <element name="number" type="tns:FlightNumber"/>
+                    <element name="departureTime" type="dateTime"/>
+                    <element name="from" type="tns:Airport"/>
+                    <element name="arrivalTime" type="dateTime"/>
+                    <element name="to" type="tns:Airport"/>
+                    <element name="serviceClass" type="tns:ServiceClass"/>
+                </sequence>
+            </complexType>
+            <simpleType name="FlightNumber">
+                <restriction base="string">
+                    <pattern value="[A-Z][A-Z][0-9][0-9][0-9][0-9]"/>
+                </restriction>
+            </simpleType>
+            <complexType name="Name">
+                <sequence>
+                    <element name="first" type="string"/>
+                    <element name="last" type="string"/>
+                </sequence>
+            </complexType>
+            <simpleType name="FrequentFlyerUsername">
+                <restriction base="string"/>
+            </simpleType>
+            <complexType name="Airport">
+                <all>
+                    <element name="code" type="tns:AirportCode"/>
+                    <element name="name" type="string"/>
+                    <element name="city" type="string"/>
+                </all>
+            </complexType>
+            <simpleType name="AirportCode">
+                <restriction base="string">
+                    <pattern value="[A-Z][A-Z][A-Z]"/>
+                </restriction>
+            </simpleType>
+            <complexType name="Ticket">
+                <all>
+                    <element name="id" type="long"/>
+                    <element name="issueDate" type="date"/>
+                    <element name="passengers">
+                        <complexType>
+                            <sequence>
+                                <element maxOccurs="9" name="passenger" type="tns:Name"/>
+                            </sequence>
+                        </complexType>
+                    </element>
+                    <element name="flight" type="tns:Flight"/>
+                </all>
+            </complexType>
+            <simpleType name="ServiceClass">
+                <restriction base="NCName">
+                    <enumeration value="economy"/>
+                    <enumeration value="business"/>
+                    <enumeration value="first"/>
+                </restriction>
+            </simpleType>
+        </schema>
+    </wsdl:types>
+    <wsdl:message name="BookFlightRequest">
+        <wsdl:part element="sch0:BookFlightRequest" name="BookFlightRequest">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="GetFlightsResponse">
+        <wsdl:part element="sch0:GetFlightsResponse" name="GetFlightsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="BookFlightResponse">
+        <wsdl:part element="sch0:BookFlightResponse" name="BookFlightResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="GetFrequentFlyerMileageRequest">
+        <wsdl:part element="sch0:GetFrequentFlyerMileageRequest" name="GetFrequentFlyerMileageRequest">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="GetFlightsRequest">
+        <wsdl:part element="sch0:GetFlightsRequest" name="GetFlightsRequest">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="GetFrequentFlyerMileageResponse">
+        <wsdl:part element="sch0:GetFrequentFlyerMileageResponse" name="GetFrequentFlyerMileageResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="Airline">
+        <wsdl:operation name="BookFlight">
+            <wsdl:input message="tns:BookFlightRequest" name="BookFlightRequest">
+            </wsdl:input>
+            <wsdl:output message="tns:BookFlightResponse" name="BookFlightResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="GetFlights">
+            <wsdl:input message="tns:GetFlightsRequest" name="GetFlightsRequest">
+            </wsdl:input>
+            <wsdl:output message="tns:GetFlightsResponse" name="GetFlightsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="GetFrequentFlyerMileage">
+            <wsdl:input message="tns:GetFrequentFlyerMileageRequest" name="GetFrequentFlyerMileageRequest">
+            </wsdl:input>
+            <wsdl:output message="tns:GetFrequentFlyerMileageResponse" name="GetFrequentFlyerMileageResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="AirlineSoap11" type="tns:Airline">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http/"/>
+        <wsdl:operation name="BookFlight">
+            <soap:operation soapAction=""/>
+            <wsdl:input name="BookFlightRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="BookFlightResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="GetFlights">
+            <soap:operation soapAction=""/>
+            <wsdl:input name="GetFlightsRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="GetFlightsResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="GetFrequentFlyerMileage">
+            <soap:operation soapAction=""/>
+            <wsdl:input name="GetFrequentFlyerMileageRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="GetFrequentFlyerMileageResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="AirlineService">
+        <wsdl:port binding="tns:AirlineSoap11" name="AirlineSoap11">
+            <soap:address location="http://localhost:8080/airline-server/services"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/airline/client/spring-ws/pom.xml b/airline/client/spring-ws/pom.xml
index a2a032a..e24f23b 100644
--- a/airline/client/spring-ws/pom.xml
+++ b/airline/client/spring-ws/pom.xml
@@ -19,7 +19,7 @@
 		<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<schema>${project.basedir}/../../server/src/main/resources</schema>
-		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
+		<wsdl>file://${project.basedir}/../airline.wsdl</wsdl>
 	</properties>
 
 	<dependencies>