From ef5c95db7eb2876f417a9866b36546e697f23940 Mon Sep 17 00:00:00 2001
From: Stefan de Konink <stefan@konink.de>
Date: Fri, 27 Jun 2025 10:47:25 +0200
Subject: [PATCH] Also validate and lint all wsdl files

---
 .github/scripts/validate-and-lint.sh |    2 +-
 xsd/siri_wsConsumer-Document.wsdl    |  370 ++++----
 xsd/siri_wsConsumer-WSDL2.wsdl       |  196 ++--
 xsd/siri_wsConsumer.wsdl             |  420 ++++-----
 xsd/siri_wsProducer-Document.wsdl    | 1162 +++++++++++------------
 xsd/siri_wsProducer-WSDL2.wsdl       |  470 ++++-----
 xsd/siri_wsProducer.wsdl             | 1312 +++++++++++++-------------
 7 files changed, 1966 insertions(+), 1966 deletions(-)

diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh
index 648ce421..eab38df1 100755
--- a/.github/scripts/validate-and-lint.sh
+++ b/.github/scripts/validate-and-lint.sh
@@ -25,7 +25,7 @@ while IFS= read -r -d $'\0' filename; do
   fi
   # Remove temp file
   rm "${filename}.pretty"
-done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -not -path "./.git/*" -print0)
+done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" -or -name "*.wsdl" \) -not -path "./.git/*" -print0)
 
 if [ ${PARSING_ERROR} -ne 0 ]; then
   exit ${PARSING_ERROR}
diff --git a/xsd/siri_wsConsumer-Document.wsdl b/xsd/siri_wsConsumer-Document.wsdl
index 144b3999..40d9ec64 100644
--- a/xsd/siri_wsConsumer-Document.wsdl
+++ b/xsd/siri_wsConsumer-Document.wsdl
@@ -1,189 +1,189 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ======== All the structures are comming from siri.xsd ========= -->
 <definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:siriWS="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ns="http://datex2.eu/schema/1_0/1_0" xmlns:ns1="http://www.ifopt.org.uk/acsb" xmlns:ns2="http://www.ifopt.org.uk/ifopt" xmlns:ns3="http://datex2.eu/schema/2_0RC1/2_0" targetNamespace="http://wsdl.siri.org.uk">
- <types>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
-   <xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Framework.xsd"/>
-   <xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Services.xsd"/>
-  </xsd:schema>
- </types>
- <message name="HeartbeatNotify">
-  <part name="HeartbeatNotifyParameters" element="siriWS:NotifyHeartbeat"/>
- </message>
- <message name="DataReadyNotify">
-  <part name="DataReadyNotifyParameters" element="siriWS:NotifyDataReady"/>
- </message>
- <message name="SubscriptionTerminatedNotify">
-  <part name="SubscriptionTerminatedNotifyParameters" element="siriWS:NotifySubscriptionTerminated"/>
- </message>
- <message name="ProductionTimetableNotify">
-  <part name="ProductionTimetableNotifyParameters" element="siriWS:NotifyProductionTimetable"/>
- </message>
- <message name="EstimatedTimetableNotify">
-  <part name="EstimatedTimetableNotifyParameters" element="siriWS:NotifyEstimatedTimetable"/>
- </message>
- <message name="StopTimetableNotify">
-  <part name="StopTimetableNotifyParameters" element="siriWS:NotifyStopTimetable"/>
- </message>
- <message name="StopMonitoringNotify">
-  <part name="StopMonitoringNotifyParameters" element="siriWS:NotifyStopMonitoring"/>
- </message>
- <message name="VehicleMonitoringNotify">
-  <part name="VehicleMonitoringNotifyParameters" element="siriWS:NotifyVehicleMonitoring"/>
- </message>
- <message name="ConnectionTimetableNotify">
-  <part name="ConnectionTimetableNotifyParameters" element="siriWS:NotifyConnectionTimetable"/>
- </message>
- <message name="ConnectionMonitoringNotify">
-  <part name="ConnectionMonitoringNotifyParameters" element="siriWS:NotifyConnectionMonitoring"/>
- </message>
- <message name="GeneralMessageNotify">
-  <part name="GeneralMessageNotifyParameters" element="siriWS:NotifyGeneralMessage"/>
- </message>
- <message name="FacilityMonitoringNotify">
-  <part name="FacilityMonitoringNotifyParameters" element="siriWS:NotifyFacilityMonitoring"/>
- </message>
- <message name="SituationExchangeNotify">
-  <part name="SituationExchangeNotifyParameters" element="siriWS:NotifySituationExchange"/>
- </message>
- <message name="ControlActionNotify">
-  <part name="ControlActionNotifyParameters" element="siriWS:NotifyControlAction"/>
- </message>
- <portType name="SiriConsumerDocPort">
-  <operation name="NotifyDataReady">
-   <input message="siriWS:DataReadyNotify"/>
-  </operation>
-  <operation name="NotifyHeartbeat">
-   <input message="siriWS:HeartbeatNotify"/>
-  </operation>
-  <!-- == Service Specific == -->
-  <operation name="NotifySubscriptionTerminated">
-   <input message="siriWS:SubscriptionTerminatedNotify"/>
-  </operation>
-  <operation name="NotifyProductionTimetable">
-   <input message="siriWS:ProductionTimetableNotify"/>
-  </operation>
-  <operation name="NotifyEstimatedTimetable">
-   <input message="siriWS:EstimatedTimetableNotify"/>
-  </operation>
-  <operation name="NotifyStopTimetable">
-   <input message="siriWS:StopTimetableNotify"/>
-  </operation>
-  <operation name="NotifyStopMonitoring">
-   <input message="siriWS:StopMonitoringNotify"/>
-  </operation>
-  <operation name="NotifyVehicleMonitoring">
-   <input message="siriWS:VehicleMonitoringNotify"/>
-  </operation>
-  <operation name="NotifyConnectionTimetable">
-   <input message="siriWS:ConnectionTimetableNotify"/>
-  </operation>
-  <operation name="NotifyConnectionMonitoring">
-   <input message="siriWS:ConnectionMonitoringNotify"/>
-  </operation>
-  <operation name="NotifyGeneralMessage">
-   <input message="siriWS:GeneralMessageNotify"/>
-  </operation>
-  <operation name="NotifyFacilityMonitoring">
-   <input message="siriWS:FacilityMonitoringNotify"/>
-  </operation>
-  <operation name="NotifySituationExchange">
-   <input message="siriWS:SituationExchangeNotify"/>
-  </operation>
-  <operation name="NotifyControlAction">
-   <input message="siriWS:ControlActionNotify"/>
-  </operation>
- </portType>
- <binding name="SiriConsumerDocBinding" type="siriWS:SiriConsumerDocPort">
-  <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-  <operation name="NotifySubscriptionTerminated">
-   <soap:operation soapAction="NotifySubscriptionTerminated"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyDataReady">
-   <soap:operation soapAction="NotifyDataReady"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyHeartbeat">
-   <soap:operation soapAction="NotifyHeartbeat"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyProductionTimetable">
-   <soap:operation soapAction="GetProductionTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyEstimatedTimetable">
-   <soap:operation soapAction="GetEstimatedTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyStopTimetable">
-   <soap:operation soapAction="GetStopTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyStopMonitoring">
-   <soap:operation soapAction="GetStopMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyVehicleMonitoring">
-   <soap:operation soapAction="GetVehicleMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyConnectionTimetable">
-   <soap:operation soapAction="GetConnectionTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyConnectionMonitoring">
-   <soap:operation soapAction="GetConnectionMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyGeneralMessage">
-   <soap:operation soapAction="GetGeneralMessage"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyFacilityMonitoring">
-   <soap:operation soapAction="GetFacilityMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifySituationExchange">
-   <soap:operation soapAction="GetSituationExchange"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
-  <operation name="NotifyControlAction">
-   <soap:operation soapAction="GetControlAction"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-  </operation>
- </binding>
- <service name="SiriConsumerDocServices">
-  <port name="SiriWSPort" binding="siriWS:SiriConsumerDocBinding">
-   <soap:address location="http://www.siri-service-location.com"/>
-  </port>
- </service>
+	<types>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
+			<xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Framework.xsd"/>
+			<xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Services.xsd"/>
+		</xsd:schema>
+	</types>
+	<message name="HeartbeatNotify">
+		<part name="HeartbeatNotifyParameters" element="siriWS:NotifyHeartbeat"/>
+	</message>
+	<message name="DataReadyNotify">
+		<part name="DataReadyNotifyParameters" element="siriWS:NotifyDataReady"/>
+	</message>
+	<message name="SubscriptionTerminatedNotify">
+		<part name="SubscriptionTerminatedNotifyParameters" element="siriWS:NotifySubscriptionTerminated"/>
+	</message>
+	<message name="ProductionTimetableNotify">
+		<part name="ProductionTimetableNotifyParameters" element="siriWS:NotifyProductionTimetable"/>
+	</message>
+	<message name="EstimatedTimetableNotify">
+		<part name="EstimatedTimetableNotifyParameters" element="siriWS:NotifyEstimatedTimetable"/>
+	</message>
+	<message name="StopTimetableNotify">
+		<part name="StopTimetableNotifyParameters" element="siriWS:NotifyStopTimetable"/>
+	</message>
+	<message name="StopMonitoringNotify">
+		<part name="StopMonitoringNotifyParameters" element="siriWS:NotifyStopMonitoring"/>
+	</message>
+	<message name="VehicleMonitoringNotify">
+		<part name="VehicleMonitoringNotifyParameters" element="siriWS:NotifyVehicleMonitoring"/>
+	</message>
+	<message name="ConnectionTimetableNotify">
+		<part name="ConnectionTimetableNotifyParameters" element="siriWS:NotifyConnectionTimetable"/>
+	</message>
+	<message name="ConnectionMonitoringNotify">
+		<part name="ConnectionMonitoringNotifyParameters" element="siriWS:NotifyConnectionMonitoring"/>
+	</message>
+	<message name="GeneralMessageNotify">
+		<part name="GeneralMessageNotifyParameters" element="siriWS:NotifyGeneralMessage"/>
+	</message>
+	<message name="FacilityMonitoringNotify">
+		<part name="FacilityMonitoringNotifyParameters" element="siriWS:NotifyFacilityMonitoring"/>
+	</message>
+	<message name="SituationExchangeNotify">
+		<part name="SituationExchangeNotifyParameters" element="siriWS:NotifySituationExchange"/>
+	</message>
+	<message name="ControlActionNotify">
+		<part name="ControlActionNotifyParameters" element="siriWS:NotifyControlAction"/>
+	</message>
+	<portType name="SiriConsumerDocPort">
+		<operation name="NotifyDataReady">
+			<input message="siriWS:DataReadyNotify"/>
+		</operation>
+		<operation name="NotifyHeartbeat">
+			<input message="siriWS:HeartbeatNotify"/>
+		</operation>
+		<!-- == Service Specific == -->
+		<operation name="NotifySubscriptionTerminated">
+			<input message="siriWS:SubscriptionTerminatedNotify"/>
+		</operation>
+		<operation name="NotifyProductionTimetable">
+			<input message="siriWS:ProductionTimetableNotify"/>
+		</operation>
+		<operation name="NotifyEstimatedTimetable">
+			<input message="siriWS:EstimatedTimetableNotify"/>
+		</operation>
+		<operation name="NotifyStopTimetable">
+			<input message="siriWS:StopTimetableNotify"/>
+		</operation>
+		<operation name="NotifyStopMonitoring">
+			<input message="siriWS:StopMonitoringNotify"/>
+		</operation>
+		<operation name="NotifyVehicleMonitoring">
+			<input message="siriWS:VehicleMonitoringNotify"/>
+		</operation>
+		<operation name="NotifyConnectionTimetable">
+			<input message="siriWS:ConnectionTimetableNotify"/>
+		</operation>
+		<operation name="NotifyConnectionMonitoring">
+			<input message="siriWS:ConnectionMonitoringNotify"/>
+		</operation>
+		<operation name="NotifyGeneralMessage">
+			<input message="siriWS:GeneralMessageNotify"/>
+		</operation>
+		<operation name="NotifyFacilityMonitoring">
+			<input message="siriWS:FacilityMonitoringNotify"/>
+		</operation>
+		<operation name="NotifySituationExchange">
+			<input message="siriWS:SituationExchangeNotify"/>
+		</operation>
+		<operation name="NotifyControlAction">
+			<input message="siriWS:ControlActionNotify"/>
+		</operation>
+	</portType>
+	<binding name="SiriConsumerDocBinding" type="siriWS:SiriConsumerDocPort">
+		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="NotifySubscriptionTerminated">
+			<soap:operation soapAction="NotifySubscriptionTerminated"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyDataReady">
+			<soap:operation soapAction="NotifyDataReady"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyHeartbeat">
+			<soap:operation soapAction="NotifyHeartbeat"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyProductionTimetable">
+			<soap:operation soapAction="GetProductionTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyEstimatedTimetable">
+			<soap:operation soapAction="GetEstimatedTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyStopTimetable">
+			<soap:operation soapAction="GetStopTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyStopMonitoring">
+			<soap:operation soapAction="GetStopMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyVehicleMonitoring">
+			<soap:operation soapAction="GetVehicleMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyConnectionTimetable">
+			<soap:operation soapAction="GetConnectionTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyConnectionMonitoring">
+			<soap:operation soapAction="GetConnectionMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyGeneralMessage">
+			<soap:operation soapAction="GetGeneralMessage"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyFacilityMonitoring">
+			<soap:operation soapAction="GetFacilityMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifySituationExchange">
+			<soap:operation soapAction="GetSituationExchange"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+		<operation name="NotifyControlAction">
+			<soap:operation soapAction="GetControlAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+		</operation>
+	</binding>
+	<service name="SiriConsumerDocServices">
+		<port name="SiriWSPort" binding="siriWS:SiriConsumerDocBinding">
+			<soap:address location="http://www.siri-service-location.com"/>
+		</port>
+	</service>
 </definitions>
diff --git a/xsd/siri_wsConsumer-WSDL2.wsdl b/xsd/siri_wsConsumer-WSDL2.wsdl
index b64dd12c..6fb735bc 100644
--- a/xsd/siri_wsConsumer-WSDL2.wsdl
+++ b/xsd/siri_wsConsumer-WSDL2.wsdl
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ======== All the structures are comming from siri.xsd ========= -->
 <description xmlns="http://www.w3.org/ns/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:siriWS="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ns="http://datex2.eu/schema/1_0/1_0" xmlns:ns1="http://www.ifopt.org.uk/acsb" xmlns:ns2="http://www.ifopt.org.uk/ifopt" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" xmlns:ns3="http://datex2.eu/schema/2_0RC1/2_0" targetNamespace="http://wsdl.siri.org.uk">
- <types>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
-   <xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Framework.xsd"/>
-   <xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Services.xsd"/>
-  </xsd:schema>
- </types>
- <interface name="SiriConsumerWsdl2Port">
-  <operation name="NotifyDataReady" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyDataReady"/>
-  </operation>
-  <operation name="NotifyHeartbeat" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyHeartbeat"/>
-  </operation>
-  <operation name="NotifySubscriptionTerminated" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifySubscriptionTerminated"/>
-  </operation>
-  <!-- == Service Specific == -->
-  <operation name="NotifyProductionTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyProductionTimetable"/>
-  </operation>
-  <operation name="NotifyEstimatedTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyEstimatedTimetable"/>
-  </operation>
-  <operation name="NotifyStopTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyStopTimetable"/>
-  </operation>
-  <operation name="NotifyStopMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyStopMonitoring"/>
-  </operation>
-  <operation name="NotifyVehicleMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyVehicleMonitoring"/>
-  </operation>
-  <operation name="NotifyConnectionTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyConnectionTimetable"/>
-  </operation>
-  <operation name="NotifyConnectionMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyConnectionMonitoring"/>
-  </operation>
-  <operation name="NotifyGeneralMessage" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyGeneralMessage"/>
-  </operation>
-  <operation name="NotifyFacilityMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyFacilityMonitoring"/>
-  </operation>
-  <operation name="NotifySituationExchange" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifySituationExchange"/>
-  </operation>
-  <operation name="NotifyControlAction" pattern="http://www.w3.org/ns/wsdl/in-only">
-   <input element="siriWS:NotifyControlAction"/>
-  </operation>
- </interface>
- <binding name="SiriConsumerWsdl2Binding" interface="siriWS:SiriConsumerWsdl2Port" type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/">
-  <operation ref="siriWS:NotifyDataReady">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyHeartbeat">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifySubscriptionTerminated">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyProductionTimetable">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyEstimatedTimetable">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyStopTimetable">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyStopMonitoring">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyVehicleMonitoring">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyConnectionTimetable">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyConnectionMonitoring">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyGeneralMessage">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyFacilityMonitoring">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifySituationExchange">
-   <input/>
-  </operation>
-  <operation ref="siriWS:NotifyControlAction">
-   <input/>
-  </operation>
- </binding>
- <service name="SiriConsumerWsdl2Services" interface="siriWS:SiriConsumerWsdl2Port">
-  <endpoint name="SiriWSPort" binding="siriWS:SiriConsumerWsdl2Binding" address="http://www.siri-service-location.com"/>
- </service>
+	<types>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
+			<xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Framework.xsd"/>
+			<xsd:include schemaLocation="wsdl_model/siri_wsConsumer-Services.xsd"/>
+		</xsd:schema>
+	</types>
+	<interface name="SiriConsumerWsdl2Port">
+		<operation name="NotifyDataReady" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyDataReady"/>
+		</operation>
+		<operation name="NotifyHeartbeat" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyHeartbeat"/>
+		</operation>
+		<operation name="NotifySubscriptionTerminated" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifySubscriptionTerminated"/>
+		</operation>
+		<!-- == Service Specific == -->
+		<operation name="NotifyProductionTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyProductionTimetable"/>
+		</operation>
+		<operation name="NotifyEstimatedTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyEstimatedTimetable"/>
+		</operation>
+		<operation name="NotifyStopTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyStopTimetable"/>
+		</operation>
+		<operation name="NotifyStopMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyStopMonitoring"/>
+		</operation>
+		<operation name="NotifyVehicleMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyVehicleMonitoring"/>
+		</operation>
+		<operation name="NotifyConnectionTimetable" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyConnectionTimetable"/>
+		</operation>
+		<operation name="NotifyConnectionMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyConnectionMonitoring"/>
+		</operation>
+		<operation name="NotifyGeneralMessage" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyGeneralMessage"/>
+		</operation>
+		<operation name="NotifyFacilityMonitoring" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyFacilityMonitoring"/>
+		</operation>
+		<operation name="NotifySituationExchange" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifySituationExchange"/>
+		</operation>
+		<operation name="NotifyControlAction" pattern="http://www.w3.org/ns/wsdl/in-only">
+			<input element="siriWS:NotifyControlAction"/>
+		</operation>
+	</interface>
+	<binding name="SiriConsumerWsdl2Binding" interface="siriWS:SiriConsumerWsdl2Port" type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/">
+		<operation ref="siriWS:NotifyDataReady">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyHeartbeat">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifySubscriptionTerminated">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyProductionTimetable">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyEstimatedTimetable">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyStopTimetable">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyStopMonitoring">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyVehicleMonitoring">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyConnectionTimetable">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyConnectionMonitoring">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyGeneralMessage">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyFacilityMonitoring">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifySituationExchange">
+			<input/>
+		</operation>
+		<operation ref="siriWS:NotifyControlAction">
+			<input/>
+		</operation>
+	</binding>
+	<service name="SiriConsumerWsdl2Services" interface="siriWS:SiriConsumerWsdl2Port">
+		<endpoint name="SiriWSPort" binding="siriWS:SiriConsumerWsdl2Binding" address="http://www.siri-service-location.com"/>
+	</service>
 </description>
diff --git a/xsd/siri_wsConsumer.wsdl b/xsd/siri_wsConsumer.wsdl
index 063f5ad4..c67c1b16 100644
--- a/xsd/siri_wsConsumer.wsdl
+++ b/xsd/siri_wsConsumer.wsdl
@@ -1,214 +1,214 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ======== All the structures are comming from siri.xsd ========= -->
 <definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:siriWS="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ns="http://datex2.eu/schema/2_0RC1/2_0" xmlns:ns1="http://www.ifopt.org.uk/acsb" xmlns:ns2="http://www.ifopt.org.uk/ifopt" targetNamespace="http://wsdl.siri.org.uk">
- <types>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri">
-   <xsd:include schemaLocation="siri.xsd"/>
-  </xsd:schema>
- </types>
- <message name="HeartbeatNotify">
-  <part name="HeartbeatNotifyInfo" type="siri:ProducerRequestEndpointStructure"/>
-  <part name="Notification" type="siri:CheckStatusResponseBodyStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="DataReadyNotify">
-  <part name="Notification" type="siri:DataReadyRequestStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="SubscriptionTerminatedNotify">
-  <part name="Notification" type="siri:SubscriptionTerminatedNotificationStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ProductionTimetableNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:ProductionTimetableDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="EstimatedTimetableNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:EstimatedTimetableDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopTimetableNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:StopTimetableDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopMonitoringNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:StopMonitoringDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="VehicleMonitoringNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:VehicleMonitoringDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionTimetableNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:ConnectionTimetableDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionMonitoringNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:ConnectionMonitoringDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="GeneralMessageNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:GeneralMessageDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="FacilityMonitoringNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:FacilityMonitoringDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="SituationExchangeNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:SituationExchangeDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ControlActionNotify">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Notification" type="siri:ControlActionDeliveriesStructure"/>
-  <part name="SiriExtension" type="siri:ExtensionsStructure"/>
- </message>
- <portType name="SiriConsumerRpcPort">
-  <operation name="NotifyDataReady">
-   <input message="siriWS:DataReadyNotify"/>
-  </operation>
-  <operation name="NotifyHeartbeat">
-   <input message="siriWS:HeartbeatNotify"/>
-  </operation>
-  <operation name="NotifySubscriptionTerminated">
-   <input message="siriWS:SubscriptionTerminatedNotify"/>
-  </operation>
-  <!-- == Service Specific == -->
-  <operation name="NotifyProductionTimetable">
-   <input message="siriWS:ProductionTimetableNotify"/>
-  </operation>
-  <operation name="NotifyEstimatedTimetable">
-   <input message="siriWS:EstimatedTimetableNotify"/>
-  </operation>
-  <operation name="NotifyStopTimetable">
-   <input message="siriWS:StopTimetableNotify"/>
-  </operation>
-  <operation name="NotifyStopMonitoring">
-   <input message="siriWS:StopMonitoringNotify"/>
-  </operation>
-  <operation name="NotifyVehicleMonitoring">
-   <input message="siriWS:VehicleMonitoringNotify"/>
-  </operation>
-  <operation name="NotifyConnectionTimetable">
-   <input message="siriWS:ConnectionTimetableNotify"/>
-  </operation>
-  <operation name="NotifyConnectionMonitoring">
-   <input message="siriWS:ConnectionMonitoringNotify"/>
-  </operation>
-  <operation name="NotifyGeneralMessage">
-   <input message="siriWS:GeneralMessageNotify"/>
-  </operation>
-  <operation name="NotifyFacilityMonitoring">
-   <input message="siriWS:FacilityMonitoringNotify"/>
-  </operation>
-  <operation name="NotifySituationExchange">
-   <input message="siriWS:SituationExchangeNotify"/>
-  </operation>
-  <operation name="NotifyControlAction">
-   <input message="siriWS:ControlActionNotify"/>
-  </operation>
- </portType>
- <binding name="SiriConsumerRpcBinding" type="siriWS:SiriConsumerRpcPort">
-  <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-  <operation name="NotifyDataReady">
-   <soap:operation soapAction="NotifyDataReady"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyHeartbeat">
-   <soap:operation soapAction="NotifyHeartbeat"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifySubscriptionTerminated">
-   <soap:operation soapAction="NotifySubscriptionTerminate"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyProductionTimetable">
-   <soap:operation soapAction="GetProductionTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyEstimatedTimetable">
-   <soap:operation soapAction="GetEstimatedTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyStopTimetable">
-   <soap:operation soapAction="GetStopTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyStopMonitoring">
-   <soap:operation soapAction="GetStopMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyVehicleMonitoring">
-   <soap:operation soapAction="GetVehicleMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyConnectionTimetable">
-   <soap:operation soapAction="GetConnectionTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyConnectionMonitoring">
-   <soap:operation soapAction="GetConnectionMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyGeneralMessage">
-   <soap:operation soapAction="GetGeneralMessage"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyFacilityMonitoring">
-   <soap:operation soapAction="GetFacilityMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifySituationExchange">
-   <soap:operation soapAction="GetSituationExchange"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
-  <operation name="NotifyControlAction">
-   <soap:operation soapAction="GetControlAction"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-  </operation>
- </binding>
- <service name="SiriConsumerRpcServices">
-  <port name="SiriWSPort" binding="siriWS:SiriConsumerRpcBinding">
-   <soap:address location="http://www.siri-service-location.com"/>
-  </port>
- </service>
+	<types>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri">
+			<xsd:include schemaLocation="siri.xsd"/>
+		</xsd:schema>
+	</types>
+	<message name="HeartbeatNotify">
+		<part name="HeartbeatNotifyInfo" type="siri:ProducerRequestEndpointStructure"/>
+		<part name="Notification" type="siri:CheckStatusResponseBodyStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="DataReadyNotify">
+		<part name="Notification" type="siri:DataReadyRequestStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="SubscriptionTerminatedNotify">
+		<part name="Notification" type="siri:SubscriptionTerminatedNotificationStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ProductionTimetableNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:ProductionTimetableDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="EstimatedTimetableNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:EstimatedTimetableDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopTimetableNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:StopTimetableDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopMonitoringNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:StopMonitoringDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="VehicleMonitoringNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:VehicleMonitoringDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionTimetableNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:ConnectionTimetableDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionMonitoringNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:ConnectionMonitoringDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="GeneralMessageNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:GeneralMessageDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="FacilityMonitoringNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:FacilityMonitoringDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="SituationExchangeNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:SituationExchangeDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ControlActionNotify">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Notification" type="siri:ControlActionDeliveriesStructure"/>
+		<part name="SiriExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<portType name="SiriConsumerRpcPort">
+		<operation name="NotifyDataReady">
+			<input message="siriWS:DataReadyNotify"/>
+		</operation>
+		<operation name="NotifyHeartbeat">
+			<input message="siriWS:HeartbeatNotify"/>
+		</operation>
+		<operation name="NotifySubscriptionTerminated">
+			<input message="siriWS:SubscriptionTerminatedNotify"/>
+		</operation>
+		<!-- == Service Specific == -->
+		<operation name="NotifyProductionTimetable">
+			<input message="siriWS:ProductionTimetableNotify"/>
+		</operation>
+		<operation name="NotifyEstimatedTimetable">
+			<input message="siriWS:EstimatedTimetableNotify"/>
+		</operation>
+		<operation name="NotifyStopTimetable">
+			<input message="siriWS:StopTimetableNotify"/>
+		</operation>
+		<operation name="NotifyStopMonitoring">
+			<input message="siriWS:StopMonitoringNotify"/>
+		</operation>
+		<operation name="NotifyVehicleMonitoring">
+			<input message="siriWS:VehicleMonitoringNotify"/>
+		</operation>
+		<operation name="NotifyConnectionTimetable">
+			<input message="siriWS:ConnectionTimetableNotify"/>
+		</operation>
+		<operation name="NotifyConnectionMonitoring">
+			<input message="siriWS:ConnectionMonitoringNotify"/>
+		</operation>
+		<operation name="NotifyGeneralMessage">
+			<input message="siriWS:GeneralMessageNotify"/>
+		</operation>
+		<operation name="NotifyFacilityMonitoring">
+			<input message="siriWS:FacilityMonitoringNotify"/>
+		</operation>
+		<operation name="NotifySituationExchange">
+			<input message="siriWS:SituationExchangeNotify"/>
+		</operation>
+		<operation name="NotifyControlAction">
+			<input message="siriWS:ControlActionNotify"/>
+		</operation>
+	</portType>
+	<binding name="SiriConsumerRpcBinding" type="siriWS:SiriConsumerRpcPort">
+		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="NotifyDataReady">
+			<soap:operation soapAction="NotifyDataReady"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyHeartbeat">
+			<soap:operation soapAction="NotifyHeartbeat"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifySubscriptionTerminated">
+			<soap:operation soapAction="NotifySubscriptionTerminate"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyProductionTimetable">
+			<soap:operation soapAction="GetProductionTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyEstimatedTimetable">
+			<soap:operation soapAction="GetEstimatedTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyStopTimetable">
+			<soap:operation soapAction="GetStopTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyStopMonitoring">
+			<soap:operation soapAction="GetStopMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyVehicleMonitoring">
+			<soap:operation soapAction="GetVehicleMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyConnectionTimetable">
+			<soap:operation soapAction="GetConnectionTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyConnectionMonitoring">
+			<soap:operation soapAction="GetConnectionMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyGeneralMessage">
+			<soap:operation soapAction="GetGeneralMessage"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyFacilityMonitoring">
+			<soap:operation soapAction="GetFacilityMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifySituationExchange">
+			<soap:operation soapAction="GetSituationExchange"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+		<operation name="NotifyControlAction">
+			<soap:operation soapAction="GetControlAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+		</operation>
+	</binding>
+	<service name="SiriConsumerRpcServices">
+		<port name="SiriWSPort" binding="siriWS:SiriConsumerRpcBinding">
+			<soap:address location="http://www.siri-service-location.com"/>
+		</port>
+	</service>
 </definitions>
diff --git a/xsd/siri_wsProducer-Document.wsdl b/xsd/siri_wsProducer-Document.wsdl
index ce01b2c2..35099ac0 100644
--- a/xsd/siri_wsProducer-Document.wsdl
+++ b/xsd/siri_wsProducer-Document.wsdl
@@ -1,585 +1,585 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ======== All the structures are comming from siri.xsd ========= -->
 <definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:siriWS="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ns="http://datex2.eu/schema/1_0/1_0" xmlns:ns1="http://www.ifopt.org.uk/acsb" xmlns:ns2="http://www.ifopt.org.uk/ifopt" targetNamespace="http://wsdl.siri.org.uk">
- <types>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
-   <xsd:include schemaLocation="wsdl_model/siri_wsProducer-Framework.xsd"/>
-   <xsd:include schemaLocation="wsdl_model/siri_wsProducer-DiscoveryCapability.xsd"/>
-   <xsd:include schemaLocation="wsdl_model/siri_wsProducer-Services.xsd"/>
-  </xsd:schema>
- </types>
- <message name="CheckStatusRequest">
-  <part name="CheckStatusRequestParameters" element="siriWS:CheckStatus"/>
- </message>
- <message name="CheckStatusAnswer">
-  <part name="CheckStatusAnswerParameters" element="siriWS:CheckStatusResponse"/>
- </message>
- <message name="CheckStatusError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="SubscriptionRequest">
-  <part name="SubscriptionRequestParameters" element="siriWS:Subscribe"/>
- </message>
- <message name="SubscriptionAnswer">
-  <part name="SubscriptionAnswerParameters" element="siriWS:SubscribeResponse"/>
- </message>
- <message name="SubscriptionError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="DeleteSubscriptionRequest">
-  <part name="DeleteSubscriptionRequestParameters" element="siriWS:DeleteSubscription"/>
- </message>
- <message name="DeleteSubscriptionAnswer">
-  <part name="DeleteSubscriptionAnswerParameters" element="siriWS:DeleteSubscriptionResponse"/>
- </message>
- <message name="DeleteSubscriptionError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="DataSupplyRequest">
-  <part name="DataSupplyRequestParameters" element="siriWS:DataSupply"/>
- </message>
- <message name="DataSupplyAnswer">
-  <part name="DataSupplyAnswerParameters" element="siriWS:DataSupplyResponse"/>
- </message>
- <message name="DataSupplyError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="ProductionTimetableRequest">
-  <part name="ProductionTimetableRequestParameters" element="siriWS:GetProductionTimetable"/>
- </message>
- <message name="ProductionTimetableAnswer">
-  <part name="ProductionTimetableAnswerParameters" element="siriWS:GetProductionTimetableResponse"/>
- </message>
- <message name="ProductionTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="EstimatedTimetableRequest">
-  <part name="EstimatedTimetableRequestParameters" element="siriWS:GetEstimatedTimetable"/>
- </message>
- <message name="EstimatedTimetableAnswer">
-  <part name="EstimatedTimetableAnswerParameters" element="siriWS:GetEstimatedTimetableResponse"/>
- </message>
- <message name="EstimatedTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="StopTimetableRequest">
-  <part name="StopTimetableRequestParameters" element="siriWS:GetStopTimetable"/>
- </message>
- <message name="StopTimetableAnswer">
-  <part name="StopTimetableAnswerParameters" element="siriWS:GetStopTimetableResponse"/>
- </message>
- <message name="StopTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="StopMonitoringRequest">
-  <part name="StopMonitoringRequestParameters" element="siriWS:GetStopMonitoring"/>
- </message>
- <message name="StopMonitoringMultipleRequest">
-  <part name="StopMonitoringMultipleRequestParameters" element="siriWS:GetMultipleStopMonitoring"/>
- </message>
- <message name="StopMonitoringAnswer">
-  <part name="StopMonitoringAnswerParameters" element="siriWS:GetStopMonitoringResponse"/>
- </message>
- <message name="StopMonitoringMultipleAnswer">
-  <part name="StopMonitoringMultipleAnswerParameters" element="siriWS:GetMultipleStopMonitoringResponse"/>
- </message>
- <message name="StopMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="VehicleMonitoringRequest">
-  <part name="VehicleMonitoringRequestParameters" element="siriWS:GetVehicleMonitoring"/>
- </message>
- <message name="VehicleMonitoringAnswer">
-  <part name="VehicleMonitoringAnswerParameters" element="siriWS:GetVehicleMonitoringResponse"/>
- </message>
- <message name="VehicleMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="ConnectionTimetableRequest">
-  <part name="ConnectionTimetableRequestParameters" element="siriWS:GetConnectionTimetable"/>
- </message>
- <message name="ConnectionTimetableAnswer">
-  <part name="ConnectionTimetableAnswerParameters" element="siriWS:GetConnectionTimetableResponse"/>
- </message>
- <message name="ConnectionTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="ConnectionMonitoringRequest">
-  <part name="ConnectionMonitoringRequestParameters" element="siriWS:GetConnectionMonitoring"/>
- </message>
- <message name="ConnectionMonitoringAnswer">
-  <part name="ConnectionMonitoringAnswerParameters" element="siriWS:GetConnectionMonitoringResponse"/>
- </message>
- <message name="ConnectionMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="GeneralMessageRequest">
-  <part name="GeneralMessageRequestParameters" element="siriWS:GetGeneralMessage"/>
- </message>
- <message name="GeneralMessageAnswer">
-  <part name="GeneralMessageAnswerParameters" element="siriWS:GetGeneralMessageResponse"/>
- </message>
- <message name="GeneralMessageError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="FacilityMonitoringRequest">
-  <part name="FacilityMonitoringRequestParameters" element="siriWS:GetFacilityMonitoring"/>
- </message>
- <message name="FacilityMonitoringAnswer">
-  <part name="FacilityMonitoringAnswerParameters" element="siriWS:GetFacilityMonitoringResponse"/>
- </message>
- <message name="FacilityMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="SituationExchangeRequest">
-  <part name="SituationExchangeRequestParameters" element="siriWS:GetSituationExchange"/>
- </message>
- <message name="SituationExchangeAnswer">
-  <part name="SituationExchangeAnswerParameters" element="siriWS:GetSituationExchangeResponse"/>
- </message>
- <message name="SituationExchangeError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="ControlActionRequest">
-  <part name="ControlActionRequestParameters" element="siriWS:GetControlAction"/>
- </message>
- <message name="ControlActionAnswer">
-  <part name="ControlActionAnswerParameters" element="siriWS:GetControlActionResponse"/>
- </message>
- <message name="ControlActionError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </message> 
- <message name="GetCapabilitiesRequest">
-  <part name="GetCapabilitiesRequestParameters" element="siriWS:GetCapabilities"/>
- </message>
- <message name="GetCapabilitiesAnswer">
-  <part name="GetCapabilitiesAnswerParameters" element="siriWS:GetCapabilitiesResponse"/>
- </message>
- <message name="GetCapabilitiesError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="StopPointsDiscoveryRequest">
-  <part name="StopPointsDiscoveryRequestParameters" element="siriWS:StopPointsDiscovery"/>
- </message>
- <message name="StopPointsDiscoveryAnswer">
-  <part name="StopPointsDiscoveryAnswerParameters" element="siriWS:StopPointsDiscoveryResponse"/>
- </message>
- <message name="StopPointsDiscoveryError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="LinesDiscoveryRequest">
-  <part name="LinesDiscoveryRequestParameters" element="siriWS:LinesDiscovery"/>
- </message>
- <message name="LinesDiscoveryAnswer">
-  <part name="LinesDiscoveryAnswerParameters" element="siriWS:LinesDiscoveryResponse"/>
- </message>
- <message name="LinesDiscoveryError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="ConnectionLinksDiscoveryRequest">
-  <part name="ConnectionLinksDiscoveryRequestParameters" element="siriWS:ConnectionLinksDiscovery"/>
- </message>
- <message name="ConnectionLinksDiscoveryAnswer">
-  <part name="ConnectionLinksDiscoveryAnswerParameters" element="siriWS:ConnectionLinksDiscoveryResponse"/>
- </message>
- <message name="ConnectionLinksDiscoveryError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siriWS:WSErrorConditionElement"/>
- </message>
- <message name="SiriServiceRequest">
-  <part name="SiriServiceRequestParameters" element="siriWS:GetSiriService"/>
- </message>
- <message name="SiriServiceAnswer">
-  <part name="SiriServiceAnswerParameters" element="siriWS:GetSiriServiceResponse"/>
- </message>
- <portType name="SiriProducerDocPort">
-  <!-- ====PORTS ================================================================================== -->
-  <operation name="Subscribe">
-   <input message="siriWS:SubscriptionRequest"/>
-   <output message="siriWS:SubscriptionAnswer"/>
-   <fault name="FaultName" message="siriWS:SubscriptionError"/>
-  </operation>
-  <operation name="DeleteSubscription">
-   <input message="siriWS:DeleteSubscriptionRequest"/>
-   <output message="siriWS:DeleteSubscriptionAnswer"/>
-   <fault name="FaultName" message="siriWS:DeleteSubscriptionError"/>
-  </operation>
-  <operation name="DataSupply">
-   <input message="siriWS:DataSupplyRequest"/>
-   <output message="siriWS:DataSupplyAnswer"/>
-   <fault name="FaultName" message="siriWS:DataSupplyError"/>
-  </operation>
-  <operation name="CheckStatus">
-   <input message="siriWS:CheckStatusRequest"/>
-   <output message="siriWS:CheckStatusAnswer"/>
-   <fault name="FaultName" message="siriWS:CheckStatusError"/>
-  </operation>
-  <operation name="GetProductionTimetable">
-   <input message="siriWS:ProductionTimetableRequest"/>
-   <output message="siriWS:ProductionTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:ProductionTimetableError"/>
-  </operation>
-  <operation name="GetEstimatedTimetable">
-   <input message="siriWS:EstimatedTimetableRequest"/>
-   <output message="siriWS:EstimatedTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:EstimatedTimetableError"/>
-  </operation>
-  <operation name="GetStopTimetable">
-   <input message="siriWS:StopTimetableRequest"/>
-   <output message="siriWS:StopTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:StopTimetableError"/>
-  </operation>
-  <operation name="GetStopMonitoring">
-   <input message="siriWS:StopMonitoringRequest"/>
-   <output message="siriWS:StopMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:StopMonitoringError"/>
-  </operation>
-  <operation name="GetMultipleStopMonitoring">
-   <documentation>GetMultipleStopMonitoring deprecated from Siri 2.0 (use GetSiriService instead)</documentation>
-   <input message="siriWS:StopMonitoringMultipleRequest"/>
-   <output message="siriWS:StopMonitoringMultipleAnswer"/>
-   <fault name="FaultName" message="siriWS:StopMonitoringError"/>
-  </operation>
-  <operation name="GetVehicleMonitoring">
-   <input message="siriWS:VehicleMonitoringRequest"/>
-   <output message="siriWS:VehicleMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:VehicleMonitoringError"/>
-  </operation>
-  <operation name="GetConnectionTimetable">
-   <input message="siriWS:ConnectionTimetableRequest"/>
-   <output message="siriWS:ConnectionTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:ConnectionTimetableError"/>
-  </operation>
-  <operation name="GetConnectionMonitoring">
-   <input message="siriWS:ConnectionMonitoringRequest"/>
-   <output message="siriWS:ConnectionMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:ConnectionMonitoringError"/>
-  </operation>
-  <operation name="GetGeneralMessage">
-   <input message="siriWS:GeneralMessageRequest"/>
-   <output message="siriWS:GeneralMessageAnswer"/>
-   <fault name="FaultName" message="siriWS:GeneralMessageError"/>
-  </operation>
-  <operation name="GetFacilityMonitoring">
-   <input message="siriWS:FacilityMonitoringRequest"/>
-   <output message="siriWS:FacilityMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:FacilityMonitoringError"/>
-  </operation>
-  <operation name="GetSituationExchange">
-   <input message="siriWS:SituationExchangeRequest"/>
-   <output message="siriWS:SituationExchangeAnswer"/>
-   <fault name="FaultName" message="siriWS:SituationExchangeError"/>
-  </operation>
-  <operation name="GetControlAction">
-   <input message="siriWS:ControlActionRequest"/>
-   <output message="siriWS:ControlActionAnswer"/>
-   <fault name="FaultName" message="siriWS:ControlActionError"/>
-  </operation>  
-  <operation name="GetCapabilities">
-   <input message="siriWS:GetCapabilitiesRequest"/>
-   <output message="siriWS:GetCapabilitiesAnswer"/>
-   <fault name="FaultName" message="siriWS:GetCapabilitiesError"/>
-  </operation>
-  <operation name="StopPointsDiscovery">
-   <input message="siriWS:StopPointsDiscoveryRequest"/>
-   <output message="siriWS:StopPointsDiscoveryAnswer"/>
-   <fault name="FaultName" message="siriWS:StopPointsDiscoveryError"/>
-  </operation>
-  <operation name="LinesDiscovery">
-   <input message="siriWS:LinesDiscoveryRequest"/>
-   <output message="siriWS:LinesDiscoveryAnswer"/>
-   <fault name="FaultName" message="siriWS:LinesDiscoveryError"/>
-  </operation>
-  <operation name="ConnectionLinksDiscovery">
-   <input message="siriWS:ConnectionLinksDiscoveryRequest"/>
-   <output message="siriWS:ConnectionLinksDiscoveryAnswer"/>
-   <fault name="FaultName" message="siriWS:ConnectionLinksDiscoveryError"/>
-  </operation>
-  <!-- SIRI 2.x addition : global SIRI service access (access to any SIRI services) -->
-  <operation name="GetSiriService">
-   <documentation>SIRI 2.x : Single access to any SIRI Service</documentation>
-   <input message="siriWS:SiriServiceRequest"/>
-   <output message="siriWS:SiriServiceAnswer"/>
-  </operation>
- </portType>
- <binding name="SiriProducerDocBinding" type="siriWS:SiriProducerDocPort">
-  <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-  <!-- ====BINDINGS  ================================================================================== -->
-  <!-- ====general  services ===== -->
-  <operation name="Subscribe">
-   <soap:operation soapAction="Subscribe"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="DeleteSubscription">
-   <soap:operation soapAction="DeleteSubscription"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="DataSupply">
-   <soap:operation soapAction="DataSupply"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="CheckStatus">
-   <soap:operation soapAction="CheckStatus"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <!-- ====SIRI services ===== -->
-  <operation name="GetProductionTimetable">
-   <soap:operation soapAction="GetProductionTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetEstimatedTimetable">
-   <soap:operation soapAction="GetEstimatedTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetStopTimetable">
-   <soap:operation soapAction="GetStopTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetStopMonitoring">
-   <soap:operation soapAction="GetStopMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetMultipleStopMonitoring">
-   <soap:operation soapAction="GetMultipleStopMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetVehicleMonitoring">
-   <soap:operation soapAction="GetVehicleMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetConnectionTimetable">
-   <soap:operation soapAction="GetConnectionTimetable"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetConnectionMonitoring">
-   <soap:operation soapAction="GetConnectionMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetGeneralMessage">
-   <soap:operation soapAction="GetGeneralMessage"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetFacilityMonitoring">
-   <soap:operation soapAction="GetFacilityMonitoring"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetSituationExchange">
-   <soap:operation soapAction="GetSituationExchange"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetControlAction">
-   <soap:operation soapAction="GetControlAction"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>  
-  <operation name="GetCapabilities">
-   <soap:operation soapAction="GetCapabilities"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <!-- ====Access to any Siri Service (from 2.0) ===== -->
-  <operation name="GetSiriService">
-   <soap:operation soapAction="GetSiriService"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-  </operation>
-  <!-- ====Discovery  services ===== -->
-  <operation name="StopPointsDiscovery">
-   <soap:operation soapAction="StopPointsDiscovery"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="LinesDiscovery">
-   <soap:operation soapAction="LinesDiscovery"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="ConnectionLinksDiscovery">
-   <soap:operation soapAction="ConnectionLinksDiscovery"/>
-   <input>
-    <soap:body use="literal"/>
-   </input>
-   <output>
-    <soap:body use="literal"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
- </binding>
- <service name="SiriProducerDocServices">
-  <port name="SiriWSPort" binding="siriWS:SiriProducerDocBinding">
-   <soap:address location="http://www.siri-service-location.com"/>
-  </port>
- </service>
+	<types>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
+			<xsd:include schemaLocation="wsdl_model/siri_wsProducer-Framework.xsd"/>
+			<xsd:include schemaLocation="wsdl_model/siri_wsProducer-DiscoveryCapability.xsd"/>
+			<xsd:include schemaLocation="wsdl_model/siri_wsProducer-Services.xsd"/>
+		</xsd:schema>
+	</types>
+	<message name="CheckStatusRequest">
+		<part name="CheckStatusRequestParameters" element="siriWS:CheckStatus"/>
+	</message>
+	<message name="CheckStatusAnswer">
+		<part name="CheckStatusAnswerParameters" element="siriWS:CheckStatusResponse"/>
+	</message>
+	<message name="CheckStatusError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="SubscriptionRequest">
+		<part name="SubscriptionRequestParameters" element="siriWS:Subscribe"/>
+	</message>
+	<message name="SubscriptionAnswer">
+		<part name="SubscriptionAnswerParameters" element="siriWS:SubscribeResponse"/>
+	</message>
+	<message name="SubscriptionError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="DeleteSubscriptionRequest">
+		<part name="DeleteSubscriptionRequestParameters" element="siriWS:DeleteSubscription"/>
+	</message>
+	<message name="DeleteSubscriptionAnswer">
+		<part name="DeleteSubscriptionAnswerParameters" element="siriWS:DeleteSubscriptionResponse"/>
+	</message>
+	<message name="DeleteSubscriptionError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="DataSupplyRequest">
+		<part name="DataSupplyRequestParameters" element="siriWS:DataSupply"/>
+	</message>
+	<message name="DataSupplyAnswer">
+		<part name="DataSupplyAnswerParameters" element="siriWS:DataSupplyResponse"/>
+	</message>
+	<message name="DataSupplyError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="ProductionTimetableRequest">
+		<part name="ProductionTimetableRequestParameters" element="siriWS:GetProductionTimetable"/>
+	</message>
+	<message name="ProductionTimetableAnswer">
+		<part name="ProductionTimetableAnswerParameters" element="siriWS:GetProductionTimetableResponse"/>
+	</message>
+	<message name="ProductionTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="EstimatedTimetableRequest">
+		<part name="EstimatedTimetableRequestParameters" element="siriWS:GetEstimatedTimetable"/>
+	</message>
+	<message name="EstimatedTimetableAnswer">
+		<part name="EstimatedTimetableAnswerParameters" element="siriWS:GetEstimatedTimetableResponse"/>
+	</message>
+	<message name="EstimatedTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="StopTimetableRequest">
+		<part name="StopTimetableRequestParameters" element="siriWS:GetStopTimetable"/>
+	</message>
+	<message name="StopTimetableAnswer">
+		<part name="StopTimetableAnswerParameters" element="siriWS:GetStopTimetableResponse"/>
+	</message>
+	<message name="StopTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="StopMonitoringRequest">
+		<part name="StopMonitoringRequestParameters" element="siriWS:GetStopMonitoring"/>
+	</message>
+	<message name="StopMonitoringMultipleRequest">
+		<part name="StopMonitoringMultipleRequestParameters" element="siriWS:GetMultipleStopMonitoring"/>
+	</message>
+	<message name="StopMonitoringAnswer">
+		<part name="StopMonitoringAnswerParameters" element="siriWS:GetStopMonitoringResponse"/>
+	</message>
+	<message name="StopMonitoringMultipleAnswer">
+		<part name="StopMonitoringMultipleAnswerParameters" element="siriWS:GetMultipleStopMonitoringResponse"/>
+	</message>
+	<message name="StopMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="VehicleMonitoringRequest">
+		<part name="VehicleMonitoringRequestParameters" element="siriWS:GetVehicleMonitoring"/>
+	</message>
+	<message name="VehicleMonitoringAnswer">
+		<part name="VehicleMonitoringAnswerParameters" element="siriWS:GetVehicleMonitoringResponse"/>
+	</message>
+	<message name="VehicleMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="ConnectionTimetableRequest">
+		<part name="ConnectionTimetableRequestParameters" element="siriWS:GetConnectionTimetable"/>
+	</message>
+	<message name="ConnectionTimetableAnswer">
+		<part name="ConnectionTimetableAnswerParameters" element="siriWS:GetConnectionTimetableResponse"/>
+	</message>
+	<message name="ConnectionTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="ConnectionMonitoringRequest">
+		<part name="ConnectionMonitoringRequestParameters" element="siriWS:GetConnectionMonitoring"/>
+	</message>
+	<message name="ConnectionMonitoringAnswer">
+		<part name="ConnectionMonitoringAnswerParameters" element="siriWS:GetConnectionMonitoringResponse"/>
+	</message>
+	<message name="ConnectionMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="GeneralMessageRequest">
+		<part name="GeneralMessageRequestParameters" element="siriWS:GetGeneralMessage"/>
+	</message>
+	<message name="GeneralMessageAnswer">
+		<part name="GeneralMessageAnswerParameters" element="siriWS:GetGeneralMessageResponse"/>
+	</message>
+	<message name="GeneralMessageError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="FacilityMonitoringRequest">
+		<part name="FacilityMonitoringRequestParameters" element="siriWS:GetFacilityMonitoring"/>
+	</message>
+	<message name="FacilityMonitoringAnswer">
+		<part name="FacilityMonitoringAnswerParameters" element="siriWS:GetFacilityMonitoringResponse"/>
+	</message>
+	<message name="FacilityMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="SituationExchangeRequest">
+		<part name="SituationExchangeRequestParameters" element="siriWS:GetSituationExchange"/>
+	</message>
+	<message name="SituationExchangeAnswer">
+		<part name="SituationExchangeAnswerParameters" element="siriWS:GetSituationExchangeResponse"/>
+	</message>
+	<message name="SituationExchangeError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="ControlActionRequest">
+		<part name="ControlActionRequestParameters" element="siriWS:GetControlAction"/>
+	</message>
+	<message name="ControlActionAnswer">
+		<part name="ControlActionAnswerParameters" element="siriWS:GetControlActionResponse"/>
+	</message>
+	<message name="ControlActionError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="GetCapabilitiesRequest">
+		<part name="GetCapabilitiesRequestParameters" element="siriWS:GetCapabilities"/>
+	</message>
+	<message name="GetCapabilitiesAnswer">
+		<part name="GetCapabilitiesAnswerParameters" element="siriWS:GetCapabilitiesResponse"/>
+	</message>
+	<message name="GetCapabilitiesError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="StopPointsDiscoveryRequest">
+		<part name="StopPointsDiscoveryRequestParameters" element="siriWS:StopPointsDiscovery"/>
+	</message>
+	<message name="StopPointsDiscoveryAnswer">
+		<part name="StopPointsDiscoveryAnswerParameters" element="siriWS:StopPointsDiscoveryResponse"/>
+	</message>
+	<message name="StopPointsDiscoveryError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="LinesDiscoveryRequest">
+		<part name="LinesDiscoveryRequestParameters" element="siriWS:LinesDiscovery"/>
+	</message>
+	<message name="LinesDiscoveryAnswer">
+		<part name="LinesDiscoveryAnswerParameters" element="siriWS:LinesDiscoveryResponse"/>
+	</message>
+	<message name="LinesDiscoveryError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="ConnectionLinksDiscoveryRequest">
+		<part name="ConnectionLinksDiscoveryRequestParameters" element="siriWS:ConnectionLinksDiscovery"/>
+	</message>
+	<message name="ConnectionLinksDiscoveryAnswer">
+		<part name="ConnectionLinksDiscoveryAnswerParameters" element="siriWS:ConnectionLinksDiscoveryResponse"/>
+	</message>
+	<message name="ConnectionLinksDiscoveryError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siriWS:WSErrorConditionElement"/>
+	</message>
+	<message name="SiriServiceRequest">
+		<part name="SiriServiceRequestParameters" element="siriWS:GetSiriService"/>
+	</message>
+	<message name="SiriServiceAnswer">
+		<part name="SiriServiceAnswerParameters" element="siriWS:GetSiriServiceResponse"/>
+	</message>
+	<portType name="SiriProducerDocPort">
+		<!-- ====PORTS ================================================================================== -->
+		<operation name="Subscribe">
+			<input message="siriWS:SubscriptionRequest"/>
+			<output message="siriWS:SubscriptionAnswer"/>
+			<fault name="FaultName" message="siriWS:SubscriptionError"/>
+		</operation>
+		<operation name="DeleteSubscription">
+			<input message="siriWS:DeleteSubscriptionRequest"/>
+			<output message="siriWS:DeleteSubscriptionAnswer"/>
+			<fault name="FaultName" message="siriWS:DeleteSubscriptionError"/>
+		</operation>
+		<operation name="DataSupply">
+			<input message="siriWS:DataSupplyRequest"/>
+			<output message="siriWS:DataSupplyAnswer"/>
+			<fault name="FaultName" message="siriWS:DataSupplyError"/>
+		</operation>
+		<operation name="CheckStatus">
+			<input message="siriWS:CheckStatusRequest"/>
+			<output message="siriWS:CheckStatusAnswer"/>
+			<fault name="FaultName" message="siriWS:CheckStatusError"/>
+		</operation>
+		<operation name="GetProductionTimetable">
+			<input message="siriWS:ProductionTimetableRequest"/>
+			<output message="siriWS:ProductionTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:ProductionTimetableError"/>
+		</operation>
+		<operation name="GetEstimatedTimetable">
+			<input message="siriWS:EstimatedTimetableRequest"/>
+			<output message="siriWS:EstimatedTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:EstimatedTimetableError"/>
+		</operation>
+		<operation name="GetStopTimetable">
+			<input message="siriWS:StopTimetableRequest"/>
+			<output message="siriWS:StopTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:StopTimetableError"/>
+		</operation>
+		<operation name="GetStopMonitoring">
+			<input message="siriWS:StopMonitoringRequest"/>
+			<output message="siriWS:StopMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:StopMonitoringError"/>
+		</operation>
+		<operation name="GetMultipleStopMonitoring">
+			<documentation>GetMultipleStopMonitoring deprecated from Siri 2.0 (use GetSiriService instead)</documentation>
+			<input message="siriWS:StopMonitoringMultipleRequest"/>
+			<output message="siriWS:StopMonitoringMultipleAnswer"/>
+			<fault name="FaultName" message="siriWS:StopMonitoringError"/>
+		</operation>
+		<operation name="GetVehicleMonitoring">
+			<input message="siriWS:VehicleMonitoringRequest"/>
+			<output message="siriWS:VehicleMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:VehicleMonitoringError"/>
+		</operation>
+		<operation name="GetConnectionTimetable">
+			<input message="siriWS:ConnectionTimetableRequest"/>
+			<output message="siriWS:ConnectionTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:ConnectionTimetableError"/>
+		</operation>
+		<operation name="GetConnectionMonitoring">
+			<input message="siriWS:ConnectionMonitoringRequest"/>
+			<output message="siriWS:ConnectionMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:ConnectionMonitoringError"/>
+		</operation>
+		<operation name="GetGeneralMessage">
+			<input message="siriWS:GeneralMessageRequest"/>
+			<output message="siriWS:GeneralMessageAnswer"/>
+			<fault name="FaultName" message="siriWS:GeneralMessageError"/>
+		</operation>
+		<operation name="GetFacilityMonitoring">
+			<input message="siriWS:FacilityMonitoringRequest"/>
+			<output message="siriWS:FacilityMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:FacilityMonitoringError"/>
+		</operation>
+		<operation name="GetSituationExchange">
+			<input message="siriWS:SituationExchangeRequest"/>
+			<output message="siriWS:SituationExchangeAnswer"/>
+			<fault name="FaultName" message="siriWS:SituationExchangeError"/>
+		</operation>
+		<operation name="GetControlAction">
+			<input message="siriWS:ControlActionRequest"/>
+			<output message="siriWS:ControlActionAnswer"/>
+			<fault name="FaultName" message="siriWS:ControlActionError"/>
+		</operation>
+		<operation name="GetCapabilities">
+			<input message="siriWS:GetCapabilitiesRequest"/>
+			<output message="siriWS:GetCapabilitiesAnswer"/>
+			<fault name="FaultName" message="siriWS:GetCapabilitiesError"/>
+		</operation>
+		<operation name="StopPointsDiscovery">
+			<input message="siriWS:StopPointsDiscoveryRequest"/>
+			<output message="siriWS:StopPointsDiscoveryAnswer"/>
+			<fault name="FaultName" message="siriWS:StopPointsDiscoveryError"/>
+		</operation>
+		<operation name="LinesDiscovery">
+			<input message="siriWS:LinesDiscoveryRequest"/>
+			<output message="siriWS:LinesDiscoveryAnswer"/>
+			<fault name="FaultName" message="siriWS:LinesDiscoveryError"/>
+		</operation>
+		<operation name="ConnectionLinksDiscovery">
+			<input message="siriWS:ConnectionLinksDiscoveryRequest"/>
+			<output message="siriWS:ConnectionLinksDiscoveryAnswer"/>
+			<fault name="FaultName" message="siriWS:ConnectionLinksDiscoveryError"/>
+		</operation>
+		<!-- SIRI 2.x addition : global SIRI service access (access to any SIRI services) -->
+		<operation name="GetSiriService">
+			<documentation>SIRI 2.x : Single access to any SIRI Service</documentation>
+			<input message="siriWS:SiriServiceRequest"/>
+			<output message="siriWS:SiriServiceAnswer"/>
+		</operation>
+	</portType>
+	<binding name="SiriProducerDocBinding" type="siriWS:SiriProducerDocPort">
+		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+		<!-- ====BINDINGS  ================================================================================== -->
+		<!-- ====general  services ===== -->
+		<operation name="Subscribe">
+			<soap:operation soapAction="Subscribe"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="DeleteSubscription">
+			<soap:operation soapAction="DeleteSubscription"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="DataSupply">
+			<soap:operation soapAction="DataSupply"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="CheckStatus">
+			<soap:operation soapAction="CheckStatus"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<!-- ====SIRI services ===== -->
+		<operation name="GetProductionTimetable">
+			<soap:operation soapAction="GetProductionTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetEstimatedTimetable">
+			<soap:operation soapAction="GetEstimatedTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetStopTimetable">
+			<soap:operation soapAction="GetStopTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetStopMonitoring">
+			<soap:operation soapAction="GetStopMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetMultipleStopMonitoring">
+			<soap:operation soapAction="GetMultipleStopMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetVehicleMonitoring">
+			<soap:operation soapAction="GetVehicleMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetConnectionTimetable">
+			<soap:operation soapAction="GetConnectionTimetable"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetConnectionMonitoring">
+			<soap:operation soapAction="GetConnectionMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetGeneralMessage">
+			<soap:operation soapAction="GetGeneralMessage"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetFacilityMonitoring">
+			<soap:operation soapAction="GetFacilityMonitoring"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetSituationExchange">
+			<soap:operation soapAction="GetSituationExchange"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetControlAction">
+			<soap:operation soapAction="GetControlAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetCapabilities">
+			<soap:operation soapAction="GetCapabilities"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<!-- ====Access to any Siri Service (from 2.0) ===== -->
+		<operation name="GetSiriService">
+			<soap:operation soapAction="GetSiriService"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		<!-- ====Discovery  services ===== -->
+		<operation name="StopPointsDiscovery">
+			<soap:operation soapAction="StopPointsDiscovery"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="LinesDiscovery">
+			<soap:operation soapAction="LinesDiscovery"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="ConnectionLinksDiscovery">
+			<soap:operation soapAction="ConnectionLinksDiscovery"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="SiriProducerDocServices">
+		<port name="SiriWSPort" binding="siriWS:SiriProducerDocBinding">
+			<soap:address location="http://www.siri-service-location.com"/>
+		</port>
+	</service>
 </definitions>
diff --git a/xsd/siri_wsProducer-WSDL2.wsdl b/xsd/siri_wsProducer-WSDL2.wsdl
index 27716452..751ada17 100644
--- a/xsd/siri_wsProducer-WSDL2.wsdl
+++ b/xsd/siri_wsProducer-WSDL2.wsdl
@@ -1,239 +1,239 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ======== All the structures are comming from siri.xsd ========= -->
 <description xmlns="http://www.w3.org/ns/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:siriWS="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ns="http://datex2.eu/schema/1_0/1_0" xmlns:ns1="http://www.ifopt.org.uk/acsb" xmlns:ns2="http://www.ifopt.org.uk/ifopt" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" targetNamespace="http://wsdl.siri.org.uk">
- <types>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
-   <xsd:include schemaLocation="wsdl_model/siri_wsProducer-Framework.xsd"/>
-   <xsd:include schemaLocation="wsdl_model/siri_wsProducer-DiscoveryCapability.xsd"/>
-   <xsd:include schemaLocation="wsdl_model/siri_wsProducer-Services.xsd"/>
-  </xsd:schema>
- </types>
- <interface name="SiriProducerWsdl2Port">
-  <!-- ====PORTS ================================================================================== -->
-  <operation name="Subscribe" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:Subscribe"/>
-   <output element="siriWS:SubscribeResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="DeleteSubscription" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:DeleteSubscription"/>
-   <output element="siriWS:DeleteSubscriptionResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="DataSupply" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:DataSupply"/>
-   <output element="siriWS:DataSupplyResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="CheckStatus" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:CheckStatus"/>
-   <output element="siriWS:CheckStatusResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="GetProductionTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetProductionTimetable"/>
-   <output element="siriWS:GetProductionTimetableResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetEstimatedTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetEstimatedTimetable"/>
-   <output element="siriWS:GetEstimatedTimetableResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetStopTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetStopTimetable"/>
-   <output element="siriWS:GetStopTimetableResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetStopMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetStopMonitoring"/>
-   <output element="siriWS:GetStopMonitoringResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetMultipleStopMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <documentation>GetMultipleStopMonitoring deprecated from Siri 2.0 (use GetSiriService instead)</documentation>
-   <input element="siriWS:GetMultipleStopMonitoring"/>
-   <output element="siriWS:GetMultipleStopMonitoringResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetVehicleMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetVehicleMonitoring"/>
-   <output element="siriWS:GetVehicleMonitoringResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetConnectionTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetConnectionTimetable"/>
-   <output element="siriWS:GetConnectionTimetableResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetConnectionMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetConnectionMonitoring"/>
-   <output element="siriWS:GetConnectionMonitoringResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetGeneralMessage" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetGeneralMessage"/>
-   <output element="siriWS:GetGeneralMessageResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetFacilityMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetFacilityMonitoring"/>
-   <output element="siriWS:GetFacilityMonitoringResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetSituationExchange" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetSituationExchange"/>
-   <output element="siriWS:GetSituationExchangeResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetControlAction" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetControlAction"/>
-   <output element="siriWS:GetControlActionResponse"/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation name="GetCapabilities" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:GetCapabilities"/>
-   <output element="siriWS:GetCapabilitiesResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="StopPointsDiscovery" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:StopPointsDiscovery"/>
-   <output element="siriWS:StopPointsDiscoveryResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="LinesDiscovery" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:LinesDiscovery"/>
-   <output element="siriWS:LinesDiscoveryResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation name="ConnectionLinksDiscovery" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <input element="siriWS:ConnectionLinksDiscovery"/>
-   <output element="siriWS:ConnectionLinksDiscoveryResponse"/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <!-- SIRI 2.x addition : global SIRI service access (access to any SIRI services) -->
-  <operation name="GetSiriService" pattern="http://www.w3.org/ns/wsdl/in-out">
-   <documentation>SIRI 2.x : Single access to any SIRI Service</documentation>
-   <input element="siriWS:GetSiriService"/>
-   <output element="siriWS:GetSiriServiceResponse"/>
-  </operation>
-  <fault name="FaultName" element="siriWS:WSErrorConditionElement"/>
-  <fault name="DeliveryFault" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
- </interface>
- <binding name="SiriProducerWsdl2Binding" interface="siriWS:SiriProducerWsdl2Port" type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/">
-  <!-- ====BINDINGS  ================================================================================== -->
-  <!-- ====general  services ===== -->
-  <operation ref="siriWS:Subscribe">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation ref="siriWS:DeleteSubscription">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation ref="siriWS:DataSupply">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation ref="siriWS:CheckStatus">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <!-- ====SIRI services ===== -->
-  <operation ref="siriWS:GetProductionTimetable">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetEstimatedTimetable">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetStopTimetable">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetStopMonitoring">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetMultipleStopMonitoring">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetVehicleMonitoring">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetConnectionTimetable">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetConnectionMonitoring">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetGeneralMessage">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetFacilityMonitoring">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetSituationExchange">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetControlAction">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:DeliveryFault"/>
-  </operation>
-  <operation ref="siriWS:GetCapabilities">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <!-- ====Access to any Siri Service (from 2.0) ===== -->
-  <operation ref="siriWS:GetSiriService">
-   <input/>
-   <output/>
-  </operation>
-  <!-- ====Discovery  services ===== -->
-  <operation ref="siriWS:StopPointsDiscovery">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation ref="siriWS:LinesDiscovery">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <operation ref="siriWS:ConnectionLinksDiscovery">
-   <input/>
-   <output/>
-   <outfault ref="siriWS:FaultName"/>
-  </operation>
-  <fault ref="siriWS:FaultName"/>
-  <fault ref="siriWS:DeliveryFault"/>
- </binding>
- <service name="SiriProducerWsdl2Services" interface="siriWS:SiriProducerWsdl2Port">
-  <endpoint name="SiriWSPort" binding="siriWS:SiriProducerWsdl2Binding" address="http://www.siri-service-location.com"/>
- </service>
+	<types>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk">
+			<xsd:include schemaLocation="wsdl_model/siri_wsProducer-Framework.xsd"/>
+			<xsd:include schemaLocation="wsdl_model/siri_wsProducer-DiscoveryCapability.xsd"/>
+			<xsd:include schemaLocation="wsdl_model/siri_wsProducer-Services.xsd"/>
+		</xsd:schema>
+	</types>
+	<interface name="SiriProducerWsdl2Port">
+		<!-- ====PORTS ================================================================================== -->
+		<operation name="Subscribe" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:Subscribe"/>
+			<output element="siriWS:SubscribeResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="DeleteSubscription" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:DeleteSubscription"/>
+			<output element="siriWS:DeleteSubscriptionResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="DataSupply" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:DataSupply"/>
+			<output element="siriWS:DataSupplyResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="CheckStatus" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:CheckStatus"/>
+			<output element="siriWS:CheckStatusResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="GetProductionTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetProductionTimetable"/>
+			<output element="siriWS:GetProductionTimetableResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetEstimatedTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetEstimatedTimetable"/>
+			<output element="siriWS:GetEstimatedTimetableResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetStopTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetStopTimetable"/>
+			<output element="siriWS:GetStopTimetableResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetStopMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetStopMonitoring"/>
+			<output element="siriWS:GetStopMonitoringResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetMultipleStopMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<documentation>GetMultipleStopMonitoring deprecated from Siri 2.0 (use GetSiriService instead)</documentation>
+			<input element="siriWS:GetMultipleStopMonitoring"/>
+			<output element="siriWS:GetMultipleStopMonitoringResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetVehicleMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetVehicleMonitoring"/>
+			<output element="siriWS:GetVehicleMonitoringResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetConnectionTimetable" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetConnectionTimetable"/>
+			<output element="siriWS:GetConnectionTimetableResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetConnectionMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetConnectionMonitoring"/>
+			<output element="siriWS:GetConnectionMonitoringResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetGeneralMessage" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetGeneralMessage"/>
+			<output element="siriWS:GetGeneralMessageResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetFacilityMonitoring" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetFacilityMonitoring"/>
+			<output element="siriWS:GetFacilityMonitoringResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetSituationExchange" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetSituationExchange"/>
+			<output element="siriWS:GetSituationExchangeResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetControlAction" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetControlAction"/>
+			<output element="siriWS:GetControlActionResponse"/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation name="GetCapabilities" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:GetCapabilities"/>
+			<output element="siriWS:GetCapabilitiesResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="StopPointsDiscovery" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:StopPointsDiscovery"/>
+			<output element="siriWS:StopPointsDiscoveryResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="LinesDiscovery" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:LinesDiscovery"/>
+			<output element="siriWS:LinesDiscoveryResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation name="ConnectionLinksDiscovery" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<input element="siriWS:ConnectionLinksDiscovery"/>
+			<output element="siriWS:ConnectionLinksDiscoveryResponse"/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<!-- SIRI 2.x addition : global SIRI service access (access to any SIRI services) -->
+		<operation name="GetSiriService" pattern="http://www.w3.org/ns/wsdl/in-out">
+			<documentation>SIRI 2.x : Single access to any SIRI Service</documentation>
+			<input element="siriWS:GetSiriService"/>
+			<output element="siriWS:GetSiriServiceResponse"/>
+		</operation>
+		<fault name="FaultName" element="siriWS:WSErrorConditionElement"/>
+		<fault name="DeliveryFault" element="siriWS:WSServiceDeliveryErrorConditionElement"/>
+	</interface>
+	<binding name="SiriProducerWsdl2Binding" interface="siriWS:SiriProducerWsdl2Port" type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/">
+		<!-- ====BINDINGS  ================================================================================== -->
+		<!-- ====general  services ===== -->
+		<operation ref="siriWS:Subscribe">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation ref="siriWS:DeleteSubscription">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation ref="siriWS:DataSupply">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation ref="siriWS:CheckStatus">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<!-- ====SIRI services ===== -->
+		<operation ref="siriWS:GetProductionTimetable">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetEstimatedTimetable">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetStopTimetable">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetStopMonitoring">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetMultipleStopMonitoring">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetVehicleMonitoring">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetConnectionTimetable">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetConnectionMonitoring">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetGeneralMessage">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetFacilityMonitoring">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetSituationExchange">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetControlAction">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:DeliveryFault"/>
+		</operation>
+		<operation ref="siriWS:GetCapabilities">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<!-- ====Access to any Siri Service (from 2.0) ===== -->
+		<operation ref="siriWS:GetSiriService">
+			<input/>
+			<output/>
+		</operation>
+		<!-- ====Discovery  services ===== -->
+		<operation ref="siriWS:StopPointsDiscovery">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation ref="siriWS:LinesDiscovery">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<operation ref="siriWS:ConnectionLinksDiscovery">
+			<input/>
+			<output/>
+			<outfault ref="siriWS:FaultName"/>
+		</operation>
+		<fault ref="siriWS:FaultName"/>
+		<fault ref="siriWS:DeliveryFault"/>
+	</binding>
+	<service name="SiriProducerWsdl2Services" interface="siriWS:SiriProducerWsdl2Port">
+		<endpoint name="SiriWSPort" binding="siriWS:SiriProducerWsdl2Binding" address="http://www.siri-service-location.com"/>
+	</service>
 </description>
diff --git a/xsd/siri_wsProducer.wsdl b/xsd/siri_wsProducer.wsdl
index 0808e5ca..214a0ec5 100644
--- a/xsd/siri_wsProducer.wsdl
+++ b/xsd/siri_wsProducer.wsdl
@@ -1,660 +1,660 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ======== All the structures are comming from siri.xsd ========= -->
 <definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:siriWS="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ns="http://datex2.eu/schema/1_0/1_0" xmlns:ns1="http://www.ifopt.org.uk/acsb" xmlns:ns2="http://www.ifopt.org.uk/ifopt" xmlns:ns3="http://datex2.eu/schema/2_0RC1/2_0" targetNamespace="http://wsdl.siri.org.uk">
- <types>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri">
-   <xsd:include schemaLocation="siri.xsd"/>
-  </xsd:schema>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdl.siri.org.uk" xmlns:siri="http://www.siri.org.uk/siri">
-   <xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests.xsd"/>
-   <xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_common_services.xsd"/>
-   <xsd:complexType name="WsSubscriptionRequestInfoStructure">
-    <xsd:complexContent>
-     <xsd:extension base="siri:AbstractSubscriptionRequestStructure"/>
-    </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="WsServiceRequestInfoStructure">
-    <xsd:complexContent>
-     <xsd:extension base="siri:ContextualisedRequestStructure"/>
-    </xsd:complexContent>
-   </xsd:complexType>
-  </xsd:schema>
- </types>
- <message name="SubscriptionRequest">
-  <part name="SubscriptionRequestInfo" type="siriWS:WsSubscriptionRequestInfoStructure"/>
-  <part name="Request" type="siri:SiriSubscriptionRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="SubscriptionAnswer">
-  <part name="SubscriptionAnswerInfo" type="siri:ResponseEndpointStructure"/>
-  <part name="Answer" type="siri:SubscriptionResponseBodyStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="SubscriptionError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="DeleteSubscriptionRequest">
-  <part name="DeleteSubscriptionInfo" type="siri:RequestStructure"/>
-  <part name="Request" type="siri:TerminateSubscriptionRequestBodyStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="DeleteSubscriptionAnswer">
-  <part name="DeleteSubscriptionAnswerInfo" type="siri:ResponseEndpointStructure"/>
-  <part name="Answer" type="siri:TerminateSubscriptionResponseStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="DeleteSubscriptionError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="DataSupplyRequest">
-  <part name="DataSupplyRequestInfo" type="siri:ConsumerRequestEndpointStructure"/>
-  <part name="Request" type="siri:DataSupplyRequestBodyStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="DataSupplyError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="DataSupplyAnswer">
-  <part name="DataSupplyAnswerInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:ServiceDeliveryBodyStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="CheckStatusRequest">
-  <part name="Request" type="siri:CheckStatusRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="CheckStatusAnswer">
-  <part name="CheckStatusAnswerInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:CheckStatusResponseBodyStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="CheckStatusError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="ProductionTimetableRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:ProductionTimetableRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ProductionTimetableAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:ProductionTimetableDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ProductionTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="EstimatedTimetableRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:EstimatedTimetableRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="EstimatedTimetableAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:EstimatedTimetableDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="EstimatedTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="StopTimetableRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:StopTimetableRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopTimetableAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:StopTimetableDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="StopMonitoringRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:StopMonitoringRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopMonitoringMultipleRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:StopMonitoringMultipleRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopMonitoringAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:StopMonitoringDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="VehicleMonitoringRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:VehicleMonitoringRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="VehicleMonitoringAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:VehicleMonitoringDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="VehicleMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="ConnectionTimetableRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:ConnectionTimetableRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionTimetableAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:ConnectionTimetableDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionTimetableError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="ConnectionMonitoringRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:ConnectionMonitoringRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionMonitoringAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:ConnectionMonitoringDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="GeneralMessageRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:GeneralMessageRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="GeneralMessageAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:GeneralMessageDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="GeneralMessageError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="FacilityMonitoringRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:FacilityMonitoringRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="FacilityMonitoringAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:FacilityMonitoringDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="FacilityMonitoringError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="SituationExchangeRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:SituationExchangeRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="SituationExchangeAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:SituationExchangeDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="SituationExchangeError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message>
- <message name="ControlActionRequest">
-  <part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
-  <part name="Request" type="siri:ControlActionRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ControlActionAnswer">
-  <part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
-  <part name="Answer" type="siri:ControlActionDeliveriesStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ControlActionError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
- </message> 
- <message name="GetCapabilitiesRequest">
-  <part name="Request" type="siri:CapabilitiesRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="GetCapabilitiesAnswer">
-  <part name="Answer" type="siri:CapabilitiesResponseStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="GetCapabilitiesError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="StopPointsDiscoveryRequest">
-  <part name="Request" type="siri:StopPointsDiscoveryRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopPointsDiscoveryAnswer">
-  <part name="Answer" type="siri:StopPointsDeliveryStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="StopPointsDiscoveryError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="LinesDiscoveryRequest">
-  <part name="Request" type="siri:LinesDiscoveryRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="LinesDiscoveryAnswer">
-  <part name="Answer" type="siri:LinesDeliveryStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="LinesDiscoveryError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="ConnectionLinksDiscoveryRequest">
-  <part name="Request" type="siri:ConnectionLinksDiscoveryRequestStructure"/>
-  <part name="RequestExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionLinksDiscoveryAnswer">
-  <part name="Answer" type="siri:ConnectionLinksDeliveryStructure"/>
-  <part name="AnswerExtension" type="siri:ExtensionsStructure"/>
- </message>
- <message name="ConnectionLinksDiscoveryError">
-  <documentation>SOAP Fault deprecated from Siri 2.0</documentation>
-  <part name="SiriError" element="siri:ErrorConditionElement"/>
- </message>
- <message name="SiriServiceRequest">
-  <part name="Request" type="siri:ServiceRequestStructure"/>
- </message>
- <message name="SiriServiceAnswer">
-  <part name="Answer" type="siri:ServiceDeliveryStructure"/>
- </message>
- <portType name="SiriProducerRpcPort">
-  <documentation>Defines all the SIRI SOAP functionnal access</documentation>
-  <operation name="Subscribe">
-   <input message="siriWS:SubscriptionRequest"/>
-   <output message="siriWS:SubscriptionAnswer"/>
-   <fault name="FaultName" message="siriWS:SubscriptionError"/>
-  </operation>
-  <operation name="DeleteSubscription">
-   <input message="siriWS:DeleteSubscriptionRequest"/>
-   <output message="siriWS:DeleteSubscriptionAnswer"/>
-   <fault name="FaultName" message="siriWS:DeleteSubscriptionError"/>
-  </operation>
-  <operation name="DataSupply">
-   <input message="siriWS:DataSupplyRequest"/>
-   <output message="siriWS:DataSupplyAnswer"/>
-   <fault name="FaultName" message="siriWS:DataSupplyError"/>
-  </operation>
-  <operation name="CheckStatus">
-   <input message="siriWS:CheckStatusRequest"/>
-   <output message="siriWS:CheckStatusAnswer"/>
-   <fault name="FaultName" message="siriWS:CheckStatusError"/>
-  </operation>
-  <operation name="GetProductionTimetable">
-   <input message="siriWS:ProductionTimetableRequest"/>
-   <output message="siriWS:ProductionTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:ProductionTimetableError"/>
-  </operation>
-  <operation name="GetEstimatedTimetable">
-   <input message="siriWS:EstimatedTimetableRequest"/>
-   <output message="siriWS:EstimatedTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:EstimatedTimetableError"/>
-  </operation>
-  <operation name="GetStopTimetable">
-   <input message="siriWS:StopTimetableRequest"/>
-   <output message="siriWS:StopTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:StopTimetableError"/>
-  </operation>
-  <operation name="GetStopMonitoring">
-   <input message="siriWS:StopMonitoringRequest"/>
-   <output message="siriWS:StopMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:StopMonitoringError"/>
-  </operation>
-  <operation name="GetMultipleStopMonitoring">
-   <documentation>GetMultipleStopMonitoring deprecated from Siri 2.0 (use GetSiriService instead)</documentation>
-   <input message="siriWS:StopMonitoringMultipleRequest"/>
-   <output message="siriWS:StopMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:StopMonitoringError"/>
-  </operation>
-  <operation name="GetVehicleMonitoring">
-   <input message="siriWS:VehicleMonitoringRequest"/>
-   <output message="siriWS:VehicleMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:VehicleMonitoringError"/>
-  </operation>
-  <operation name="GetConnectionTimetable">
-   <input message="siriWS:ConnectionTimetableRequest"/>
-   <output message="siriWS:ConnectionTimetableAnswer"/>
-   <fault name="FaultName" message="siriWS:ConnectionTimetableError"/>
-  </operation>
-  <operation name="GetConnectionMonitoring">
-   <input message="siriWS:ConnectionMonitoringRequest"/>
-   <output message="siriWS:ConnectionMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:ConnectionMonitoringError"/>
-  </operation>
-  <operation name="GetGeneralMessage">
-   <input message="siriWS:GeneralMessageRequest"/>
-   <output message="siriWS:GeneralMessageAnswer"/>
-   <fault name="FaultName" message="siriWS:GeneralMessageError"/>
-  </operation>
-  <operation name="GetFacilityMonitoring">
-   <input message="siriWS:FacilityMonitoringRequest"/>
-   <output message="siriWS:FacilityMonitoringAnswer"/>
-   <fault name="FaultName" message="siriWS:FacilityMonitoringError"/>
-  </operation>
-  <operation name="GetSituationExchange">
-   <input message="siriWS:SituationExchangeRequest"/>
-   <output message="siriWS:SituationExchangeAnswer"/>
-   <fault name="FaultName" message="siriWS:SituationExchangeError"/>
-  </operation>
-  <operation name="GetControlAction">
-   <input message="siriWS:ControlActionRequest"/>
-   <output message="siriWS:ControlActionAnswer"/>
-   <fault name="FaultName" message="siriWS:ControlActionError"/>
-  </operation>
-  <operation name="GetCapabilities">
-   <input message="siriWS:GetCapabilitiesRequest"/>
-   <output message="siriWS:GetCapabilitiesAnswer"/>
-   <fault name="FaultName" message="siriWS:GetCapabilitiesError"/>
-  </operation>
-  <operation name="StopPointsDiscovery">
-   <input message="siriWS:StopPointsDiscoveryRequest"/>
-   <output message="siriWS:StopPointsDiscoveryAnswer"/>
-   <fault name="FaultName" message="siriWS:StopPointsDiscoveryError"/>
-  </operation>
-  <operation name="LinesDiscovery">
-   <input message="siriWS:LinesDiscoveryRequest"/>
-   <output message="siriWS:LinesDiscoveryAnswer"/>
-   <fault name="FaultName" message="siriWS:LinesDiscoveryError"/>
-  </operation>
-  <operation name="ConnectionLinksDiscovery">
-   <input message="siriWS:ConnectionLinksDiscoveryRequest"/>
-   <output message="siriWS:ConnectionLinksDiscoveryAnswer"/>
-   <fault name="FaultName" message="siriWS:ConnectionLinksDiscoveryError"/>
-  </operation>
-  <!-- SIRI 2.x addition : global SIRI service access (access to any SIRI services) -->
-  <operation name="GetSiriService">
-   <documentation>SIRI 2.x : Single access to any SIRI Service</documentation>
-   <input message="siriWS:SiriServiceRequest"/>
-   <output message="siriWS:SiriServiceAnswer"/>
-  </operation>
- </portType>
- <binding name="SiriProducerRpcBinding" type="siriWS:SiriProducerRpcPort">
-  <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-  <!-- ====general  services ===== -->
-  <operation name="Subscribe">
-   <soap:operation soapAction="Subscribe"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="DeleteSubscription">
-   <soap:operation soapAction="DeleteSubscription"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="DataSupply">
-   <soap:operation soapAction="DataSupply"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="CheckStatus">
-   <soap:operation soapAction="CheckStatus"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <!-- ====SIRI services ===== -->
-  <operation name="GetProductionTimetable">
-   <soap:operation soapAction="GetProductionTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetEstimatedTimetable">
-   <soap:operation soapAction="GetEstimatedTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetStopTimetable">
-   <soap:operation soapAction="GetStopTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetStopMonitoring">
-   <soap:operation soapAction="GetStopMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetMultipleStopMonitoring">
-   <soap:operation soapAction="GetMultipleStopMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetVehicleMonitoring">
-   <soap:operation soapAction="GetVehicleMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetConnectionTimetable">
-   <soap:operation soapAction="GetConnectionTimetable"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetConnectionMonitoring">
-   <soap:operation soapAction="GetConnectionMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetGeneralMessage">
-   <soap:operation soapAction="GetGeneralMessage"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetFacilityMonitoring">
-   <soap:operation soapAction="GetFacilityMonitoring"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetSituationExchange">
-   <soap:operation soapAction="GetSituationExchange"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetControlAction">
-   <soap:operation soapAction="GetControlAction"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>  
-  <operation name="GetCapabilities">
-   <soap:operation soapAction="GetCapabilities"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="GetSiriService">
-   <soap:operation soapAction="GetSiriService"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-  </operation>
-  <operation name="StopPointsDiscovery">
-   <soap:operation soapAction="StopPointsDiscovery"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="LinesDiscovery">
-   <soap:operation soapAction="LinesDiscovery"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
-  <operation name="ConnectionLinksDiscovery">
-   <soap:operation soapAction="ConnectionLinksDiscovery"/>
-   <input>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </input>
-   <output>
-    <soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
-   </output>
-   <fault name="FaultName">
-    <soap:fault name="FaultName" use="literal"/>
-   </fault>
-  </operation>
- </binding>
- <service name="SiriProducerRpcServices">
-  <port name="SiriWSPort" binding="siriWS:SiriProducerRpcBinding">
-   <soap:address location="http://www.siri-service-location.com"/>
-  </port>
- </service>
+	<types>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri">
+			<xsd:include schemaLocation="siri.xsd"/>
+		</xsd:schema>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://wsdl.siri.org.uk">
+			<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests.xsd"/>
+			<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_common_services.xsd"/>
+			<xsd:complexType name="WsSubscriptionRequestInfoStructure">
+				<xsd:complexContent>
+					<xsd:extension base="siri:AbstractSubscriptionRequestStructure"/>
+				</xsd:complexContent>
+			</xsd:complexType>
+			<xsd:complexType name="WsServiceRequestInfoStructure">
+				<xsd:complexContent>
+					<xsd:extension base="siri:ContextualisedRequestStructure"/>
+				</xsd:complexContent>
+			</xsd:complexType>
+		</xsd:schema>
+	</types>
+	<message name="SubscriptionRequest">
+		<part name="SubscriptionRequestInfo" type="siriWS:WsSubscriptionRequestInfoStructure"/>
+		<part name="Request" type="siri:SiriSubscriptionRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="SubscriptionAnswer">
+		<part name="SubscriptionAnswerInfo" type="siri:ResponseEndpointStructure"/>
+		<part name="Answer" type="siri:SubscriptionResponseBodyStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="SubscriptionError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="DeleteSubscriptionRequest">
+		<part name="DeleteSubscriptionInfo" type="siri:RequestStructure"/>
+		<part name="Request" type="siri:TerminateSubscriptionRequestBodyStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="DeleteSubscriptionAnswer">
+		<part name="DeleteSubscriptionAnswerInfo" type="siri:ResponseEndpointStructure"/>
+		<part name="Answer" type="siri:TerminateSubscriptionResponseStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="DeleteSubscriptionError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="DataSupplyRequest">
+		<part name="DataSupplyRequestInfo" type="siri:ConsumerRequestEndpointStructure"/>
+		<part name="Request" type="siri:DataSupplyRequestBodyStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="DataSupplyError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="DataSupplyAnswer">
+		<part name="DataSupplyAnswerInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:ServiceDeliveryBodyStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="CheckStatusRequest">
+		<part name="Request" type="siri:CheckStatusRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="CheckStatusAnswer">
+		<part name="CheckStatusAnswerInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:CheckStatusResponseBodyStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="CheckStatusError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="ProductionTimetableRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:ProductionTimetableRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ProductionTimetableAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:ProductionTimetableDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ProductionTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="EstimatedTimetableRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:EstimatedTimetableRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="EstimatedTimetableAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:EstimatedTimetableDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="EstimatedTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="StopTimetableRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:StopTimetableRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopTimetableAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:StopTimetableDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="StopMonitoringRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:StopMonitoringRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopMonitoringMultipleRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:StopMonitoringMultipleRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopMonitoringAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:StopMonitoringDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="VehicleMonitoringRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:VehicleMonitoringRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="VehicleMonitoringAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:VehicleMonitoringDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="VehicleMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="ConnectionTimetableRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:ConnectionTimetableRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionTimetableAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:ConnectionTimetableDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionTimetableError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="ConnectionMonitoringRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:ConnectionMonitoringRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionMonitoringAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:ConnectionMonitoringDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="GeneralMessageRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:GeneralMessageRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="GeneralMessageAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:GeneralMessageDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="GeneralMessageError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="FacilityMonitoringRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:FacilityMonitoringRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="FacilityMonitoringAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:FacilityMonitoringDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="FacilityMonitoringError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="SituationExchangeRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:SituationExchangeRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="SituationExchangeAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:SituationExchangeDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="SituationExchangeError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="ControlActionRequest">
+		<part name="ServiceRequestInfo" type="siriWS:WsServiceRequestInfoStructure"/>
+		<part name="Request" type="siri:ControlActionRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ControlActionAnswer">
+		<part name="ServiceDeliveryInfo" type="siri:ProducerResponseEndpointStructure"/>
+		<part name="Answer" type="siri:ControlActionDeliveriesStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ControlActionError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ServiceDeliveryErrorConditionElement"/>
+	</message>
+	<message name="GetCapabilitiesRequest">
+		<part name="Request" type="siri:CapabilitiesRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="GetCapabilitiesAnswer">
+		<part name="Answer" type="siri:CapabilitiesResponseStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="GetCapabilitiesError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="StopPointsDiscoveryRequest">
+		<part name="Request" type="siri:StopPointsDiscoveryRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopPointsDiscoveryAnswer">
+		<part name="Answer" type="siri:StopPointsDeliveryStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="StopPointsDiscoveryError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="LinesDiscoveryRequest">
+		<part name="Request" type="siri:LinesDiscoveryRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="LinesDiscoveryAnswer">
+		<part name="Answer" type="siri:LinesDeliveryStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="LinesDiscoveryError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="ConnectionLinksDiscoveryRequest">
+		<part name="Request" type="siri:ConnectionLinksDiscoveryRequestStructure"/>
+		<part name="RequestExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionLinksDiscoveryAnswer">
+		<part name="Answer" type="siri:ConnectionLinksDeliveryStructure"/>
+		<part name="AnswerExtension" type="siri:ExtensionsStructure"/>
+	</message>
+	<message name="ConnectionLinksDiscoveryError">
+		<documentation>SOAP Fault deprecated from Siri 2.0</documentation>
+		<part name="SiriError" element="siri:ErrorConditionElement"/>
+	</message>
+	<message name="SiriServiceRequest">
+		<part name="Request" type="siri:ServiceRequestStructure"/>
+	</message>
+	<message name="SiriServiceAnswer">
+		<part name="Answer" type="siri:ServiceDeliveryStructure"/>
+	</message>
+	<portType name="SiriProducerRpcPort">
+		<documentation>Defines all the SIRI SOAP functionnal access</documentation>
+		<operation name="Subscribe">
+			<input message="siriWS:SubscriptionRequest"/>
+			<output message="siriWS:SubscriptionAnswer"/>
+			<fault name="FaultName" message="siriWS:SubscriptionError"/>
+		</operation>
+		<operation name="DeleteSubscription">
+			<input message="siriWS:DeleteSubscriptionRequest"/>
+			<output message="siriWS:DeleteSubscriptionAnswer"/>
+			<fault name="FaultName" message="siriWS:DeleteSubscriptionError"/>
+		</operation>
+		<operation name="DataSupply">
+			<input message="siriWS:DataSupplyRequest"/>
+			<output message="siriWS:DataSupplyAnswer"/>
+			<fault name="FaultName" message="siriWS:DataSupplyError"/>
+		</operation>
+		<operation name="CheckStatus">
+			<input message="siriWS:CheckStatusRequest"/>
+			<output message="siriWS:CheckStatusAnswer"/>
+			<fault name="FaultName" message="siriWS:CheckStatusError"/>
+		</operation>
+		<operation name="GetProductionTimetable">
+			<input message="siriWS:ProductionTimetableRequest"/>
+			<output message="siriWS:ProductionTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:ProductionTimetableError"/>
+		</operation>
+		<operation name="GetEstimatedTimetable">
+			<input message="siriWS:EstimatedTimetableRequest"/>
+			<output message="siriWS:EstimatedTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:EstimatedTimetableError"/>
+		</operation>
+		<operation name="GetStopTimetable">
+			<input message="siriWS:StopTimetableRequest"/>
+			<output message="siriWS:StopTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:StopTimetableError"/>
+		</operation>
+		<operation name="GetStopMonitoring">
+			<input message="siriWS:StopMonitoringRequest"/>
+			<output message="siriWS:StopMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:StopMonitoringError"/>
+		</operation>
+		<operation name="GetMultipleStopMonitoring">
+			<documentation>GetMultipleStopMonitoring deprecated from Siri 2.0 (use GetSiriService instead)</documentation>
+			<input message="siriWS:StopMonitoringMultipleRequest"/>
+			<output message="siriWS:StopMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:StopMonitoringError"/>
+		</operation>
+		<operation name="GetVehicleMonitoring">
+			<input message="siriWS:VehicleMonitoringRequest"/>
+			<output message="siriWS:VehicleMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:VehicleMonitoringError"/>
+		</operation>
+		<operation name="GetConnectionTimetable">
+			<input message="siriWS:ConnectionTimetableRequest"/>
+			<output message="siriWS:ConnectionTimetableAnswer"/>
+			<fault name="FaultName" message="siriWS:ConnectionTimetableError"/>
+		</operation>
+		<operation name="GetConnectionMonitoring">
+			<input message="siriWS:ConnectionMonitoringRequest"/>
+			<output message="siriWS:ConnectionMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:ConnectionMonitoringError"/>
+		</operation>
+		<operation name="GetGeneralMessage">
+			<input message="siriWS:GeneralMessageRequest"/>
+			<output message="siriWS:GeneralMessageAnswer"/>
+			<fault name="FaultName" message="siriWS:GeneralMessageError"/>
+		</operation>
+		<operation name="GetFacilityMonitoring">
+			<input message="siriWS:FacilityMonitoringRequest"/>
+			<output message="siriWS:FacilityMonitoringAnswer"/>
+			<fault name="FaultName" message="siriWS:FacilityMonitoringError"/>
+		</operation>
+		<operation name="GetSituationExchange">
+			<input message="siriWS:SituationExchangeRequest"/>
+			<output message="siriWS:SituationExchangeAnswer"/>
+			<fault name="FaultName" message="siriWS:SituationExchangeError"/>
+		</operation>
+		<operation name="GetControlAction">
+			<input message="siriWS:ControlActionRequest"/>
+			<output message="siriWS:ControlActionAnswer"/>
+			<fault name="FaultName" message="siriWS:ControlActionError"/>
+		</operation>
+		<operation name="GetCapabilities">
+			<input message="siriWS:GetCapabilitiesRequest"/>
+			<output message="siriWS:GetCapabilitiesAnswer"/>
+			<fault name="FaultName" message="siriWS:GetCapabilitiesError"/>
+		</operation>
+		<operation name="StopPointsDiscovery">
+			<input message="siriWS:StopPointsDiscoveryRequest"/>
+			<output message="siriWS:StopPointsDiscoveryAnswer"/>
+			<fault name="FaultName" message="siriWS:StopPointsDiscoveryError"/>
+		</operation>
+		<operation name="LinesDiscovery">
+			<input message="siriWS:LinesDiscoveryRequest"/>
+			<output message="siriWS:LinesDiscoveryAnswer"/>
+			<fault name="FaultName" message="siriWS:LinesDiscoveryError"/>
+		</operation>
+		<operation name="ConnectionLinksDiscovery">
+			<input message="siriWS:ConnectionLinksDiscoveryRequest"/>
+			<output message="siriWS:ConnectionLinksDiscoveryAnswer"/>
+			<fault name="FaultName" message="siriWS:ConnectionLinksDiscoveryError"/>
+		</operation>
+		<!-- SIRI 2.x addition : global SIRI service access (access to any SIRI services) -->
+		<operation name="GetSiriService">
+			<documentation>SIRI 2.x : Single access to any SIRI Service</documentation>
+			<input message="siriWS:SiriServiceRequest"/>
+			<output message="siriWS:SiriServiceAnswer"/>
+		</operation>
+	</portType>
+	<binding name="SiriProducerRpcBinding" type="siriWS:SiriProducerRpcPort">
+		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<!-- ====general  services ===== -->
+		<operation name="Subscribe">
+			<soap:operation soapAction="Subscribe"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="DeleteSubscription">
+			<soap:operation soapAction="DeleteSubscription"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="DataSupply">
+			<soap:operation soapAction="DataSupply"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="CheckStatus">
+			<soap:operation soapAction="CheckStatus"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<!-- ====SIRI services ===== -->
+		<operation name="GetProductionTimetable">
+			<soap:operation soapAction="GetProductionTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetEstimatedTimetable">
+			<soap:operation soapAction="GetEstimatedTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetStopTimetable">
+			<soap:operation soapAction="GetStopTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetStopMonitoring">
+			<soap:operation soapAction="GetStopMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetMultipleStopMonitoring">
+			<soap:operation soapAction="GetMultipleStopMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetVehicleMonitoring">
+			<soap:operation soapAction="GetVehicleMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetConnectionTimetable">
+			<soap:operation soapAction="GetConnectionTimetable"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetConnectionMonitoring">
+			<soap:operation soapAction="GetConnectionMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetGeneralMessage">
+			<soap:operation soapAction="GetGeneralMessage"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetFacilityMonitoring">
+			<soap:operation soapAction="GetFacilityMonitoring"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetSituationExchange">
+			<soap:operation soapAction="GetSituationExchange"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetControlAction">
+			<soap:operation soapAction="GetControlAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetCapabilities">
+			<soap:operation soapAction="GetCapabilities"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="GetSiriService">
+			<soap:operation soapAction="GetSiriService"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+		</operation>
+		<operation name="StopPointsDiscovery">
+			<soap:operation soapAction="StopPointsDiscovery"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="LinesDiscovery">
+			<soap:operation soapAction="LinesDiscovery"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="ConnectionLinksDiscovery">
+			<soap:operation soapAction="ConnectionLinksDiscovery"/>
+			<input>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://wsdl.siri.org.uk"/>
+			</output>
+			<fault name="FaultName">
+				<soap:fault name="FaultName" use="literal"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="SiriProducerRpcServices">
+		<port name="SiriWSPort" binding="siriWS:SiriProducerRpcBinding">
+			<soap:address location="http://www.siri-service-location.com"/>
+		</port>
+	</service>
 </definitions>