1.05.04 json encoder fixes

Stack/Opc.Ua.Core/Schema/UANodeSet.cs

@@ -244,9 +244,20 @@
             }
         }
 
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute(DataType="token")]
+        public string ModelVersion {
+            get {
+                return this.modelVersionField;
+            }
+            set {
+                this.modelVersionField = value;
+            }
+        }
+
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string ModelVersion {
             get {
                 return this.modelVersionField;
             }

Stack/Opc.Ua.Core/Security/Constants/SecurityConstants.cs

@@ -113,6 +113,11 @@ public static class Profiles
         /// </summary>
         public const string HttpsBinaryTransport = "http://opcfoundation.org/UA-Profile/Transport/https-uabinary";
 
+        /// <summary>
+        /// Communicates with UA JSON over HTTPS.
+        /// </summary>
+        public const string HttpsJsonTransport = "http://opcfoundation.org/UA-Profile/Transport/https-uajson";
+
         /// <summary>
         /// Uri for "PubSub UDP UADP" Profile.
         /// This PubSub transport Facet defines a combination of the UDP transport protocol mapping with UADP message mapping

Stack/Opc.Ua.Core/Stack/Client/UserIdentity.cs

@@ -121,7 +121,7 @@ public string PolicyId
         /// <summary cref="IUserIdentity.DisplayName" />
         public string DisplayName
         {
-            get { return m_displayName; }
+            get { return m_displayName; } set { m_displayName = value; }
         }
 
         /// <summary cref="IUserIdentity.TokenType" />

Stack/Opc.Ua.Core/Stack/Server/SecureChannelContext.cs

@@ -121,6 +121,11 @@ public enum RequestEncoding
         /// <summary>
         /// The request used the UA XML encoding.
         /// </summary>
-        Xml
+        Xml,
+
+        /// <summary>
+        /// The request used the UA JSON encoding.
+        /// </summary>
+        Json
     }
 }

Stack/Opc.Ua.Core/Stack/State/NodeStateCollection.cs

@@ -16,6 +16,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace Opc.Ua
 {
@@ -181,6 +182,33 @@ public void SaveAsNodeSet2(ISystemContext context, Stream ostrm, string version)
             nodeSet.Write(ostrm);
         }
 
+        private static T Load<T>(Stream istrm)
+        {
+            var settings = new XmlReaderSettings() {
+                DtdProcessing = DtdProcessing.Prohibit
+            };
+
+            XmlSerializer serializer = new XmlSerializer(typeof(T));
+
+            using (var reader = XmlReader.Create(istrm, settings))
+            {
+                return (T)serializer.Deserialize(reader);
+            }
+        }
+
+        /// <summary>
+        /// Loads a NodeSet2 into a NodeStateCollection.
+        /// </summary>
+        public static NodeStateCollection LoadAsNodeSet2(ISystemContext context, Stream istrm)
+        {
+            Opc.Ua.Export.UANodeSet nodeSet = Load<Opc.Ua.Export.UANodeSet>(istrm);
+
+            NodeStateCollection nodes = new NodeStateCollection();
+            nodeSet.Import(context, nodes);
+
+            return nodes;
+        }
+
         /// <summary>
         /// Writes the schema information to a static XML export file.
         /// </summary>

Stack/Opc.Ua.Core/Stack/Types/HistoryUpdateDetails.cs

@@ -20,13 +20,13 @@ namespace Opc.Ua
     /// <summary>
     /// The description of a value to read.
     /// </summary>
-    public partial class HistoryUpdateDetails
+    public abstract partial class HistoryUpdateDetails
     {
         #region Supporting Properties and Methods
         /// <summary>
         /// The identifier for the Node being updated.
         /// </summary>
-        public virtual NodeId NodeId
+        public abstract NodeId NodeId
         {
             get;
             set;