diff --git a/src/AasxServerBlazor/Properties/launchSettings.json b/src/AasxServerBlazor/Properties/launchSettings.json index b6b92bb23..ca4734cc0 100644 --- a/src/AasxServerBlazor/Properties/launchSettings.json +++ b/src/AasxServerBlazor/Properties/launchSettings.json @@ -18,7 +18,7 @@ }, "AasxServerBlazor": { "commandName": "Project", - "commandLineArgs": "--rest --data-path \"C:\\Development\\AASX\" --edit --external-blazor http://localhost:5001 --no-security", + "commandLineArgs": "--opc --data-path \"C:\\Development\\AASX\" --edit --external-blazor http://localhost:5001 --no-security", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" diff --git a/src/AasxServerStandardBib/AasxServerStandardBib.csproj b/src/AasxServerStandardBib/AasxServerStandardBib.csproj index 3cc1250df..a77e95768 100644 --- a/src/AasxServerStandardBib/AasxServerStandardBib.csproj +++ b/src/AasxServerStandardBib/AasxServerStandardBib.csproj @@ -20,16 +20,17 @@ - + - + - + + diff --git a/src/AasxServerStandardBib/DataChangeMonitoredItem.cs b/src/AasxServerStandardBib/DataChangeMonitoredItem.cs index fe77f2b66..8859653f2 100644 --- a/src/AasxServerStandardBib/DataChangeMonitoredItem.cs +++ b/src/AasxServerStandardBib/DataChangeMonitoredItem.cs @@ -636,6 +636,8 @@ public DataChangeFilter DataChangeFilter get { return m_filter; } } + public bool IsResendData => throw new NotImplementedException(); + /// /// Increments the sample time to the next interval. /// @@ -788,6 +790,11 @@ private void Publish( diagnostics.Enqueue(diagnosticInfo); } + + public void SetupResendDataTrigger() + { + throw new NotImplementedException(); + } #endregion #region Private Fields diff --git a/src/AasxServerStandardBib/SampleNodeManager.cs b/src/AasxServerStandardBib/SampleNodeManager.cs index cf97a3852..8779886d2 100644 --- a/src/AasxServerStandardBib/SampleNodeManager.cs +++ b/src/AasxServerStandardBib/SampleNodeManager.cs @@ -2991,6 +2991,11 @@ protected virtual void OnSetMonitoringMode( { // does nothing. } + + public void TransferMonitoredItems(OperationContext context, bool sendInitialValues, IList monitoredItems, IList processedItems, IList errors) + { + throw new NotImplementedException(); + } #endregion #region Private Fields diff --git a/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs b/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs index 79fea7150..2db5004b5 100644 --- a/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs +++ b/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs @@ -29,6 +29,7 @@ using System; using System.IdentityModel.Selectors; +//using System.IdentityModel.Selectors; using System.Security.Cryptography.X509Certificates; using System.Xml; using Opc.Ua; @@ -62,7 +63,7 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration configuration.SecurityConfiguration.RejectedCertificateStore); // set custom validator for user certificates. - m_certificateValidator = certificateValidator.GetChannelValidator(); + m_certificateValidator = (X509CertificateValidator)certificateValidator.GetChannelValidator(); } } } diff --git a/src/AasxServerStandardBib/UASampleClient.cs b/src/AasxServerStandardBib/UASampleClient.cs index 28084164a..3921b728f 100644 --- a/src/AasxServerStandardBib/UASampleClient.cs +++ b/src/AasxServerStandardBib/UASampleClient.cs @@ -106,7 +106,8 @@ public async Task ConsoleSampleClient() if (haveAppCertificate) { - config.ApplicationUri = Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate); + //config.ApplicationUri = Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate); + config.ApplicationUri = X509Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate); if (config.SecurityConfiguration.AutoAcceptUntrustedCertificates) { autoAccept = true;