From a328156c1fd7d7335721f0532fe3eb8d3f1599fd Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 1 Aug 2019 14:59:02 +0200
Subject: [PATCH] updating monitoring schema. introduce abstract xml type for
monitoring report so that different versions can be used without updating
monintoring schema
---
.../XSD/VectoDeclarationDefinitions.xsd | 1 +
.../Resources/XSD/VectoMonitoring.0.8.xsd | 242 ++++++++++++++++++
.../Resources/XSD/VectoMonitoring.xsd | 4 +-
.../Resources/XSD/VectoOutputCustomer.xsd | 3 +-
.../XSD/VectoOutputManufacturer.0.7.xsd | 35 +--
.../XSD/VectoOutputManufacturer.0.8.xsd | 35 +--
.../Resources/XSD/VectoOutputManufacturer.xsd | 3 +-
VectoCore/VectoCore/VectoCore.csproj | 3 +
VectoCore/VectoXML.spp | 4 +
9 files changed, 297 insertions(+), 33 deletions(-)
create mode 100644 VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.8.xsd
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index 5c40dbe6c6..4f6104f07a 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
@@ -11,4 +11,5 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" schemaLocation="VectoDeclarationDefinitions.2.3_DF.xsd"/>
+ <xs:complexType name="AbstractVectoOutputManufacturerType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.8.xsd
new file mode 100644
index 0000000000..7a1cf7565c
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.8.xsd
@@ -0,0 +1,242 @@
+<?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="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput" schemaLocation="VectoOutputManufacturer.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
+ <xs:element name="VectoMonitoring">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ManufacturerRecord" type="common:AbstractVectoOutputManufacturerType"/>
+ <xs:element name="AdditionalData">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Vehicle">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Make" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#15</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:sequence minOccurs="0">
+ <xs:element name="Engine">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="WHTC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CO2">
+ <xs:annotation>
+ <xs:documentation>#75</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="g/kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="FuelConsumption">
+ <xs:annotation>
+ <xs:documentation>#76</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="g/kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="WHSC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CO2">
+ <xs:annotation>
+ <xs:documentation>#77</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="g/kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="FuelConsumption">
+ <xs:annotation>
+ <xs:documentation>#78</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="g/kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Gearbox">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#24</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#24</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Make" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#25</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Axlegear">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#32</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#32</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Make" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#33</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AxleWheels">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Axle" minOccurs="2" maxOccurs="4">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Tyre">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#39</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#39</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Make" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#40</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="axleNumber" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ <xs:maxInclusive value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="AdvancedReducingTechnologies">
+ <xs:annotation>
+ <xs:documentation>#74</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="category" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="advanced aerodynamic measures"/>
+ <xs:enumeration value="advanced rolling resistance measures"/>
+ <xs:enumeration value="advanced drivetrain technologies"/>
+ <xs:enumeration value="advanced engine technologies"/>
+ <xs:enumeration value="advanced auxiliary technologies"/>
+ <xs:enumeration value="additional ADAS technologies"/>
+ <xs:enumeration value="advanced powertrain integration and hybridisation"/>
+ <xs:enumeration value="other"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="VectoLicenseNbr" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>#72</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
index b2cd8b1b8e..e0a3aa705b 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
@@ -1,10 +1,12 @@
<?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" targetNamespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" 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:all_mon="urn:tugraz:ivt:VectoAPI:MonitoringOutput" xmlns:mon0.7="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" targetNamespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for all supported versions of customer information file and all supported declaration definitions
-->
<xs:import namespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" schemaLocation="VectoMonitoring.0.7.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.8" schemaLocation="VectoMonitoring.0.8.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput" schemaLocation="VectoOutputManufacturer.xsd"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
index 243edf3018..1aeee1c426 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.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" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" 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:all_cif="urn:tugraz:ivt:VectoAPI:CustomerOutput" xmlns:cif0.5="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" xmlns:cif0.7="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" xmlns:cif0.8="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for all supported versions of customer information file and all supported declaration definitions
@@ -8,4 +8,5 @@
-->
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" schemaLocation="VectoOutputCustomer.0.5.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" schemaLocation="VectoOutputCustomer.0.7.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" schemaLocation="VectoOutputCustomer.0.8.xsd"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
index ce4445daf2..c5ec0702c2 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
@@ -1,8 +1,9 @@
<?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) -->
<!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
-<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:element name="VectoOutput">
<xs:annotation>
<xs:documentation>Comment describing your root element</xs:documentation>
@@ -880,20 +881,24 @@
</xs:restriction>
</xs:simpleType>
<xs:complexType name="VectoOutputManufacturerType">
- <xs:sequence>
- <xs:element name="Data">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="VectoOutputDataType"/>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Signature" type="vdecdef:SignatureType">
- <xs:annotation>
- <xs:documentation>I.3.1.4 / #73</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="common:AbstractVectoOutputManufacturerType">
+ <xs:sequence>
+ <xs:element name="Data">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="VectoOutputDataType"/>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Signature" type="vdecdef:SignatureType">
+ <xs:annotation>
+ <xs:documentation>I.3.1.4 / #73</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:simpleType name="PercentType">
<xs:restriction base="xs:string">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd
index e363625ccf..48cb07b9fb 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd
@@ -1,8 +1,9 @@
<?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) -->
<!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
-<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:element name="VectoOutput">
<xs:annotation>
<xs:documentation>Comment describing your root element</xs:documentation>
@@ -896,20 +897,24 @@
</xs:restriction>
</xs:simpleType>
<xs:complexType name="VectoOutputManufacturerType">
- <xs:sequence>
- <xs:element name="Data">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="VectoOutputDataType"/>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Signature" type="vdecdef:SignatureType">
- <xs:annotation>
- <xs:documentation>I.3.1.4 / #73</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="common:AbstractVectoOutputManufacturerType">
+ <xs:sequence>
+ <xs:element name="Data">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="VectoOutputDataType"/>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Signature" type="vdecdef:SignatureType">
+ <xs:annotation>
+ <xs:documentation>I.3.1.4 / #73</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:simpleType name="PercentType">
<xs:restriction base="xs:string">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
index b8765ba6f1..291c9af539 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.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" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" 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:all_mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:mrf0.5="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" xmlns:mrf0.6="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" xmlns:mrf0.7="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for all supported versions of manufacturer records file and all supported declaration definitions
@@ -9,4 +9,5 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" schemaLocation="VectoOutputManufacturer.0.5.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" schemaLocation="VectoOutputManufacturer.0.6.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" schemaLocation="VectoOutputManufacturer.0.7.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" schemaLocation="VectoOutputManufacturer.0.8.xsd"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index c204eb9ee2..a601a1bbf2 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -687,6 +687,9 @@
<EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.8.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Resources\XSD\VectoMonitoring.0.8.xsd">
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<None Include="Utils\VectoVersionCore.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>VectoVersionCore.cs</LastGenOutput>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 321bc66ad1..8dde1f2a62 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -91,14 +91,18 @@
</Folder>
<Folder FolderName="Reports">
<File FilePath="VectoCore\Resources\XSD\VectoMonitoring.0.7.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoMonitoring.0.8.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoMonitoring.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.4.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.5.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.7.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.8.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.5.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.6.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.7.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.8.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>
</Folder>
</Folder>
--
GitLab