09-12-2022

2022-12-09 17:29:08 +01:00
parent 0a25b0925c
commit 8d6d81f488
30 changed files with 640 additions and 91 deletions
--- a/Services/JobRunnerReference/ECM.JobRunner.Windows.xsd
+++ b/Services/JobRunnerReference/ECM.JobRunner.Windows.xsd
@@ -33,10 +33,34 @@
      <xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="JobName" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="Steps" nillable="true" type="tns:ArrayOfHistoryItem.HistoryStep" />
      <xs:element minOccurs="0" name="Successful" type="xs:boolean" />
    </xs:sequence>
  </xs:complexType>
  <xs:element name="HistoryItem" nillable="true" type="tns:HistoryItem" />
+  <xs:complexType name="ArrayOfHistoryItem.HistoryStep">
+    <xs:sequence>
+      <xs:element minOccurs="0" maxOccurs="unbounded" name="HistoryItem.HistoryStep" nillable="true" type="tns:HistoryItem.HistoryStep" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="ArrayOfHistoryItem.HistoryStep" nillable="true" type="tns:ArrayOfHistoryItem.HistoryStep" />
+  <xs:complexType name="HistoryItem.HistoryStep">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="Created" type="xs:dateTime" />
+      <xs:element minOccurs="0" name="Level" type="tns:HistoryItem.StepLevel" />
+      <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="HistoryItem.HistoryStep" nillable="true" type="tns:HistoryItem.HistoryStep" />
+  <xs:simpleType name="HistoryItem.StepLevel">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Debug" />
+      <xs:enumeration value="Info" />
+      <xs:enumeration value="Warning" />
+      <xs:enumeration value="Error" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="HistoryItem.StepLevel" nillable="true" type="tns:HistoryItem.StepLevel" />
  <xs:complexType name="ArrayOfStatusItem">
    <xs:sequence>
      <xs:element minOccurs="0" maxOccurs="unbounded" name="StatusItem" nillable="true" type="tns:StatusItem" />
--- a/Services/JobRunnerReference/Reference.vb
+++ b/Services/JobRunnerReference/Reference.vb
@@ -296,6 +296,9 @@ Namespace JobRunnerReference
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private MessageField As String
        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private StepsField() As JobRunnerReference.HistoryItem.HistoryStep
+        
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private SuccessfulField As Boolean
        
@@ -361,6 +364,19 @@ Namespace JobRunnerReference
            End Set
        End Property
        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property Steps() As JobRunnerReference.HistoryItem.HistoryStep()
+            Get
+                Return Me.StepsField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.StepsField, value) <> true) Then
+                    Me.StepsField = value
+                    Me.RaisePropertyChanged("Steps")
+                End If
+            End Set
+        End Property
+        
        <System.Runtime.Serialization.DataMemberAttribute()>  _
        Public Property Successful() As Boolean
            Get
@@ -382,6 +398,101 @@ Namespace JobRunnerReference
                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
            End If
        End Sub
+        
+        <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+         System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+         System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem.HistoryStep", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"),  _
+         System.SerializableAttribute()>  _
+        Partial Public Class HistoryStep
+            Inherits Object
+            Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+            
+            <System.NonSerializedAttribute()>  _
+            Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
+            
+            <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+            Private CreatedField As Date
+            
+            <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+            Private LevelField As JobRunnerReference.HistoryItem.StepLevel
+            
+            <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+            Private MessageField As String
+            
+            Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
+                Get
+                    Return Me.extensionDataField
+                End Get
+                Set
+                    Me.extensionDataField = value
+                End Set
+            End Property
+            
+            <System.Runtime.Serialization.DataMemberAttribute()>  _
+            Public Property Created() As Date
+                Get
+                    Return Me.CreatedField
+                End Get
+                Set
+                    If (Me.CreatedField.Equals(value) <> true) Then
+                        Me.CreatedField = value
+                        Me.RaisePropertyChanged("Created")
+                    End If
+                End Set
+            End Property
+            
+            <System.Runtime.Serialization.DataMemberAttribute()>  _
+            Public Property Level() As JobRunnerReference.HistoryItem.StepLevel
+                Get
+                    Return Me.LevelField
+                End Get
+                Set
+                    If (Me.LevelField.Equals(value) <> true) Then
+                        Me.LevelField = value
+                        Me.RaisePropertyChanged("Level")
+                    End If
+                End Set
+            End Property
+            
+            <System.Runtime.Serialization.DataMemberAttribute()>  _
+            Public Property Message() As String
+                Get
+                    Return Me.MessageField
+                End Get
+                Set
+                    If (Object.ReferenceEquals(Me.MessageField, value) <> true) Then
+                        Me.MessageField = value
+                        Me.RaisePropertyChanged("Message")
+                    End If
+                End Set
+            End Property
+            
+            Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
+            
+            Protected Sub RaisePropertyChanged(ByVal propertyName As String)
+                Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
+                If (Not (propertyChanged) Is Nothing) Then
+                    propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
+                End If
+            End Sub
+        End Class
+        
+        <System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+         System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem.StepLevel", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows")>  _
+        Public Enum StepLevel As Integer
+            
+            <System.Runtime.Serialization.EnumMemberAttribute()>  _
+            Debug = 0
+            
+            <System.Runtime.Serialization.EnumMemberAttribute()>  _
+            Info = 1
+            
+            <System.Runtime.Serialization.EnumMemberAttribute()>  _
+            Warning = 2
+            
+            <System.Runtime.Serialization.EnumMemberAttribute()>  _
+            [Error] = 3
+        End Enum
    End Class
    
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
--- a/Services/JobRunnerReference/configuration.svcinfo
+++ b/Services/JobRunnerReference/configuration.svcinfo
@@ -5,6 +5,6 @@
    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;NetTcpBinding_IEDMIService&quot; transferMode=&quot;Streamed&quot;&gt;&lt;security&gt;&lt;transport sslProtocols=&quot;None&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="NetTcpBinding_IEDMIService" />
  </bindings>
  <endpoints>
-    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9001/DigitalData/Services/JobRunner&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IEDMIService&quot; contract=&quot;JobRunnerReference.IEDMIService&quot; name=&quot;NetTcpBinding_IEDMIService&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;Administrator@dd-san01.dd-gan.local.digitaldata.works&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9001/DigitalData/Services/JobRunner&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IEDMIService&quot; contract=&quot;JobRunnerReference.IEDMIService&quot; name=&quot;NetTcpBinding_IEDMIService&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;Administrator@dd-san01.dd-gan.local.digitaldata.works&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="JobRunnerReference.IEDMIService" name="NetTcpBinding_IEDMIService" />
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9001/DigitalData/Services/JobRunner&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IEDMIService&quot; contract=&quot;JobRunnerReference.IEDMIService&quot; name=&quot;NetTcpBinding_IEDMIService&quot;&gt;&lt;identity&gt;&lt;servicePrincipalName value=&quot;host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9001/DigitalData/Services/JobRunner&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IEDMIService&quot; contract=&quot;JobRunnerReference.IEDMIService&quot; name=&quot;NetTcpBinding_IEDMIService&quot;&gt;&lt;identity&gt;&lt;servicePrincipalName value=&quot;host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="JobRunnerReference.IEDMIService" name="NetTcpBinding_IEDMIService" />
  </endpoints>
 </configurationSnapshot>
--- a/Services/JobRunnerReference/configuration91.svcinfo
+++ b/Services/JobRunnerReference/configuration91.svcinfo
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="9.1" CheckSum="DoUniskVeDbP1hRdgocMLRvIRWWXBsyF6LnDt8ZDNTI=">
+<SavedWcfConfigurationInformation xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="9.1" CheckSum="ho0oZcIegSOp+ZGeQ1YrB58dDQqmy97E7VQqQI8HV80=">
  <bindingConfigurations>
    <bindingConfiguration bindingType="netTcpBinding" name="NetTcpBinding_IEDMIService">
      <properties>
@@ -150,14 +150,14 @@
        <property path="/identity/userPrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.UserPrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
        </property>
-        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>Administrator@dd-san01.dd-gan.local.digitaldata.works</serializedValue>
+        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
        </property>
        <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
        </property>
-        <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue />
+        <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works</serializedValue>
        </property>
        <property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
--- a/Services/JobRunnerReference/service.wsdl
+++ b/Services/JobRunnerReference/service.wsdl
@@ -93,7 +93,7 @@
      <wsa10:EndpointReference>
        <wsa10:Address>net.tcp://localhost:9001/DigitalData/Services/JobRunner</wsa10:Address>
        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
-          <Upn>Administrator@dd-san01.dd-gan.local.digitaldata.works</Upn>
+          <Spn>host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works</Spn>
        </Identity>
      </wsa10:EndpointReference>
    </wsdl:port>