Skip to content

Commit

Permalink
Merge 1.05.03 release candidate updates (#2286)
Browse files Browse the repository at this point in the history
- Merge latest Nodeset for rc bits

Co-authored-by: Randy Armstrong <randy@sparhawksoftware.com>
  • Loading branch information
mregen and randy-armstrong committed Aug 28, 2023
1 parent da5db41 commit 5f9b7fe
Show file tree
Hide file tree
Showing 24 changed files with 190,516 additions and 85,017 deletions.
534 changes: 368 additions & 166 deletions Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.Classes.cs

Large diffs are not rendered by default.

Binary file not shown.
3,945 changes: 3,625 additions & 320 deletions Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.PredefinedNodes.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ public HistoryServerCapabilitiesState GetDefaultHistoryCapabilities()
historyServerCapabilitiesNode.InsertDataCapability.Value = false;
historyServerCapabilitiesNode.DeleteRawCapability.Value = false;
historyServerCapabilitiesNode.DeleteAtTimeCapability.Value = false;
historyServerCapabilitiesNode.ServerTimestampSupported.Value = false;

NodeState parent = FindPredefinedNode(ObjectIds.Server_ServerCapabilities, typeof(ServerCapabilitiesState));

Expand Down
2 changes: 1 addition & 1 deletion Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@ public int ShutdownDelay
/// <summary>
/// The server capabilities.
/// The latest set of server capabilities is listed
/// <see href="http://www.opcfoundation.org/UA/schemas/1.04/ServerCapabilities.csv">here.</see>
/// <see href="http://www.opcfoundation.org/UA/schemas/1.05/ServerCapabilities.csv">here.</see>
/// </summary>
/// <value>The array of server capabilites.</value>
[DataMember(IsRequired = false, Order = 30)]
Expand Down
6,078 changes: 6,072 additions & 6 deletions Stack/Opc.Ua.Core/Schema/NodeIds.csv

Large diffs are not rendered by default.

7,928 changes: 7,928 additions & 0 deletions Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.NodeSet2.xml

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.Types.bsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
* Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
-->

<opc:TypeDictionary
xmlns:opc="http://opcfoundation.org/BinarySchema/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ua="http://opcfoundation.org/UA/"
xmlns:tns="http://opcfoundation.org/UA/GDS/"
DefaultByteOrder="LittleEndian"
TargetNamespace="http://opcfoundation.org/UA/GDS/"
>
<opc:Import Namespace="http://opcfoundation.org/UA/" Location="Opc.Ua.BinarySchema.bsd"/>

<opc:StructuredType Name="ApplicationRecordDataType" BaseType="ua:ExtensionObject">
<opc:Field Name="ApplicationId" TypeName="ua:NodeId" />
<opc:Field Name="ApplicationUri" TypeName="opc:String" />
<opc:Field Name="ApplicationType" TypeName="ua:ApplicationType" />
<opc:Field Name="NoOfApplicationNames" TypeName="opc:Int32" />
<opc:Field Name="ApplicationNames" TypeName="ua:LocalizedText" LengthField="NoOfApplicationNames" />
<opc:Field Name="ProductUri" TypeName="opc:String" />
<opc:Field Name="NoOfDiscoveryUrls" TypeName="opc:Int32" />
<opc:Field Name="DiscoveryUrls" TypeName="opc:String" LengthField="NoOfDiscoveryUrls" />
<opc:Field Name="NoOfServerCapabilities" TypeName="opc:Int32" />
<opc:Field Name="ServerCapabilities" TypeName="opc:String" LengthField="NoOfServerCapabilities" />
</opc:StructuredType>

</opc:TypeDictionary>
66 changes: 66 additions & 0 deletions Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.Types.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
* Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
-->

<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
xmlns:tns="http://opcfoundation.org/UA/GDS/Types.xsd"
targetNamespace="http://opcfoundation.org/UA/GDS/Types.xsd"
elementFormDefault="qualified"
>
<xs:annotation>
<xs:appinfo>
<ua:Model ModelUri="http://opcfoundation.org/UA/GDS/" Version="1.05.02" PublicationDate="2023-07-15T00:00:00Z" />
</xs:appinfo>
</xs:annotation>

<xs:import namespace="http://opcfoundation.org/UA/2008/02/Types.xsd" />

<xs:complexType name="ApplicationRecordDataType">
<xs:sequence>
<xs:element name="ApplicationId" type="ua:NodeId" minOccurs="0" nillable="true" />
<xs:element name="ApplicationUri" type="xs:string" minOccurs="0" nillable="true" />
<xs:element name="ApplicationType" type="ua:ApplicationType" minOccurs="0" />
<xs:element name="ApplicationNames" type="ua:ListOfLocalizedText" minOccurs="0" nillable="true" />
<xs:element name="ProductUri" type="xs:string" minOccurs="0" nillable="true" />
<xs:element name="DiscoveryUrls" type="ua:ListOfString" minOccurs="0" nillable="true" />
<xs:element name="ServerCapabilities" type="ua:ListOfString" minOccurs="0" nillable="true" />
</xs:sequence>
</xs:complexType>
<xs:element name="ApplicationRecordDataType" type="tns:ApplicationRecordDataType" />

<xs:complexType name="ListOfApplicationRecordDataType">
<xs:sequence>
<xs:element name="ApplicationRecordDataType" type="tns:ApplicationRecordDataType" minOccurs="0" maxOccurs="unbounded" nillable="true" />
</xs:sequence>
</xs:complexType>
<xs:element name="ListOfApplicationRecordDataType" type="tns:ListOfApplicationRecordDataType" nillable="true"></xs:element>

</xs:schema>
Loading

0 comments on commit 5f9b7fe

Please sign in to comment.