diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
index 7181a7636bb971119ef009bfddad0840aa9f30fb..2842852a648ce7d99a1c3760329bb2ba21ec816d 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
@@ -573,7 +573,7 @@
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-aec22451f48f47c484ac">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-88dcf76d37a64b5eaf70">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -582,7 +582,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>4MFxDdYDnYyRrUdyIPFhEYwbyqqJl3MlYtXMaB/RQis=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-273285e977014470902e" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
index 6df32a71f3058b3f4fc82fd60bdea74b142c5aca..07631a3ccc8b606a8e763b322f66c234a074e378 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
@@ -604,7 +604,7 @@
</vif0.1:PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-607e449d2b0e45228b69">
- <vif0.1:HashPreviousStage>
+ <vif0.1:HashPreviousStep>
<di:Reference URI="#PIF-7f30aafa027a41a1864b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -613,7 +613,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
</di:Reference>
- </vif0.1:HashPreviousStage>
+ </vif0.1:HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-684dbf252718426b9fde" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
index 5b0e9b949ab2f8b6cd8d21da481105ddc20e2a2e..0fc0aab1a4d89ebc1e4fed064b3f27f264510984 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
@@ -578,7 +578,7 @@
</vif0.1:PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-9d0c3a409fce4a89a6ce">
- <vif0.1:HashPreviousStage>
+ <vif0.1:HashPreviousStep>
<di:Reference URI="#PIF-10652bf49ae0499f8689">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -587,7 +587,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>kNMmLf/SQo7//Wr3wmU1/x7c3q7VbmBEILJi39cdrz4=</di:DigestValue>
</di:Reference>
- </vif0.1:HashPreviousStage>
+ </vif0.1:HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-f34a4a8615eb4037a7b7">
<v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
<v2.8:ManufacturerAddress>Infinite Loop 1</v2.8:ManufacturerAddress>
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
index a281537272544197e3f1dd565d8c16097e8d5183..629a89884c5ac71f6cf8e0b85877504f5eda9ee7 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
@@ -20,10 +20,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
public class ManufacturingStageViewModel_v0_1 : StageViewModelBase, IManufacturingStageViewModel
{
- public DigestData HashPreviousStage
+ public DigestData HashPreviousStep
{
- get => _hashPreviousStage;
- set => SetProperty(ref _hashPreviousStage, value);
+ get => _hashPreviousStep;
+ set => SetProperty(ref _hashPreviousStep, value);
}
public int StepCount
@@ -77,7 +77,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private int _stepCount;
- private DigestData _hashPreviousStage;
+ private DigestData _hashPreviousStep;
private IManufacturingStageInputData _consolidatedManufacturingStageInputData;
diff --git a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index ed80fbec00f522434dcd2b8ccf7d15afac96b323..a3c8e583b2897f87cd8b48ac00d96977f5a01ab0 100644
--- a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -576,7 +576,7 @@
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-622a60d3b3cf4340a362">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -585,7 +585,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>PMrdzQUpL67ALWFQpWjxSieZ4KQ2iqS2y4BmHV3nJ0g=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-09ab483f390a40d58f5a" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 325f5bf26047b8c09e3685d9c4b089547f8e1856..eddf2a1b27a1df9079453372c7aa78c87c002fa0 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -980,7 +980,7 @@ namespace TUGraz.VectoCommon.InputData
public interface IManufacturingStageInputData
{
- DigestData HashPreviousStage { get; }
+ DigestData HashPreviousStep { get; }
int StepCount { get; }
IVehicleDeclarationInputData Vehicle { get; }
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 84724eb7cd74ae2413361e4769cbff6001d31408..426f64019966d271440e268a621d9ef740c62a06 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -2616,6 +2616,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to HashPreviousStep.
+ /// </summary>
+ public static string HashPreviousStep {
+ get {
+ return ResourceManager.GetString("HashPreviousStep", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Entry.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 507697b9dac7badca58f0bc8da3d275360b07f04..4f377ed4ec10bd1c070456f03fb4b5bffef681b7 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1590,4 +1590,7 @@
<data name="BusManufacturingStepDataType" xml:space="preserve">
<value>BusManufacturingStepDataType</value>
</data>
+ <data name="HashPreviousStep" xml:space="preserve">
+ <value>HashPreviousStep</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index 8508ad1f6acdfcf401bc03f0379f9c0f2499079e..22d135b911d179dd9dc78d28f0c26fcdd9c8db59 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -197,9 +197,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
protected override DataSourceType SourceType => DataSourceType.XMLFile;
- public DigestData HashPreviousStage =>
+ public DigestData HashPreviousStep =>
_hashPreviousStage ??
- (_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage")));
+ (_hashPreviousStage = Reader.GetDigestData(GetNode(XMLNames.HashPreviousStep)));
public int StepCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStep_StepCount));
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index 90df3d6e7874fffaebd78164f46210c5f3c4e4bb..e39e05983520f4583cbb5a2ae70e0c6041328ec2 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -439,7 +439,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
_primaryVehicle = primaryVehicle;
}
- public DigestData HashPreviousStage => _manufacturingStages.First().HashPreviousStage;
+ public DigestData HashPreviousStep => _manufacturingStages.First().HashPreviousStep;
public int StepCount => _manufacturingStages.First().StepCount;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index fd24ed6925d2d3b11c4ea652d470f935a69a56ed..f6385c567b98f82d3728c1e634b394b0dc1f8f8a 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -242,7 +242,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
digitData = _manufacturingStageInputData.Last().Signature;
}
- return new XElement(tns + "HashPreviousStage",
+ return new XElement(tns + XMLNames.HashPreviousStep,
digitData.ToXML(di));
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index f4b30701aedee30e5f522facf168a742f042a379..a155c041fa779816c353760e794671e96a353fd8 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -370,7 +370,7 @@
<xs:complexContent>
<xs:extension base="vif:AbstractManufacturingStepDataType">
<xs:sequence>
- <xs:element name="HashPreviousStage" type="v1.0:SignatureType"/>
+ <xs:element name="HashPreviousStep" type="v1.0:SignatureType"/>
<xs:element name="Vehicle" type="v2.10.2:AbstractCompletedBusVehicleType"/>
<xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
</xs:sequence>
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index b54e72d3c29a95ffb5728ae7170184c8dd831cf4..7e12fbe40929179e18f94cbf97ec9236c11c3049 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -168,7 +168,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestVifStage2Data(IManufacturingStageInputData data)
{
Assert.AreEqual(2, data.StepCount);
- TestSignatureData(data.HashPreviousStage, "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
+ TestSignatureData(data.HashPreviousStep, "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
"#PIF-d10aff76c5d149948046");
Assert.AreEqual("Intermediate Manufacturer 1", data.Vehicle.Manufacturer);
@@ -189,7 +189,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestVifStage3Data(IManufacturingStageInputData data)
{
Assert.AreEqual(3, data.StepCount);
- TestSignatureData(data.HashPreviousStage, "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
+ TestSignatureData(data.HashPreviousStep, "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
"#RESULT-6f30c7fe665a47938f6b");
Assert.AreEqual("Intermediate Manufacturer 2", data.Vehicle.Manufacturer);
@@ -235,7 +235,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestVifStage4Data(IManufacturingStageInputData data)
{
Assert.AreEqual(4, data.StepCount);
- TestSignatureData(data.HashPreviousStage, "GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
+ TestSignatureData(data.HashPreviousStep, "GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
"#RESULT-8f30c7fe665a47938f6b");
Assert.AreEqual("Some Manufacturer", data.Vehicle.Manufacturer);
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index e5b5465e5571b618e14d6721274cac60a3964faa..8300998e2e88ab24ea49f88f9b3ec1e0d5b5f449 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -580,12 +580,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
<di:DigestValue></di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
index ca35b00e4985124253822e3b91d458f7c1c75464..cf1c3428be72874aca8563484a4a37533af92429 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
@@ -564,7 +564,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</vif0.1:PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-ab066054c1bc431db1e3">
- <vif0.1:HashPreviousStage>
+ <vif0.1:HashPreviousStep>
<di:Reference URI="#PIF-4121ae4751874cefa376">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -573,7 +573,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>YnCPep7uMh3ghMrx6ZsEMLanOijFCZpku+ZDNd6rkLw=</di:DigestValue>
</di:Reference>
- </vif0.1:HashPreviousStage>
+ </vif0.1:HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-a00526e499f144139792" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
index 976884de24f1a67e32243b97682015cfbc7fe6be..453c23b32c2cec453976ba72b8ce958592055966 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
@@ -59,7 +59,7 @@
</PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-b0420da682c648adac83" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-4cb168560c0d4b3d886d">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -68,7 +68,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>KeeEnRNO5Gjm7XB+YYx542ujYbE0k7a9SkWe/BWo7bI=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle id="VEH-4e462a2a8acc408eb908" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Manufacturer</Manufacturer>
<ManufacturerAddress>Address </ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index 1faacae693ccbf0a39291367d6ba83d3b400504f..3e778f61f3957deb5ee78d95700d9081a68c819b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,7 +689,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,7 +760,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index 55d268b25814aed8284a0d945dd31c0a6453c596..0aad732a98a7128b9c1326a1d382e4130a9b95b2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -642,7 +642,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -692,7 +692,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -701,7 +701,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -763,7 +763,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -772,7 +772,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index cf23f71e7b934815c7dbdb9eb2d83d843f6b2018..c52310c8f1a65027250992b49d8db26401069d2a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -733,7 +733,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -742,7 +742,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -805,7 +805,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -814,7 +814,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index d798a2564dca273e5c3683d867157b37007575af..ab6b189452eddd220d0c3e93aee9d368ae298993 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,7 +689,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,7 +760,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 9a8b6efb9b274672700c48d2fbae9cae37d0ab7a..7cafae1e2c6a2cd77394731dc4ac3cd530af54ba 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,7 +689,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,7 +760,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 33809f10060e760fc187781f65fc1081100effff..1e228731a1aaa2c892b76f7971520b40196dc8a9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -696,7 +696,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index 81e09f72fad27d1bff238da11ce31cf06b1aad2a..2dc664275917e6f763ed54317a5fd478c1d0ab83 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 639d18fe1c93a8784210e912e9dea697429f17d8..491e5cbf25b05b2fbdb33c0cd88fa634b12ed08e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -696,7 +696,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index 72114aaadafb3e0a7719c36b7e2b0d51d62bd11c..8307c7d639e4345890713977ba951f9738a444c3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -576,7 +576,7 @@
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-622a60d3b3cf4340a362">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -585,7 +585,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>PMrdzQUpL67ALWFQpWjxSieZ4KQ2iqS2y4BmHV3nJ0g=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-09ab483f390a40d58f5a" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 3553a2795bb7d038196f186071e5e7a94fe3bf51..6d73cb4475b99265ace35456b3e13ae3882aff21 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle">
<v2.10.2:Manufacturer>Intermediate Manufacturer 1</v2.10.2:Manufacturer>
<v2.10.2:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.10.2:ManufacturerAddress>
@@ -676,7 +676,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -685,7 +685,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 43f42aedf7de33aef87a00eef99a45ab4e7e9249..fac245ed6bb039b5ac87191ad5717ec4b3d6bd33 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -574,7 +574,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -583,7 +583,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -609,7 +609,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -618,7 +618,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress></ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 9d93e30553936089394e4836a4d837713004b4b9..880e44fad7c8d83dc950611fe24d1a97574e14a5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d11aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 339950c3d2ecc1b8de6449f161f658ef553c127d..2d882419713c028425574f68733d17b0dd1fd7aa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index d5cdc47b1400df2da891da807b2911d698667be7..c93fd2f60445d372e321a380afe36fdc9d7616a1 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -547,7 +547,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2, manufacturingStage.StepCount);
TestDigestData("#PIF-d10aff76c5d149948046", "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
- manufacturingStage.HashPreviousStage);
+ manufacturingStage.HashPreviousStep);
TestVehicleDataStage01(manufacturingStage.Vehicle);
@@ -602,7 +602,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(3, manufacturingStage.StepCount);
TestDigestData("#RESULT-6f30c7fe665a47938f6b", "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
- manufacturingStage.HashPreviousStage);
+ manufacturingStage.HashPreviousStep);
TestVehicleDataStage02(manufacturingStage.Vehicle);
}
@@ -684,7 +684,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2, stageData.StepCount);
TestDigestData("#PIF-d11aff76c5d149948046", "nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
- stageData.HashPreviousStage);
+ stageData.HashPreviousStep);
TestVehicleDataVIF02(stageData.Vehicle);
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index e5b5465e5571b618e14d6721274cac60a3964faa..8300998e2e88ab24ea49f88f9b3ec1e0d5b5f449 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -580,12 +580,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
<di:DigestValue></di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>