Skip to content

Commit

Permalink
Revert "See #13 Rename all xsd files (and references to them) to not …
Browse files Browse the repository at this point in the history
…have version suffixes"

This reverts commit 25da9ef.
  • Loading branch information
csolem committed Aug 8, 2018
1 parent 25da9ef commit 243d503
Show file tree
Hide file tree
Showing 347 changed files with 1,610 additions and 1,610 deletions.
4 changes: 2 additions & 2 deletions xsd/NX.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<!-- === ONLY TO FACILITATE STUDY OF SCHEMA ELEMENTS. DO NOT USE IT FOR DOCUMENTS =========== -->
<!-- === Use NeTEx_publication.xsd or NeTEx_publication_timetable or NeTEx_siri.xsd=========== -->
<!-- (C) Copyright 2009-2012 CEN,Crown Copyright -->
<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_payload_framework.xsd"/>
<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_payload_framework-v1.0.xsd"/>
<!-- ======================================================================= -->
<!-- ======================================================================= -->
<xsd:element name="Nx">
Expand Down
4 changes: 2 additions & 2 deletions xsd/NeTEx_publication-NoConstraint.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
<!-- ===Regular netex============================================================== -->
<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
<!-- ===eGIF/GovTalk Documentation ======================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down
4 changes: 2 additions & 2 deletions xsd/NeTEx_publication.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
<!-- ===Regular netex============================================================== -->
<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
<!-- ===eGIF/GovTalk Documentation ======================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down
18 changes: 9 additions & 9 deletions xsd/NeTEx_publication_timetable.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<!-- ==+ IT INCLUDES ELEMENTS RELEVANT FOR THE EXCHANGE OF TIMETABLES ===== -->
<!-- ==+ANY DOCUMENT COMPLIANT WITH THIS SCHEMA WILL ALSO BE COMPLIANT WITH NetEx_publication.xsd ===== -->
<!-- ===Dependencies ======================================= -->
<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
<!-- ======================================================================= -->
<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version.xsd"/>
<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd"/>
<!-- ======================================================================= -->
<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version.xsd"/>
<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version.xsd"/>
<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
<!-- ======================================================================= -->
<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version.xsd"/>
<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd"/>
<!-- ======================================================================= -->
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
<!-- ===eGIF/GovTalk Documentation ======================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down
4 changes: 2 additions & 2 deletions xsd/NeTEx_siri.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<xsd:schema xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siri">
<!-- ===Dependencies ======================================= -->
<!-- ====INCLUDE NETEX REQUESTS==================================================== -->
<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all.xsd"/>
<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all-v1.0.xsd"/>
<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
<!-- ======================================================================= -->
<xsd:include schemaLocation="siri/siri_base-v2.0.xsd"/>
<!-- ===eGIF/GovTalk Documentation ======================================= -->
Expand Down
2 changes: 1 addition & 1 deletion xsd/ifopt.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- === THIS IS FOR DOCUMENTATION TO SHOW THE COVERAGE OF THE ORIGINAL IFOPT ELEMENTS ===== -->
<!-- === USE THE NeTEX publication schema FOR ACTUAL DOCUMENTS============= -->
<!-- ======================================================================= -->
<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1.xsd"/>
<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
<!-- ======================================================================= -->
<xsd:group name="IfoptPayloadGroup">
<xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_framework">
<!-- ===Types ======================================= -->
<xsd:include schemaLocation="netex_payload_framework.xsd"/>
<xsd:include schemaLocation="netex_all_objects_generic.xsd"/>
<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents.xsd"/>
<xsd:include schemaLocation="netex_payload_framework-v1.0.xsd"/>
<xsd:include schemaLocation="netex_all_objects_generic-v1.0.xsd"/>
<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd"/>
</xsd:schema>
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_generic">
<!-- ===Types ======================================= -->
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml-v1.0.xsd"/>
<!-- =====entity=========================================================== -->
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version-v1.1.xsd"/>
<!-- ======Framework========================================================= -->
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd"/>
<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
</xsd:schema>
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_framework">
<!-- ===Types ======================================= -->
<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
<xsd:include schemaLocation="netex_compositeFrame_version.xsd"/>
<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
<xsd:include schemaLocation="netex_resourceFrame_version.xsd"/>
<xsd:include schemaLocation="netex_generalFrame_version.xsd"/>
<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="netex_compositeFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
<xsd:include schemaLocation="netex_resourceFrame_version-v1.1.xsd"/>
<xsd:include schemaLocation="netex_generalFrame_version-v1.0.xsd"/>
</xsd:schema>
Loading

0 comments on commit 243d503

Please sign in to comment.