diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd index d3ebba62ecd0fff59cf7cf896d7df6ae58e23a5f..22c755b17438cfe098a940bbd926b38493501f5a 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd @@ -7,7 +7,7 @@ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/> <xs:complexType name="HeavyBusPrimaryVehicleDeclarationType"> <xs:complexContent> - <xs:extension base="v1.0:AbstractVehicleType"> + <xs:extension base="v2.0:AbstractVehicleDeclarationType"> <xs:sequence> <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/> <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/> @@ -100,13 +100,13 @@ <xs:complexContent> <xs:extension base="tns:AbstractHeavyBusPrimaryComponentsDeclarationType"> <xs:sequence> - <xs:element name="Engine" type="v1.0:EngineComponentDeclarationType"/> - <xs:element name="Gearbox" type="v1.0:GearboxComponentDeclarationType"/> - <xs:element name="TorqueConverter" type="v1.0:TorqueConverterComponentDeclarationType" minOccurs="0"/> - <xs:element name="Angledrive" type="v1.0:AngledriveComponentDeclarationType" minOccurs="0"/> - <xs:element name="Retarder" type="v1.0:RetarderComponentDeclarationType" minOccurs="0"/> - <xs:element name="Axlegear" type="v1.0:AxlegearComponentDeclarationType"/> - <xs:element name="AxleWheels" type="v1.0:AxleWheelsComponentDeclarationType"/> + <xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/> + <xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/> + <xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/> + <xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/> + <xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/> + <xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/> + <xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/> <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentHeavyBusDeclarationType"/> </xs:sequence> </xs:extension> @@ -118,7 +118,7 @@ </xs:sequence> </xs:complexType> <xs:complexType name="AbstractAuxiliaryDataHeavyBusDeclarationType" abstract="true"/> - <xs:complexType name="AuxiliaryDataHeavyBusDeclarationType" abstract="true"> + <xs:complexType name="AuxiliaryDataHeavyBusDeclarationType"> <xs:complexContent> <xs:extension base="tns:AbstractAuxiliaryDataHeavyBusDeclarationType"> <xs:sequence> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd index 4467880714239504ebdad7867daf72c8728cf14c..5c0d856a9f1d8cdcfb47572d21d927e67d8013e8 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) --> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.5="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.5" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.5="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.5" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> <!-- This is a convienience file that imports all supported declaration definitions diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index 0203e1840ac2340e665c6dc7673c6a47df37f561..5a711b9a50aa876577887e51ab53d112a9cc630e 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -71,6 +71,7 @@ <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.3_DF.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.4_Tyre.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.5_Gearbox.xsd" HomeFolder="Yes"/> + <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.6_Buses.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoDeclarationJob.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoInput.1.0.xsd" HomeFolder="Yes"/>