Fix URI Prefix error

This commit is contained in:
Jonathan Jenne 2022-12-20 12:04:40 +01:00
parent 343f47ca29
commit 3e2c4a9ab0
5 changed files with 266 additions and 294 deletions

View File

@ -2,46 +2,6 @@
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" /> <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
<xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" /> <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
<xs:complexType name="ArrayOfHistoryItem">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="HistoryItem" nillable="true" type="tns:HistoryItem" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfHistoryItem" nillable="true" type="tns:ArrayOfHistoryItem" />
<xs:complexType name="HistoryItem">
<xs:sequence>
<xs:element minOccurs="0" name="CreatedAt" type="xs:dateTime" />
<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:complexType name="ArrayOfStatusItem">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="StatusItem" nillable="true" type="tns:StatusItem" /> <xs:element minOccurs="0" maxOccurs="unbounded" name="StatusItem" nillable="true" type="tns:StatusItem" />
@ -51,16 +11,37 @@
<xs:complexType name="StatusItem"> <xs:complexType name="StatusItem">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="CompleteTime" type="xs:dateTime" /> <xs:element minOccurs="0" name="CompleteTime" type="xs:dateTime" />
<xs:element minOccurs="0" name="CreationTime" type="xs:dateTime" />
<xs:element minOccurs="0" name="Executing" type="xs:boolean" /> <xs:element minOccurs="0" name="Executing" type="xs:boolean" />
<xs:element minOccurs="0" name="ExecutionTime" type="ser:duration" /> <xs:element minOccurs="0" name="ExecutionTime" type="ser:duration" />
<xs:element minOccurs="0" name="FailureMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" nillable="true" type="xs:string" /> <xs:element minOccurs="0" name="Id" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="JobId" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" /> <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="ProgressCurrent" type="xs:int" /> <xs:element minOccurs="0" name="ProgressCurrent" type="xs:int" />
<xs:element minOccurs="0" name="ProgressTotal" type="xs:int" /> <xs:element minOccurs="0" name="ProgressTotal" type="xs:int" />
<xs:element minOccurs="0" name="StartTime" type="xs:dateTime" /> <xs:element minOccurs="0" name="StartTime" type="xs:dateTime" />
<xs:element minOccurs="0" name="Steps" nillable="true" type="tns:ArrayOfStatusItem.HistoryStep" />
<xs:element minOccurs="0" name="SuccessMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Successful" type="xs:boolean" />
<xs:element minOccurs="0" name="UpdateTime" type="xs:dateTime" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="StatusItem" nillable="true" type="tns:StatusItem" /> <xs:element name="StatusItem" nillable="true" type="tns:StatusItem" />
<xs:complexType name="ArrayOfStatusItem.HistoryStep">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="StatusItem.HistoryStep" nillable="true" type="tns:StatusItem.HistoryStep" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfStatusItem.HistoryStep" nillable="true" type="tns:ArrayOfStatusItem.HistoryStep" />
<xs:complexType name="StatusItem.HistoryStep">
<xs:sequence>
<xs:element minOccurs="0" name="Created" type="xs:dateTime" />
<xs:element minOccurs="0" name="Level" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="StatusItem.HistoryStep" nillable="true" type="tns:StatusItem.HistoryStep" />
<xs:complexType name="JobDefinition"> <xs:complexType name="JobDefinition">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" /> <xs:element minOccurs="0" name="Active" type="xs:boolean" />

View File

@ -5,8 +5,7 @@
<xs:complexContent mixed="false"> <xs:complexContent mixed="false">
<xs:extension base="tns:Base.BaseResponse"> <xs:extension base="tns:Base.BaseResponse">
<xs:sequence> <xs:sequence>
<xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="HistoryItems" nillable="true" type="q1:ArrayOfHistoryItem" /> <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="StatusItems" nillable="true" type="q1:ArrayOfStatusItem" />
<xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="StatusItems" nillable="true" type="q2:ArrayOfStatusItem" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
@ -37,7 +36,7 @@
<xs:complexType name="UpdateJob.UpdateJobRequest"> <xs:complexType name="UpdateJob.UpdateJobRequest">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="Action" type="tns:UpdateJob.UpdateJobRequest.UpdateJobAction" /> <xs:element minOccurs="0" name="Action" type="tns:UpdateJob.UpdateJobRequest.UpdateJobAction" />
<xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="Job" nillable="true" type="q3:JobDefinition" /> <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="Job" nillable="true" type="q2:JobDefinition" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="UpdateJob.UpdateJobRequest" nillable="true" type="tns:UpdateJob.UpdateJobRequest" /> <xs:element name="UpdateJob.UpdateJobRequest" nillable="true" type="tns:UpdateJob.UpdateJobRequest" />
@ -60,7 +59,7 @@
<xs:complexType name="UpdateProfile.UpdateProfileRequest"> <xs:complexType name="UpdateProfile.UpdateProfileRequest">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="Action" type="tns:UpdateProfile.UpdateProfileRequest.UpdateProfileAction" /> <xs:element minOccurs="0" name="Action" type="tns:UpdateProfile.UpdateProfileRequest.UpdateProfileAction" />
<xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="ImportProfile" nillable="true" type="q4:ImportProfile" /> <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="ImportProfile" nillable="true" type="q3:ImportProfile" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="UpdateProfile.UpdateProfileRequest" nillable="true" type="tns:UpdateProfile.UpdateProfileRequest" /> <xs:element name="UpdateProfile.UpdateProfileRequest" nillable="true" type="tns:UpdateProfile.UpdateProfileRequest" />
@ -84,10 +83,10 @@
<xs:complexContent mixed="false"> <xs:complexContent mixed="false">
<xs:extension base="tns:Base.BaseResponse"> <xs:extension base="tns:Base.BaseResponse">
<xs:sequence> <xs:sequence>
<xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="JobDefinitions" nillable="true" type="q5:ArrayOfJobDefinition" /> <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="JobDefinitions" nillable="true" type="q4:ArrayOfJobDefinition" />
<xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="JobTypes" nillable="true" type="q6:ArrayOfJobType" /> <xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="JobTypes" nillable="true" type="q5:ArrayOfJobType" />
<xs:element minOccurs="0" name="ProfileDefinitions" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" /> <xs:element minOccurs="0" name="ProfileDefinitions" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" />
<xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="WindreamObjectTypes" nillable="true" type="q7:ArrayOfObjectType" /> <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="WindreamObjectTypes" nillable="true" type="q6:ArrayOfObjectType" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
@ -95,7 +94,7 @@
<xs:element name="GetJobConfig.GetJobConfigResponse" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse" /> <xs:element name="GetJobConfig.GetJobConfigResponse" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse" />
<xs:complexType name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig"> <xs:complexType name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig">
<xs:sequence> <xs:sequence>
<xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="ImportProfiles" nillable="true" type="q8:ArrayOfImportProfile" /> <xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="ImportProfiles" nillable="true" type="q7:ArrayOfImportProfile" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" /> <xs:element name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" />

View File

@ -249,25 +249,9 @@ Namespace JobRunnerReference
Partial Public Class GetJobStatusGetJobStatusResponse Partial Public Class GetJobStatusGetJobStatusResponse
Inherits JobRunnerReference.BaseBaseResponse Inherits JobRunnerReference.BaseBaseResponse
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private HistoryItemsField() As JobRunnerReference.HistoryItem
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private StatusItemsField() As JobRunnerReference.StatusItem Private StatusItemsField() As JobRunnerReference.StatusItem
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property HistoryItems() As JobRunnerReference.HistoryItem()
Get
Return Me.HistoryItemsField
End Get
Set
If (Object.ReferenceEquals(Me.HistoryItemsField, value) <> true) Then
Me.HistoryItemsField = value
Me.RaisePropertyChanged("HistoryItems")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _ <System.Runtime.Serialization.DataMemberAttribute()> _
Public Property StatusItems() As JobRunnerReference.StatusItem() Public Property StatusItems() As JobRunnerReference.StatusItem()
Get Get
@ -282,228 +266,6 @@ Namespace JobRunnerReference
End Property End Property
End Class End Class
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _
Partial Public Class HistoryItem
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private CreatedAtField As Date
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ErrorMessageField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private JobNameField As String
<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
<Global.System.ComponentModel.BrowsableAttribute(false)> _
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 CreatedAt() As Date
Get
Return Me.CreatedAtField
End Get
Set
If (Me.CreatedAtField.Equals(value) <> true) Then
Me.CreatedAtField = value
Me.RaisePropertyChanged("CreatedAt")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property ErrorMessage() As String
Get
Return Me.ErrorMessageField
End Get
Set
If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then
Me.ErrorMessageField = value
Me.RaisePropertyChanged("ErrorMessage")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property JobName() As String
Get
Return Me.JobNameField
End Get
Set
If (Object.ReferenceEquals(Me.JobNameField, value) <> true) Then
Me.JobNameField = value
Me.RaisePropertyChanged("JobName")
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
<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
Return Me.SuccessfulField
End Get
Set
If (Me.SuccessfulField.Equals(value) <> true) Then
Me.SuccessfulField = value
Me.RaisePropertyChanged("Successful")
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
<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.Common"), _
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.Common")> _
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(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="StatusItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _ System.Runtime.Serialization.DataContractAttribute(Name:="StatusItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
@ -518,15 +280,24 @@ Namespace JobRunnerReference
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private CompleteTimeField As Date Private CompleteTimeField As Date
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private CreationTimeField As Date
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ExecutingField As Boolean Private ExecutingField As Boolean
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ExecutionTimeField As System.TimeSpan Private ExecutionTimeField As System.TimeSpan
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private FailureMessageField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private IdField As String Private IdField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private JobIdField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private NameField As String Private NameField As String
@ -539,6 +310,18 @@ Namespace JobRunnerReference
<System.Runtime.Serialization.OptionalFieldAttribute()> _ <System.Runtime.Serialization.OptionalFieldAttribute()> _
Private StartTimeField As Date Private StartTimeField As Date
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private StepsField() As JobRunnerReference.StatusItem.HistoryStep
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private SuccessMessageField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private SuccessfulField As Boolean
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private UpdateTimeField As Date
<Global.System.ComponentModel.BrowsableAttribute(false)> _ <Global.System.ComponentModel.BrowsableAttribute(false)> _
Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
Get Get
@ -562,6 +345,19 @@ Namespace JobRunnerReference
End Set End Set
End Property End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property CreationTime() As Date
Get
Return Me.CreationTimeField
End Get
Set
If (Me.CreationTimeField.Equals(value) <> true) Then
Me.CreationTimeField = value
Me.RaisePropertyChanged("CreationTime")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _ <System.Runtime.Serialization.DataMemberAttribute()> _
Public Property Executing() As Boolean Public Property Executing() As Boolean
Get Get
@ -588,6 +384,19 @@ Namespace JobRunnerReference
End Set End Set
End Property End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property FailureMessage() As String
Get
Return Me.FailureMessageField
End Get
Set
If (Object.ReferenceEquals(Me.FailureMessageField, value) <> true) Then
Me.FailureMessageField = value
Me.RaisePropertyChanged("FailureMessage")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _ <System.Runtime.Serialization.DataMemberAttribute()> _
Public Property Id() As String Public Property Id() As String
Get Get
@ -601,6 +410,19 @@ Namespace JobRunnerReference
End Set End Set
End Property End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property JobId() As String
Get
Return Me.JobIdField
End Get
Set
If (Object.ReferenceEquals(Me.JobIdField, value) <> true) Then
Me.JobIdField = value
Me.RaisePropertyChanged("JobId")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _ <System.Runtime.Serialization.DataMemberAttribute()> _
Public Property Name() As String Public Property Name() As String
Get Get
@ -653,6 +475,58 @@ Namespace JobRunnerReference
End Set End Set
End Property End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property Steps() As JobRunnerReference.StatusItem.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 SuccessMessage() As String
Get
Return Me.SuccessMessageField
End Get
Set
If (Object.ReferenceEquals(Me.SuccessMessageField, value) <> true) Then
Me.SuccessMessageField = value
Me.RaisePropertyChanged("SuccessMessage")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property Successful() As Boolean
Get
Return Me.SuccessfulField
End Get
Set
If (Me.SuccessfulField.Equals(value) <> true) Then
Me.SuccessfulField = value
Me.RaisePropertyChanged("Successful")
End If
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute()> _
Public Property UpdateTime() As Date
Get
Return Me.UpdateTimeField
End Get
Set
If (Me.UpdateTimeField.Equals(value) <> true) Then
Me.UpdateTimeField = value
Me.RaisePropertyChanged("UpdateTime")
End If
End Set
End Property
Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
Protected Sub RaisePropertyChanged(ByVal propertyName As String) Protected Sub RaisePropertyChanged(ByVal propertyName As String)
@ -661,6 +535,84 @@ Namespace JobRunnerReference
propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
End If End If
End Sub End Sub
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="StatusItem.HistoryStep", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
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 String
<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 String
Get
Return Me.LevelField
End Get
Set
If (Object.ReferenceEquals(Me.LevelField, 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
End Class End Class
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _

View File

@ -1,14 +1,50 @@
Public Class StatusItem Imports System.Runtime.Serialization
Public Class StatusItem
Public Const PROGRESS_CURRENT = "__Progress_Current" Public Const PROGRESS_CURRENT = "__Progress_Current"
Public Const PROGRESS_TOTAL = "__Progress_Total" Public Const PROGRESS_TOTAL = "__Progress_Total"
Public Id As String Public Const STEP_DEBUG = "DEBUG"
Public Name As String Public Const STEP_INFO = "INFO"
Public ExecutionTime As TimeSpan Public Const STEP_WARNING = "WARNING"
Public ProgressCurrent As Integer Public Const STEP_ERROR = "ERROR"
Public ProgressTotal As Integer
Public Executing As Boolean = False
' Unique Job Run Id, GUID
Public Id As String
' Job Id, corresponds to Job Schedule in DB
Public JobId As String
' Job Name, corresponds to Job Schedule Key from Quartz
Public Name As String = "Unnamed"
Public Steps As List(Of HistoryStep)
' Runtime Variables
' Progress Counter
Public ProgressCurrent As Integer = 0
' Total Progress
Public ProgressTotal As Integer = 0
' Flag to determin if the job is currently executing/working
Public Executing As Boolean = False
' Creation time of job, set by Constructor
Public CreationTime As Date = Date.Now
' Start time of execution, set by JobStatus.Start
Public StartTime As Date Public StartTime As Date
' End time of execution, set by JobStatus.Complete
Public CompleteTime As Date Public CompleteTime As Date
' Time of last Progress Update
Public UpdateTime As Date
' Total execution time, calculated by JobStatus.Complete
Public ExecutionTime As TimeSpan
' Completion/Failure Messages
Public Successful As Boolean = False
Public SuccessMessage As String = ""
Public FailureMessage As String = ""
Public Class HistoryStep
Public Property Created As Date = Now
Public Property Message As String
Public Property Level As String
End Class
End Class End Class

View File

@ -82,7 +82,11 @@ Public Class JobStatus
Dim oExists = Entries.Where(Function(e) e.JobId = oJobId).Any() Dim oExists = Entries.Where(Function(e) e.JobId = oJobId).Any()
If Not oExists Then If Not oExists Then
Entries.Add(New StatusItem(oJobId)) Entries.Add(New StatusItem With {
.JobId = oJobId,
.Id = Guid.NewGuid.ToString(),
.Steps = New List(Of StatusItem.HistoryStep)
})
End If End If
Return Entries.Where(Function(e) e.Id = oJobId).SingleOrDefault() Return Entries.Where(Function(e) e.Id = oJobId).SingleOrDefault()