Skip to content

Commit

Permalink
Update models to harmonize with current UA-ModelCompiler release #655
Browse files Browse the repository at this point in the history
- Recovered model using asp version: 6.5.3-Mike
  • Loading branch information
mpostol committed Apr 6, 2022
1 parent cd43652 commit c78cfe9
Show file tree
Hide file tree
Showing 13 changed files with 194 additions and 71 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="XMLstylesheet"?>
<ModelDesign xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" TargetVersion="" TargetPublicationDate="2021-02-21T00:00:00+01:00" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Prefix1="http://opcfoundation.org/UA/" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:Prefix3="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" TargetVersion="" TargetPublicationDate="2022-04-06T00:00:00+02:00" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
<Namespaces>
<Namespace Name="Name0" Prefix="Prefix0" InternalPrefix="http://opcfoundation.org/UA/" XmlNamespace="http://opcfoundation.org/UA/" XmlPrefix="Prefix1" FilePath="" Version="1.04.8" PublicationDate="20.11.2020">http://opcfoundation.org/UA/</Namespace>
<Namespace Name="Name2" Prefix="Prefix2" InternalPrefix="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" XmlNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" XmlPrefix="Prefix3" FilePath="" PublicationDate="21.02.2021">http://cas.eu/UA/CommServer/UnitTests/DataTypeTest</Namespace>
<Namespace Name="Name0" Prefix="Prefix0" InternalPrefix="http://opcfoundation.org/UA/" XmlNamespace="http://opcfoundation.org/UA/" XmlPrefix="Prefix1" FilePath="" Version="v104" PublicationDate="15.09.2021">http://opcfoundation.org/UA/</Namespace>
<Namespace Name="Name2" Prefix="Prefix2" InternalPrefix="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" XmlNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" XmlPrefix="Prefix3" FilePath="" PublicationDate="06.04.2022">http://cas.eu/UA/CommServer/UnitTests/DataTypeTest</Namespace>
</Namespaces>
<DataType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q1:AbstractEnumerationDataType" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:Enumeration" IsAbstract="true">
<DataType SymbolicName="Prefix3:AbstractEnumerationDataType" BaseType="Prefix1:Enumeration" IsAbstract="true">
<Children>
<Property SymbolicName="q2:EnumStrings" ModellingRule="Mandatory" DataType="q2:LocalizedText" ValueRank="Array">
<Property SymbolicName="Prefix1:EnumStrings" DataType="Prefix1:LocalizedText" ValueRank="Array" ArrayDimensions="0">
<DefaultValue>
<ListOfLocalizedText xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
<LocalizedText>
<Locale></Locale>
<Text>Field1</Text>
</LocalizedText>
<LocalizedText>
<Locale></Locale>
<Text>Field2</Text>
</LocalizedText>
</ListOfLocalizedText>
<LocalizedText>
<Text>Field1</Text>
</LocalizedText>
<LocalizedText>
<Text>Field2</Text>
</LocalizedText>
</ListOfLocalizedText>
</DefaultValue>
</Property>
</Children>
Expand All @@ -28,28 +26,26 @@
<Field Name="Field2" Identifier="1" BitMask="" ArrayDimensions="" />
</Fields>
</DataType>
<DataType xmlns:q3="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q3:EnumerationDataType" BaseType="q3:AbstractEnumerationDataType">
<DataType SymbolicName="Prefix3:EnumerationDataType" BaseType="Prefix3:AbstractEnumerationDataType">
<Description>Enumeration DataType derived from abstract type</Description>
<Children>
<Property xmlns:q4="http://opcfoundation.org/UA/" SymbolicName="q4:EnumValues" ModellingRule="Mandatory" DataType="q4:EnumValueType" ValueRank="Array">
<Property SymbolicName="Prefix1:EnumValues" DataType="Prefix1:EnumValueType" ValueRank="Array" ArrayDimensions="0">
<DefaultValue>
<ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
<ExtensionObject>
<TypeId>
<Identifier>i=7616</Identifier>
</TypeId>
<Body>
<EnumValueType>
<Value>1</Value>
<DisplayName>
<Locale></Locale>
<Text>Field3</Text>
</DisplayName>
<Description p5:nil="true" xmlns:p5="http://www.w3.org/2001/XMLSchema-instance" />
</EnumValueType>
</Body>
</ExtensionObject>
</ListOfExtensionObject>
<ExtensionObject>
<TypeId>
<Identifier>i=7616</Identifier>
</TypeId>
<Body>
<EnumValueType>
<Value>1</Value>
<DisplayName>
<Text>Field3</Text>
</DisplayName>
</EnumValueType>
</Body>
</ExtensionObject>
</ListOfExtensionObject>
</DefaultValue>
</Property>
</Children>
Expand All @@ -58,17 +54,17 @@
<Field Name="Field3" Identifier="1" BitMask="" ArrayDimensions="" />
</Fields>
</DataType>
<DataType xmlns:q5="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q5:AbstractStructure" xmlns:q6="http://opcfoundation.org/UA/" BaseType="q6:Structure" IsAbstract="true">
<DataType SymbolicName="Prefix3:AbstractStructure" BaseType="Prefix1:Structure" IsAbstract="true">
<Description>Abstract structure</Description>
<ClassName />
<Fields>
<Field Name="Number" BitMask="" DataType="q6:Number" ArrayDimensions="" />
<Field Name="Number" BitMask="" DataType="Prefix1:Number" ArrayDimensions="" />
</Fields>
</DataType>
<DataType xmlns:q7="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q7:DerivedStructure" BaseType="q7:AbstractStructure">
<DataType SymbolicName="Prefix3:DerivedStructure" BaseType="Prefix3:AbstractStructure">
<ClassName />
<Fields>
<Field Name="Number" BitMask="" xmlns:q8="http://opcfoundation.org/UA/" DataType="q8:Int32" ArrayDimensions="">
<Field Name="Number" BitMask="" DataType="Prefix1:Int32" ArrayDimensions="">
<Description>Derived from Number</Description>
</Field>
</Fields>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
"AddressSpacePrototyping";Information;1637887218;;"Address Space Prototyping (asp.exe) Version 6.5.3.25316";;;;"2022-04-06T13:18:36.9343563Z";;
"AddressSpacePrototyping";Information;1637887219;;"Copyright(c) 2022 Mariusz Postol";;;;"2022-04-06T13:18:36.9353565Z";;
"AddressSpacePrototyping";Verbose;6710129;;"Creating Address Space populated using Standard Model. It will take a while ...";;;;"2022-04-06T13:18:37.0306935Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Entering AddressSpaceContext creator - starting creation the OPC UA Address Space.";;;;"2022-04-06T13:18:37.0467191Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Address Space - the OPC UA defined has been uploaded.";;;;"2022-04-06T13:18:37.2783834Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Finished import UANodeSet for http://opcfoundation.org/UA/; Imported 4071 nodes.";;;;"2022-04-06T13:19:46.7118577Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Address Space - has bee created successfully.";;;;"2022-04-06T13:19:46.7118577Z";;
"AddressSpacePrototyping";Verbose;1637887216;;"Importing UANodeSet document from file C:\VS.git\github.mpostol\OPC-UA-OOI\SemanticData\UAModelDesignExport.UnitTest\Models\DataTypeTest\DataTypeTest.NodeSet2.xml";;;;"2022-04-06T13:19:46.7118577Z";;
"UANodeSetValidation";Information;190380256;;"Entering ImportUANodeSet and starting model import form file DataTypeTest.NodeSet2.xml";;;;"2022-04-06T13:19:46.7118577Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Finished import UANodeSet for http://cas.eu/UA/CommServer/UnitTests/DataTypeTest; Imported 22 nodes.";;;;"2022-04-06T13:19:47.3084359Z";;
"AddressSpacePrototyping";Verbose;1637887217;;"Validating and exporting a model from namespace http://cas.eu/UA/CommServer/UnitTests/DataTypeTest";;;;"2022-04-06T13:19:47.3084359Z";;
"UANodeSetValidation";Information;856488909;;"Entering IAddressSpaceContext.ValidateAndExportModel - starting for the http://cas.eu/UA/CommServer/UnitTests/DataTypeTest namespace.";;;;"2022-04-06T13:19:47.3094364Z";;
"UANodeSetValidation";Verbose;938023414;;"Selected 4 types to be validated.";;;;"2022-04-06T13:19:47.3284420Z";;
"UANodeSetValidation";Verbose;863907859;;"Selected 0 instances referenced by the ObjectsFolder to be validated.";;;;"2022-04-06T13:19:47.3285426Z";;
"UANodeSetValidation";Information;1606585634;;"Do Validator.ValidateExportModel - now the model contains 4 nodes";;;;"2022-04-06T13:19:47.3285426Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Removed the graph of nodes at http://opcfoundation.org/UA/:HasEncoding from the model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information Removed the graph of nodes at http://opcfoundation.org/UA/:HasEncoding from the model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=18"", BrowseName=""Default Binary"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=19"", BrowseName=""1:AbstractStructure"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=27"", BrowseName=""Default Binary"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=28"", BrowseName=""1:DerivedStructure"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=5"", BrowseName=""1:DataTypeTest"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=7"", BrowseName=""NamespaceUri"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=1"", BrowseName=""Deprecated"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=14"", BrowseName=""Default XML"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=15"", BrowseName=""1:AbstractStructure"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=23"", BrowseName=""Default XML"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=24"", BrowseName=""1:DerivedStructure"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=2"", BrowseName=""1:DataTypeTest"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=4"", BrowseName=""NamespaceUri"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=8"", BrowseName=""Deprecated"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=31"", BrowseName=""Default JSON"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Verbose;43988162;;"Trace: Verbose, Error Focus: Diagnostic, Identifier: P0-0003010000 Description: It is diagnostic information 1594962400 - Finishing Validator.ValidateExportModel - the NodeId=""ns=1;i=32"", BrowseName=""Default JSON"", ModellingRule="""" is not added to the exported model";;;;"2022-04-06T13:19:47.3536885Z";;
"UANodeSetValidation";Information;711552454;;"Finishing Validator.ValidateExportModel - the model contains 4 nodes and no errors/warnings reported";;;;"2022-04-06T13:19:47.3536885Z";;
"AddressSpacePrototyping";Verbose;1637887217;;"Writing model to XML file DataTypeTest.asp.xml";;;;"2022-04-06T13:19:47.3536885Z";;
"UAModelDesignExport";Information;279330276;;"The ModelDesign XML has been saved to file DataTypeTest.asp.xml and decorated with the stylesheet XMLstylesheet";;;;"2022-04-06T13:19:47.4851326Z";;
"AddressSpacePrototyping";Verbose;918215642;;"Execution time = 71s";;;;"2022-04-06T13:19:48.2571082Z";;
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"AddressSpacePrototyping";Information;1637887218;;"Address Space Prototyping (asp.exe) Version 6.5.3.25316";;;;"2022-04-06T13:18:36.9343563Z";;
"AddressSpacePrototyping";Information;1637887219;;"Copyright(c) 2022 Mariusz Postol";;;;"2022-04-06T13:18:36.9353565Z";;
"UANodeSetValidation";Information;190380256;;"Entering ImportUANodeSet and starting model import form file DataTypeTest.NodeSet2.xml";;;;"2022-04-06T13:19:46.7118577Z";;
"UANodeSetValidation";Information;856488909;;"Entering IAddressSpaceContext.ValidateAndExportModel - starting for the http://cas.eu/UA/CommServer/UnitTests/DataTypeTest namespace.";;;;"2022-04-06T13:19:47.3094364Z";;
"UANodeSetValidation";Information;1606585634;;"Do Validator.ValidateExportModel - now the model contains 4 nodes";;;;"2022-04-06T13:19:47.3285426Z";;
"UANodeSetValidation";Information;711552454;;"Finishing Validator.ValidateExportModel - the model contains 4 nodes and no errors/warnings reported";;;;"2022-04-06T13:19:47.3536885Z";;
"UAModelDesignExport";Information;279330276;;"The ModelDesign XML has been saved to file DataTypeTest.asp.xml and decorated with the stylesheet XMLstylesheet";;;;"2022-04-06T13:19:47.4851326Z";;
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@

del %1\asp.log /q
del %1\asp.warnings.log /q
%1\asp "XMLModels\DataTypeTest.NodeSet2.xml" -e "XMLModels\DataTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/DataTypeTest"
xcopy %1\asp.log ReferenceTest.asp.log /y
xcopy %1\asp.warnings.log ReferenceTest.asp.warnings.log /y /i
%1\asp "DataTypeTest\DataTypeTest.NodeSet2.xml" -e "DataTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/DataTypeTest"
xcopy %1\asp.log DataTypeTest\asp.log /y
xcopy %1\asp.warnings.log DataTypeTest\asp.warnings.log /y /i

del %1\asp.log /q
del %1\asp.warnings.log /q
%1\asp "XMLModels\ObjectTypeTest.NodeSet2.xml" -e "XMLModels\ObjectTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest"
xcopy %1\asp.log ReferenceTest.asp.log /y
xcopy %1\asp.warnings.log ReferenceTest.asp.warnings.log /y /i
%1\asp "ObjectTypeTest\ObjectTypeTest.NodeSet2.xml" -e "ObjectTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest"
xcopy %1\asp.log ObjectTypeTest\asp.log /y
xcopy %1\asp.warnings.log ObjectTypeTest\asp.warnings.log /y /i

del %1\asp.log /q
del %1\asp.warnings.log /q
%1\asp "XMLModels\ReferenceTest.NodeSet2.xml" -e "XMLModels\ReferenceTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ReferenceTest"
xcopy %1\ReferenceTest.asp.log asp.log /y
xcopy %1\asp.warnings.log .\ReferenceTest.asp.warnings.log /y /i
%1\asp "ReferenceTest\ReferenceTest.NodeSet2.xml" -e "ReferenceTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ReferenceTest"
xcopy %1\asp.log ReferenceTest\asp.log/y
xcopy %1\asp.warnings.log ReferenceTest\asp.warnings.log /y /i

del %1\asp.log /q
del %1\asp.warnings.log /q
%1\asp "XMLModels\VariableTypeTest.NodeSet2.xml" -e "XMLModels\VariableTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest"
xcopy %1\asp.log VariableTypeTest.asp.log /y
xcopy %1\asp.warnings.log VariableTypeTest.asp.warnings.log /y /i
%1\asp "VariableTypeTest\VariableTypeTest.NodeSet2.xml" -e "VariableTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest"
xcopy %1\asp.log VariableTypeTest\asp.log /y
xcopy %1\asp.warnings.log VariableTypeTest\asp.warnings.log /y /i
Loading

0 comments on commit c78cfe9

Please sign in to comment.