Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

GUIs.Test.EDMIBenchmark/Form1.Designer.vb

@@ -40,10 +40,15 @@ Partial Class Form1
         Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem()
         Me.BarDockingMenuItem1 = New DevExpress.XtraBars.BarDockingMenuItem()
         Me.BarMdiChildrenListItem1 = New DevExpress.XtraBars.BarMdiChildrenListItem()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.TextboxDatatableName = New DevExpress.XtraBars.BarEditItem()
+        Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.DocumentManager1 = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components)
@@ -68,11 +73,11 @@ Partial Class Form1
         Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
         Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -110,14 +115,14 @@ Partial Class Form1
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.ButtonSelectFiles, Me.ButtonImportFiles, Me.buttonClearLog, Me.buttonClearFiles, Me.TextboxObjectId, Me.ButtonLoadFile, Me.BarListItem1, Me.BarButtonItem2, Me.BarToggleSwitchItem1, Me.BarDockingMenuItem1, Me.BarMdiChildrenListItem1, Me.BarButtonItem1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.ButtonSelectFiles, Me.ButtonImportFiles, Me.buttonClearLog, Me.buttonClearFiles, Me.TextboxObjectId, Me.ButtonLoadFile, Me.BarListItem1, Me.BarButtonItem2, Me.BarToggleSwitchItem1, Me.BarDockingMenuItem1, Me.BarMdiChildrenListItem1, Me.BarButtonItem1, Me.TextboxDatatableName, Me.BarButtonItem3})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 14
+        Me.RibbonControl1.MaxItemId = 17
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarDockingMenuItem1)
         Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1)
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
-        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1})
+        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2})
         Me.RibbonControl1.Size = New System.Drawing.Size(1310, 158)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         '
@@ -149,14 +154,14 @@ Partial Class Form1
         Me.buttonClearFiles.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.buttonClearFiles.Name = "buttonClearFiles"
         '
-        'TextboxObejctId
+        'TextboxObjectId
         '
         Me.TextboxObjectId.Caption = "Document Id"
         Me.TextboxObjectId.Edit = Me.RepositoryItemTextEdit1
         Me.TextboxObjectId.EditWidth = 100
         Me.TextboxObjectId.Id = 5
-        Me.TextboxObjectId.ImageOptions.SvgImage = CType(resources.GetObject("TextboxObejctId.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.TextboxObjectId.ImageOptions.SvgImage = CType(resources.GetObject("TextboxObjectId.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.TextboxObjectId.Name = "TextboxObejctId"
+        Me.TextboxObjectId.Name = "TextboxObjectId"
         '
         'RepositoryItemTextEdit1
         '
@@ -203,9 +208,35 @@ Partial Class Form1
         Me.BarMdiChildrenListItem1.Id = 12
         Me.BarMdiChildrenListItem1.Name = "BarMdiChildrenListItem1"
         '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Open Log Directory"
+        Me.BarButtonItem1.Id = 13
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'TextboxDatatableName
+        '
+        Me.TextboxDatatableName.Caption = "Datatable Name"
+        Me.TextboxDatatableName.Edit = Me.RepositoryItemTextEdit2
+        Me.TextboxDatatableName.Id = 15
+        Me.TextboxDatatableName.ImageOptions.SvgImage = CType(resources.GetObject("TextboxDatatableName.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.TextboxDatatableName.Name = "TextboxDatatableName"
+        '
+        'RepositoryItemTextEdit2
+        '
+        Me.RepositoryItemTextEdit2.AutoHeight = False
+        Me.RepositoryItemTextEdit2.Name = "RepositoryItemTextEdit2"
+        '
+        'BarButtonItem3
+        '
+        Me.BarButtonItem3.Caption = "Load Datatable"
+        Me.BarButtonItem3.Id = 16
+        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem3.Name = "BarButtonItem3"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup2})
         Me.RibbonPage1.Name = "RibbonPage1"
         Me.RibbonPage1.Text = "Start"
         '
@@ -223,7 +254,7 @@ Partial Class Form1
         Me.RibbonPageGroup4.ItemLinks.Add(Me.ButtonLoadFile)
         Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem2)
         Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        Me.RibbonPageGroup4.Text = "Retrieve"
+        Me.RibbonPageGroup4.Text = "Retrieve Document"
         '
         'RibbonPageGroup3
         '
@@ -233,6 +264,13 @@ Partial Class Form1
         Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
         Me.RibbonPageGroup3.Text = "Utils"
         '
+        'RibbonPageGroup2
+        '
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.TextboxDatatableName)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        Me.RibbonPageGroup2.Text = "Retrieve Datatable"
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 640)
@@ -443,12 +481,6 @@ Partial Class Form1
         '
         Me.Timer1.Interval = 3000
         '
-        'BarButtonItem1
-        '
-        Me.BarButtonItem1.Caption = "Open Log Directory"
-        Me.BarButtonItem1.Id = 13
-        Me.BarButtonItem1.Name = "BarButtonItem1"
-        '
         'Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -466,6 +498,7 @@ Partial Class Form1
         CType(Me.Document1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -532,4 +565,8 @@ Partial Class Form1
     Friend WithEvents BarDockingMenuItem1 As DevExpress.XtraBars.BarDockingMenuItem
     Friend WithEvents BarMdiChildrenListItem1 As DevExpress.XtraBars.BarMdiChildrenListItem
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents TextboxDatatableName As DevExpress.XtraBars.BarEditItem
+    Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit
+    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class

GUIs.Test.EDMIBenchmark/Form1.resx

@@ -196,7 +196,7 @@
         Ny41LDExLjh6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
 </value>
   </data>
-  <data name="TextboxObejctId.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="TextboxObjectId.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -284,6 +284,49 @@
         PSJXaGl0ZSIgLz4NCiAgPGcgaWQ9IkxheWVyXzMiIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0x
         NSw4VjdoLTNWNWgtMXYySDVWNUg0djJIMXYxaDN2MkgxdjFoM3YyaDF2LTJoNnYyaDF2LTJoM3YtMWgt
         M1Y4SDE1eiBNMTEsMTBINVY4aDZWMTB6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="TextboxDatatableName.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAxNiAxNiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MTYgMTYiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        R3JlZW57ZmlsbDojMDM5QzIzO30KCS5XaGl0ZXtmaWxsOiNGRkZGRkY7fQoJLnN0MHtvcGFjaXR5OjAu
+        Njt9Cgkuc3Qxe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTE1LDFIMUMwLjUsMSww
+        LDEuNSwwLDJ2MTJjMCwwLjUsMC41LDEsMSwxaDE0YzAuNSwwLDEtMC41LDEtMVYyQzE2LDEuNSwxNS41
+        LDEsMTUsMXogTTE1LDE0SDFWMmgxNFYxNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTAs
+        NVYyYzAtMC41LDAuNS0xLDEtMWgxNGMwLjYsMCwxLDAuNSwxLDF2M0gweiIgY2xhc3M9IkdyZWVuIiAv
+        Pg0KICA8ZyBpZD0iTGF5ZXJfMiIgY2xhc3M9InN0MCI+DQogICAgPHJlY3QgeD0iMSIgeT0iMiIgd2lk
+        dGg9IjE0IiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IldoaXRlIiAvPg0KICA8L2c+DQog
+        IDxyZWN0IHg9IjEiIHk9IjUiIHdpZHRoPSIxNCIgaGVpZ2h0PSI5IiByeD0iMCIgcnk9IjAiIGNsYXNz
+        PSJXaGl0ZSIgLz4NCiAgPHBhdGggZD0iTTUsMTJWN2gxdjVINXoiIGNsYXNzPSJCbGFjayIgLz4NCiAg
+        PHBhdGggZD0iTTExLDEyaC0xbDAtMC42QzkuOCwxMS42LDkuNSwxMiw4LjcsMTJjLTAuNSwwLTAuOS0w
+        LjItMS4yLTAuNUM3LjIsMTEuMiw3LDEwLjcsNywxMC4xQzcsOS41LDcuMiw5LDcuNSw4LjcgIGMwLjMt
+        MC4zLDAuNy0wLjUsMS4yLTAuNXMwLjksMC4yLDEuMiwwLjVWN0gxMVYxMnogTTguMSwxMC4xYzAsMC40
+        LDAsMS4yLDAuOSwxLjJjMC44LDAsMC45LTAuOCwwLjktMS4xQzkuOSw5LjgsOS44LDksOSw5ICBDOC4z
+        LDksOC4xLDkuNyw4LjEsMTAuMXoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFcCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHQiPg0KICAgIDxwYXRoIGQ9Ik0xNiwyQzgu
+        MywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYsMnogTTE2LDI0
+        bC04LThoNlY4aDR2OGg2TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
   <metadata name="DocumentManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

GUIs.Test.EDMIBenchmark/Form1.vb

@@ -213,4 +213,27 @@ Public Class Form1
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         Process.Start(_LogConfig.LogDirectory)
     End Sub
+
+    Private Async Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+        Try
+            Dim oSWTotal As New Stopwatch()
+            oSWTotal.Start()
+
+            If TextboxDatatableName.EditValue = "" Then
+                MsgBox("Please enter a Datatable name!", MsgBoxStyle.Exclamation, "Uh oh!")
+            End If
+
+            Dim oDatatableName As String = TextboxDatatableName.EditValue
+            Dim oResponse As DataTable = Await _Client.GetDatatableByNameAsync(oDatatableName)
+
+            oSWTotal.Stop()
+            AddLogMessage($"DataTable [{oResponse.TableName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]")
+        Catch ex As FaultException
+            MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service")
+            _Client.Reconnect()
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!")
+            _Client.Reconnect()
+        End Try
+    End Sub
 End Class

Modules.EDMIAPI/Client.vb

@@ -131,10 +131,25 @@ Public Class Client
         End Try
     End Function
 
+    Public Async Function GetDatatableByNameAsync(DatatableName As String) As Task(Of DataTable)
+        Try
+            Dim oResponse = Await _channel.ReturnDatatableFromCacheAsync(DatatableName)
+
+            If oResponse.OK Then
+                Return oResponse.Table
+            Else
+                Return Nothing
+            End If
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
     ''' <summary>
     ''' Aborts the channel and creates a new connection
     ''' </summary>
-    Private Sub Reconnect()
+    Public Sub Reconnect()
         _logger.Warn("Connection faulted. Trying to reconnect..")
 
         Try

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="DocumentResultOld" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="IndexResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:complexType name="DocumentObject">
-    <xs:sequence>
-      <xs:element name="ContainerId" nillable="true" type="xs:string" />
-      <xs:element name="DocumentId" type="xs:long" />
-      <xs:element name="FileName" nillable="true" type="xs:string" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="DocumentObject" nillable="true" type="tns:DocumentObject" />
-</xs:schema>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Results.xsd

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
   <xs:complexType name="TableResult">
     <xs:complexContent mixed="false">
       <xs:extension base="tns:BaseResult">
@@ -49,26 +48,4 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:element name="NonQueryResult" nillable="true" type="tns:NonQueryResult" />
-  <xs:complexType name="DocumentResultOld">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
-        <xs:sequence>
-          <xs:element name="Contents" nillable="true" type="xs:base64Binary" />
-          <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" name="Document" nillable="true" type="q1:DocumentObject" />
-          <xs:element name="HasContents" type="xs:boolean" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="DocumentResultOld" nillable="true" type="tns:DocumentResultOld" />
-  <xs:complexType name="IndexResult">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
-        <xs:sequence>
-          <xs:element name="IndexId" type="xs:long" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="IndexResult" nillable="true" type="tns:IndexResult" />
 </xs:schema>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl

@@ -4,10 +4,9 @@
     <xsd:schema targetNamespace="http://DigitalData.Services.EDMIService/Imports">
       <xsd:import namespace="http://DigitalData.Services.EDMIService" />
       <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
       <xsd:import namespace="http://schemas.microsoft.com/Message" />
     </xsd:schema>
   </wsdl:types>
@@ -17,71 +16,65 @@
   <wsdl:message name="IEDMIService_Heartbeat_OutputMessage">
     <wsdl:part name="parameters" element="tns:HeartbeatResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_CreateDatabaseRequest_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatableFromCache_InputMessage">
-    <wsdl:part name="parameters" element="tns:CreateDatabaseRequest" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatableFromCache" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_CreateDatabaseRequest_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatableFromCache_OutputMessage">
-    <wsdl:part name="parameters" element="tns:CreateDatabaseRequestResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatableFromCacheResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_CloseDatabaseRequest_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatable_Firebird_InputMessage">
-    <wsdl:part name="parameters" element="tns:CloseDatabaseRequest" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatable_Firebird" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_CloseDatabaseRequest_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatable_Firebird_OutputMessage">
-    <wsdl:part name="parameters" element="tns:CloseDatabaseRequestResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatable_FirebirdResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_ReturnDatatable_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnScalar_Firebird_InputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnDatatable" />
+    <wsdl:part name="parameters" element="tns:ReturnScalar_Firebird" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_ReturnDatatable_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnScalar_Firebird_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnDatatableResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnScalar_FirebirdResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_ReturnScalar_InputMessage">
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_Firebird_InputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnScalar" />
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_Firebird" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_ReturnScalar_OutputMessage">
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_Firebird_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnScalarResponse" />
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_FirebirdResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_ExecuteNonQuery_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_IDB_InputMessage">
-    <wsdl:part name="parameters" element="tns:ExecuteNonQuery" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_IDB" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_ExecuteNonQuery_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_IDB_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ExecuteNonQueryResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_IDBResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_NewFile_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_IDB_InputMessage">
-    <wsdl:part name="parameters" element="tns:NewFile" />
+    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_IDB" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_NewFile_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_IDB_OutputMessage">
-    <wsdl:part name="parameters" element="tns:NewFileResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_IDBResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_UpdateFile_InputMessage">
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_IDB_InputMessage">
-    <wsdl:part name="parameters" element="tns:UpdateFile" />
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_IDB" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_UpdateFile_OutputMessage">
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_IDB_OutputMessage">
-    <wsdl:part name="parameters" element="tns:UpdateFileResponse" />
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_IDBResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_GetFile_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_ECM_InputMessage">
-    <wsdl:part name="parameters" element="tns:GetFile" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_ECM" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_GetFile_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_ECM_OutputMessage">
-    <wsdl:part name="parameters" element="tns:GetFileResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_ECMResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_DeleteFile_InputMessage">
+  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_ECM_InputMessage">
-    <wsdl:part name="parameters" element="tns:DeleteFile" />
+    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_ECM" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_DeleteFile_OutputMessage">
+  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_ECM_OutputMessage">
-    <wsdl:part name="parameters" element="tns:DeleteFileResponse" />
+    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_ECMResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_GetDocumentByDocumentId_InputMessage">
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_InputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentId" />
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_ECM" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_GetDocumentByDocumentId_OutputMessage">
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_OutputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentIdResponse" />
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_ECMResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_GetDocumentByContainerId_InputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByContainerId" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_GetDocumentByContainerId_OutputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByContainerIdResponse" />
   </wsdl:message>
   <wsdl:message name="DocumentImportRequest">
     <wsdl:part name="parameters" element="tns:DocumentImportRequest" />
@@ -102,60 +95,50 @@
   <wsdl:message name="DocumentListResponse">
     <wsdl:part name="parameters" element="tns:DocumentListResponse" />
   </wsdl:message>
-  <wsdl:message name="IEDMIService_NewFileIndex_InputMessage">
-    <wsdl:part name="parameters" element="tns:NewFileIndex" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_NewFileIndex_OutputMessage">
-    <wsdl:part name="parameters" element="tns:NewFileIndexResponse" />
-  </wsdl:message>
   <wsdl:portType name="IEDMIService">
     <wsdl:operation name="Heartbeat">
       <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat" message="tns:IEDMIService_Heartbeat_InputMessage" />
       <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse" message="tns:IEDMIService_Heartbeat_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="CreateDatabaseRequest">
+    <wsdl:operation name="ReturnDatatableFromCache">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest" message="tns:IEDMIService_CreateDatabaseRequest_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache" message="tns:IEDMIService_ReturnDatatableFromCache_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestResponse" message="tns:IEDMIService_CreateDatabaseRequest_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheResponse" message="tns:IEDMIService_ReturnDatatableFromCache_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="CloseDatabaseRequest">
+    <wsdl:operation name="ReturnDatatable_Firebird">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest" message="tns:IEDMIService_CloseDatabaseRequest_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird" message="tns:IEDMIService_ReturnDatatable_Firebird_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse" message="tns:IEDMIService_CloseDatabaseRequest_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdResponse" message="tns:IEDMIService_ReturnDatatable_Firebird_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="ReturnDatatable">
+    <wsdl:operation name="ReturnScalar_Firebird">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable" message="tns:IEDMIService_ReturnDatatable_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird" message="tns:IEDMIService_ReturnScalar_Firebird_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse" message="tns:IEDMIService_ReturnDatatable_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdResponse" message="tns:IEDMIService_ReturnScalar_Firebird_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="ReturnScalar">
+    <wsdl:operation name="ExecuteNonQuery_Firebird">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar" message="tns:IEDMIService_ReturnScalar_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird" message="tns:IEDMIService_ExecuteNonQuery_Firebird_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse" message="tns:IEDMIService_ReturnScalar_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdResponse" message="tns:IEDMIService_ExecuteNonQuery_Firebird_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="ExecuteNonQuery">
+    <wsdl:operation name="ReturnDatatable_MSSQL_IDB">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery" message="tns:IEDMIService_ExecuteNonQuery_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB" message="tns:IEDMIService_ReturnDatatable_MSSQL_IDB_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse" message="tns:IEDMIService_ExecuteNonQuery_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBResponse" message="tns:IEDMIService_ReturnDatatable_MSSQL_IDB_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="NewFile">
+    <wsdl:operation name="ReturnScalar_MSSQL_IDB">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" message="tns:IEDMIService_NewFile_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB" message="tns:IEDMIService_ReturnScalar_MSSQL_IDB_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse" message="tns:IEDMIService_NewFile_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBResponse" message="tns:IEDMIService_ReturnScalar_MSSQL_IDB_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="UpdateFile">
+    <wsdl:operation name="ExecuteNonQuery_MSSQL_IDB">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile" message="tns:IEDMIService_UpdateFile_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_IDB_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse" message="tns:IEDMIService_UpdateFile_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBResponse" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_IDB_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="GetFile">
+    <wsdl:operation name="ReturnDatatable_MSSQL_ECM">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFile" message="tns:IEDMIService_GetFile_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM" message="tns:IEDMIService_ReturnDatatable_MSSQL_ECM_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse" message="tns:IEDMIService_GetFile_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMResponse" message="tns:IEDMIService_ReturnDatatable_MSSQL_ECM_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="DeleteFile">
+    <wsdl:operation name="ReturnScalar_MSSQL_ECM">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile" message="tns:IEDMIService_DeleteFile_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM" message="tns:IEDMIService_ReturnScalar_MSSQL_ECM_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse" message="tns:IEDMIService_DeleteFile_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMResponse" message="tns:IEDMIService_ReturnScalar_MSSQL_ECM_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="GetDocumentByDocumentId">
+    <wsdl:operation name="ExecuteNonQuery_MSSQL_ECM">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId" message="tns:IEDMIService_GetDocumentByDocumentId_InputMessage" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdResponse" message="tns:IEDMIService_GetDocumentByDocumentId_OutputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMResponse" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="GetDocumentByContainerId">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId" message="tns:IEDMIService_GetDocumentByContainerId_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResponse" message="tns:IEDMIService_GetDocumentByContainerId_OutputMessage" />
     </wsdl:operation>
     <wsdl:operation name="ImportFile">
       <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" name="DocumentImportRequest" message="tns:DocumentImportRequest" />
@@ -169,9 +152,5 @@
       <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser" message="tns:IEDMIService_ListFilesForUser_InputMessage" />
       <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse" name="DocumentListResponse" message="tns:DocumentListResponse" />
     </wsdl:operation>
-    <wsdl:operation name="NewFileIndex">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex" message="tns:IEDMIService_NewFileIndex_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse" message="tns:IEDMIService_NewFileIndex_OutputMessage" />
-    </wsdl:operation>
   </wsdl:portType>
 </wsdl:definitions>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" />
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
   <xs:import namespace="http://schemas.microsoft.com/Message" />
   <xs:element name="Heartbeat">
     <xs:complexType>
@@ -15,156 +14,143 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="CreateDatabaseRequest">
+  <xs:element name="ReturnDatatableFromCache">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Debug" type="xs:boolean" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="CreateDatabaseRequestResponse">
+  <xs:element name="ReturnDatatableFromCacheResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="CreateDatabaseRequestResult" nillable="true" type="xs:string" />
+        <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnDatatableFromCacheResult" nillable="true" type="q1:TableResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="CloseDatabaseRequest">
+  <xs:element name="ReturnDatatable_Firebird">
-    <xs:complexType>
-      <xs:sequence />
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="CloseDatabaseRequestResponse">
-    <xs:complexType>
-      <xs:sequence />
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ReturnDatatable">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ReturnDatatableResponse">
+  <xs:element name="ReturnDatatable_FirebirdResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ReturnDatatableResult" nillable="true" type="q1:TableResult" />
+        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnDatatable_FirebirdResult" nillable="true" type="q2:TableResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ReturnScalar">
+  <xs:element name="ReturnScalar_Firebird">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ReturnScalarResponse">
+  <xs:element name="ReturnScalar_FirebirdResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ReturnScalarResult" nillable="true" type="q2:ScalarResult" />
+        <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnScalar_FirebirdResult" nillable="true" type="q3:ScalarResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ExecuteNonQuery">
+  <xs:element name="ExecuteNonQuery_Firebird">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ExecuteNonQueryResponse">
+  <xs:element name="ExecuteNonQuery_FirebirdResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ExecuteNonQueryResult" nillable="true" type="q3:NonQueryResult" />
+        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ExecuteNonQuery_FirebirdResult" nillable="true" type="q4:NonQueryResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="NewFile">
+  <xs:element name="ReturnDatatable_MSSQL_IDB">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="NewFileResponse">
+  <xs:element name="ReturnDatatable_MSSQL_IDBResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileResult" nillable="true" type="q4:DocumentResultOld" />
+        <xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnDatatable_MSSQL_IDBResult" nillable="true" type="q5:TableResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="UpdateFile">
+  <xs:element name="ReturnScalar_MSSQL_IDB">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q5:DocumentObject" />
+        <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="UpdateFileResponse">
+  <xs:element name="ReturnScalar_MSSQL_IDBResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="UpdateFileResult" nillable="true" type="q6:DocumentResultOld" />
+        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnScalar_MSSQL_IDBResult" nillable="true" type="q6:ScalarResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="GetFile">
+  <xs:element name="ExecuteNonQuery_MSSQL_IDB">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q7:DocumentObject" />
+        <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="GetFileResponse">
+  <xs:element name="ExecuteNonQuery_MSSQL_IDBResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetFileResult" nillable="true" type="q8:DocumentResultOld" />
+        <xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ExecuteNonQuery_MSSQL_IDBResult" nillable="true" type="q7:NonQueryResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="DeleteFile">
+  <xs:element name="ReturnDatatable_MSSQL_ECM">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q9:DocumentObject" />
+        <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="DeleteFileResponse">
+  <xs:element name="ReturnDatatable_MSSQL_ECMResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="DeleteFileResult" type="xs:boolean" />
+        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnDatatable_MSSQL_ECMResult" nillable="true" type="q8:TableResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="GetDocumentByDocumentId">
+  <xs:element name="ReturnScalar_MSSQL_ECM">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="DocumentId" type="xs:long" />
+        <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="GetDocumentByDocumentIdResponse">
+  <xs:element name="ReturnScalar_MSSQL_ECMResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q10:DocumentResultOld" />
+        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ReturnScalar_MSSQL_ECMResult" nillable="true" type="q9:ScalarResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="GetDocumentByContainerId">
+  <xs:element name="ExecuteNonQuery_MSSQL_ECM">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="ContainerId" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="SQL" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="GetDocumentByContainerIdResponse">
+  <xs:element name="ExecuteNonQuery_MSSQL_ECMResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q11:DocumentResultOld" />
+        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results" minOccurs="0" name="ExecuteNonQuery_MSSQL_ECMResult" nillable="true" type="q10:NonQueryResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -196,7 +182,7 @@
   <xs:element name="DocumentStreamResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.microsoft.com/Message" name="FileContents" type="q12:StreamBody" />
+        <xs:element xmlns:q11="http://schemas.microsoft.com/Message" name="FileContents" type="q11:StreamBody" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -221,21 +207,4 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="NewFileIndex">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q13:DocumentObject" />
-        <xs:element minOccurs="0" name="Syskey" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="LanguageCode" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Value" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewFileIndexResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q14:IndexResult" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
 </xs:schema>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap

@@ -26,10 +26,9 @@
     <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="63e6618a-fa84-4922-b771-92728dee5bd0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="DigitalData.Services.EDMIService.xsd" MetadataType="Schema" ID="8b75b395-459e-4678-b979-5e50ebd6a173" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="1d0f216a-7f01-4129-a6bf-26e91c5e631d" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.EDMIService1.xsd" MetadataType="Schema" ID="9809989f-5319-4140-b18e-c3bcd5e8d139" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.Results.xsd" MetadataType="Schema" ID="229ec0eb-3ad2-4768-b900-0fe658c77294" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="e0db7004-6943-4cf8-b88f-4811ed14a341" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="6c7bdb47-eea4-4d03-bc52-9747c865bbf0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Modules.Filesystem.xsd" MetadataType="Schema" ID="cfa7fe70-b4f1-4a12-a957-d0134a8e6279" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="Message.xsd" MetadataType="Schema" ID="2589e82f-d68f-4843-b153-a80edf895f82" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
   </Metadata>
   <Extensions>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb

@@ -18,12 +18,10 @@ Namespace EDMIServiceReference
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results"),  _
      System.SerializableAttribute(),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResultOld)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))>  _
     Partial Public Class BaseResult
         Inherits Object
@@ -86,15 +84,12 @@ Namespace EDMIServiceReference
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results"),  _
      System.SerializableAttribute(),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResultOld)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull))>  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject))>  _
     Partial Public Class ScalarResult
         Inherits EDMIServiceReference.BaseResult
         
@@ -117,7 +112,7 @@ Namespace EDMIServiceReference
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results"),  _
      System.SerializableAttribute()>  _
     Partial Public Class NonQueryResult
         Inherits EDMIServiceReference.BaseResult
@@ -125,83 +120,7 @@ Namespace EDMIServiceReference
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResultOld", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Results"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class DocumentResultOld
-        Inherits EDMIServiceReference.BaseResult
-        
-        Private ContentsField() As Byte
-        
-        Private DocumentField As EDMIServiceReference.DocumentObject
-        
-        Private HasContentsField As Boolean
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Contents() As Byte()
-            Get
-                Return Me.ContentsField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then
-                    Me.ContentsField = value
-                    Me.RaisePropertyChanged("Contents")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As EDMIServiceReference.DocumentObject
-            Get
-                Return Me.DocumentField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then
-                    Me.DocumentField = value
-                    Me.RaisePropertyChanged("Document")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property HasContents() As Boolean
-            Get
-                Return Me.HasContentsField
-            End Get
-            Set
-                If (Me.HasContentsField.Equals(value) <> true) Then
-                    Me.HasContentsField = value
-                    Me.RaisePropertyChanged("HasContents")
-                End If
-            End Set
-        End Property
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class IndexResult
-        Inherits EDMIServiceReference.BaseResult
-        
-        Private IndexIdField As Long
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property IndexId() As Long
-            Get
-                Return Me.IndexIdField
-            End Get
-            Set
-                If (Me.IndexIdField.Equals(value) <> true) Then
-                    Me.IndexIdField = value
-                    Me.RaisePropertyChanged("IndexId")
-                End If
-            End Set
-        End Property
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
      System.SerializableAttribute()>  _
     Partial Public Class TableResult
         Inherits EDMIServiceReference.BaseResult
@@ -223,82 +142,6 @@ Namespace EDMIServiceReference
         End Property
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class DocumentObject
-        Inherits Object
-        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-        
-        <System.NonSerializedAttribute()>  _
-        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
-        
-        Private ContainerIdField As String
-        
-        Private DocumentIdField As Long
-        
-        Private FileNameField As String
-        
-        <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(IsRequired:=true)>  _
-        Public Property ContainerId() As String
-            Get
-                Return Me.ContainerIdField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ContainerIdField, value) <> true) Then
-                    Me.ContainerIdField = value
-                    Me.RaisePropertyChanged("ContainerId")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property DocumentId() As Long
-            Get
-                Return Me.DocumentIdField
-            End Get
-            Set
-                If (Me.DocumentIdField.Equals(value) <> true) Then
-                    Me.DocumentIdField = value
-                    Me.RaisePropertyChanged("DocumentId")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property FileName() As String
-            Get
-                Return Me.FileNameField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
-                    Me.FileNameField = value
-                    Me.RaisePropertyChanged("FileName")
-                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.ServiceModel", "4.0.0.0"),  _
      System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.EDMIService", ConfigurationName:="EDMIServiceReference.IEDMIService")>  _
     Public Interface IEDMIService
@@ -309,79 +152,85 @@ Namespace EDMIServiceReference
         <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse")>  _
         Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestRespons"& _ 
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheResp"& _ 
-            "e")>  _
-        Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestRespons"& _ 
-            "e")>  _
-        Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse"& _ 
-            "")>  _
-        Sub CloseDatabaseRequest()
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse"& _ 
-            "")>  _
-        Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse")>  _
-        Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse")>  _
-        Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse")>  _
-        Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse")>  _
-        Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse")>  _
-        Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse")>  _
-        Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
-        Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
-        Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
-        Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
-        Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
-        Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResultOld
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
-        Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse")>  _
-        Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse")>  _
-        Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
-            "nse")>  _
-        Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResultOld
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
-            "nse")>  _
-        Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
             "onse")>  _
-        Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResultOld
+        Function ReturnDatatableFromCache(ByVal Name As String) As EDMIServiceReference.TableResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheResp"& _ 
             "onse")>  _
-        Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
+        Function ReturnDatatableFromCacheAsync(ByVal Name As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdResp"& _ 
+            "onse")>  _
+        Function ReturnDatatable_Firebird(ByVal SQL As String) As EDMIServiceReference.TableResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdResp"& _ 
+            "onse")>  _
+        Function ReturnDatatable_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdRespons"& _ 
+            "e")>  _
+        Function ReturnScalar_Firebird(ByVal SQL As String) As EDMIServiceReference.ScalarResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdRespons"& _ 
+            "e")>  _
+        Function ReturnScalar_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdResp"& _ 
+            "onse")>  _
+        Function ExecuteNonQuery_Firebird(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdResp"& _ 
+            "onse")>  _
+        Function ExecuteNonQuery_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBRes"& _ 
+            "ponse")>  _
+        Function ReturnDatatable_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.TableResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBRes"& _ 
+            "ponse")>  _
+        Function ReturnDatatable_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBRespon"& _ 
+            "se")>  _
+        Function ReturnScalar_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.ScalarResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBRespon"& _ 
+            "se")>  _
+        Function ReturnScalar_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBRes"& _ 
+            "ponse")>  _
+        Function ExecuteNonQuery_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBRes"& _ 
+            "ponse")>  _
+        Function ExecuteNonQuery_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMRes"& _ 
+            "ponse")>  _
+        Function ReturnDatatable_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.TableResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMRes"& _ 
+            "ponse")>  _
+        Function ReturnDatatable_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMRespon"& _ 
+            "se")>  _
+        Function ReturnScalar_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.ScalarResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMRespon"& _ 
+            "se")>  _
+        Function ReturnScalar_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMRes"& _ 
+            "ponse")>  _
+        Function ExecuteNonQuery_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMRes"& _ 
+            "ponse")>  _
+        Function ExecuteNonQuery_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
         
         'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentImportRequest) von Nachricht "DocumentImportRequest" nicht mit dem Standardwert (ImportFile) übereinstimmt.
         <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
@@ -403,12 +252,6 @@ Namespace EDMIServiceReference
         
         <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
         Function ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse")>  _
-        Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse")>  _
-        Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult)
     End Interface
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
@@ -576,92 +419,84 @@ Namespace EDMIServiceReference
             Return MyBase.Channel.HeartbeatAsync
         End Function
         
-        Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequest
+        Public Function ReturnDatatableFromCache(ByVal Name As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatableFromCache
-            Return MyBase.Channel.CreateDatabaseRequest(Name, Debug)
+            Return MyBase.Channel.ReturnDatatableFromCache(Name)
         End Function
         
-        Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequestAsync
+        Public Function ReturnDatatableFromCacheAsync(ByVal Name As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatableFromCacheAsync
-            Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug)
+            Return MyBase.Channel.ReturnDatatableFromCacheAsync(Name)
         End Function
         
-        Public Sub CloseDatabaseRequest() Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequest
+        Public Function ReturnDatatable_Firebird(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable_Firebird
-            MyBase.Channel.CloseDatabaseRequest
+            Return MyBase.Channel.ReturnDatatable_Firebird(SQL)
-        End Sub
-        
-        Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequestAsync
-            Return MyBase.Channel.CloseDatabaseRequestAsync
         End Function
         
-        Public Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable
+        Public Function ReturnDatatable_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatable_FirebirdAsync
-            Return MyBase.Channel.ReturnDatatable(SQL)
+            Return MyBase.Channel.ReturnDatatable_FirebirdAsync(SQL)
         End Function
         
-        Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatableAsync
+        Public Function ReturnScalar_Firebird(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar_Firebird
-            Return MyBase.Channel.ReturnDatatableAsync(SQL)
+            Return MyBase.Channel.ReturnScalar_Firebird(SQL)
         End Function
         
-        Public Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar
+        Public Function ReturnScalar_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalar_FirebirdAsync
-            Return MyBase.Channel.ReturnScalar(SQL)
+            Return MyBase.Channel.ReturnScalar_FirebirdAsync(SQL)
         End Function
         
-        Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalarAsync
+        Public Function ExecuteNonQuery_Firebird(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery_Firebird
-            Return MyBase.Channel.ReturnScalarAsync(SQL)
+            Return MyBase.Channel.ExecuteNonQuery_Firebird(SQL)
         End Function
         
-        Public Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery
+        Public Function ExecuteNonQuery_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery_FirebirdAsync
-            Return MyBase.Channel.ExecuteNonQuery(SQL)
+            Return MyBase.Channel.ExecuteNonQuery_FirebirdAsync(SQL)
         End Function
         
-        Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQueryAsync
+        Public Function ReturnDatatable_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable_MSSQL_IDB
-            Return MyBase.Channel.ExecuteNonQueryAsync(SQL)
+            Return MyBase.Channel.ReturnDatatable_MSSQL_IDB(SQL)
         End Function
         
-        Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.NewFile
+        Public Function ReturnDatatable_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatable_MSSQL_IDBAsync
-            Return MyBase.Channel.NewFile(FileName, Contents)
+            Return MyBase.Channel.ReturnDatatable_MSSQL_IDBAsync(SQL)
         End Function
         
-        Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.NewFileAsync
+        Public Function ReturnScalar_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar_MSSQL_IDB
-            Return MyBase.Channel.NewFileAsync(FileName, Contents)
+            Return MyBase.Channel.ReturnScalar_MSSQL_IDB(SQL)
         End Function
         
-        Public Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.UpdateFile
+        Public Function ReturnScalar_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalar_MSSQL_IDBAsync
-            Return MyBase.Channel.UpdateFile(DocObject, Contents)
+            Return MyBase.Channel.ReturnScalar_MSSQL_IDBAsync(SQL)
         End Function
         
-        Public Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.UpdateFileAsync
+        Public Function ExecuteNonQuery_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery_MSSQL_IDB
-            Return MyBase.Channel.UpdateFileAsync(DocObject, Contents)
+            Return MyBase.Channel.ExecuteNonQuery_MSSQL_IDB(SQL)
         End Function
         
-        Public Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.GetFile
+        Public Function ExecuteNonQuery_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery_MSSQL_IDBAsync
-            Return MyBase.Channel.GetFile(DocObject)
+            Return MyBase.Channel.ExecuteNonQuery_MSSQL_IDBAsync(SQL)
         End Function
         
-        Public Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.GetFileAsync
+        Public Function ReturnDatatable_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable_MSSQL_ECM
-            Return MyBase.Channel.GetFileAsync(DocObject)
+            Return MyBase.Channel.ReturnDatatable_MSSQL_ECM(SQL)
         End Function
         
-        Public Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean Implements EDMIServiceReference.IEDMIService.DeleteFile
+        Public Function ReturnDatatable_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatable_MSSQL_ECMAsync
-            Return MyBase.Channel.DeleteFile(DocObject)
+            Return MyBase.Channel.ReturnDatatable_MSSQL_ECMAsync(SQL)
         End Function
         
-        Public Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.DeleteFileAsync
+        Public Function ReturnScalar_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar_MSSQL_ECM
-            Return MyBase.Channel.DeleteFileAsync(DocObject)
+            Return MyBase.Channel.ReturnScalar_MSSQL_ECM(SQL)
         End Function
         
-        Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentId
+        Public Function ReturnScalar_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalar_MSSQL_ECMAsync
-            Return MyBase.Channel.GetDocumentByDocumentId(DocumentId)
+            Return MyBase.Channel.ReturnScalar_MSSQL_ECMAsync(SQL)
         End Function
         
-        Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentIdAsync
+        Public Function ExecuteNonQuery_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery_MSSQL_ECM
-            Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId)
+            Return MyBase.Channel.ExecuteNonQuery_MSSQL_ECM(SQL)
         End Function
         
-        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerId
+        Public Function ExecuteNonQuery_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery_MSSQL_ECMAsync
-            Return MyBase.Channel.GetDocumentByContainerId(ContainerId)
+            Return MyBase.Channel.ExecuteNonQuery_MSSQL_ECMAsync(SQL)
-        End Function
-        
-        Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerIdAsync
-            Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId)
         End Function
         
         <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
@@ -739,13 +574,5 @@ Namespace EDMIServiceReference
             Dim inValue As EDMIServiceReference.ListFilesForUserRequest = New EDMIServiceReference.ListFilesForUserRequest()
             Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue)
         End Function
-        
-        Public Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult Implements EDMIServiceReference.IEDMIService.NewFileIndex
-            Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value)
-        End Function
-        
-        Public Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) Implements EDMIServiceReference.IEDMIService.NewFileIndexAsync
-            Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value)
-        End Function
     End Class
 End Namespace

Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl

@@ -50,8 +50,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="CreateDatabaseRequest">
+    <wsdl:operation name="ReturnDatatableFromCache">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -59,8 +59,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="CloseDatabaseRequest">
+    <wsdl:operation name="ReturnDatatable_Firebird">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -68,8 +68,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="ReturnDatatable">
+    <wsdl:operation name="ReturnScalar_Firebird">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -77,8 +77,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="ReturnScalar">
+    <wsdl:operation name="ExecuteNonQuery_Firebird">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -86,8 +86,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="ExecuteNonQuery">
+    <wsdl:operation name="ReturnDatatable_MSSQL_IDB">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -95,8 +95,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="NewFile">
+    <wsdl:operation name="ReturnScalar_MSSQL_IDB">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -104,8 +104,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="UpdateFile">
+    <wsdl:operation name="ExecuteNonQuery_MSSQL_IDB">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -113,8 +113,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="GetFile">
+    <wsdl:operation name="ReturnDatatable_MSSQL_ECM">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -122,8 +122,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="DeleteFile">
+    <wsdl:operation name="ReturnScalar_MSSQL_ECM">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -131,17 +131,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="GetDocumentByDocumentId">
+    <wsdl:operation name="ExecuteNonQuery_MSSQL_ECM">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetDocumentByContainerId">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -177,15 +168,6 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="NewFileIndex">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="EDMIService">
     <wsdl:port name="tcpBinding" binding="tns:tcpBinding">

Modules.EDMIAPI/EDMI.API.vbproj

@@ -111,15 +111,9 @@
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
@@ -129,16 +123,13 @@
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.Filesystem.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Results.xsd">
       <SubType>Designer</SubType>
     </None>
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.wsdl" />
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="Connected Services\EDMIServiceReference\Message.xsd">
       <SubType>Designer</SubType>
     </None>

Service.EDMIService/App.config

@@ -59,6 +59,10 @@
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup>

Service.EDMIService/EDMIService.vb

@@ -1,6 +1,7 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.language
 Imports DigitalData.Modules
 Imports System.IO
 Imports System.ServiceModel
@@ -19,6 +20,7 @@ Public Class EDMIService
     Public Shared Filesystem As Filesystem.File
     Public Shared EDMIArchive As EDMI.File.Archive
     Public Shared GlobalState As GlobalState
+    Public Shared Scheduler As Scheduler
 
     Private ReadOnly _logger As Logger
 
@@ -64,6 +66,49 @@ Public Class EDMIService
     End Function
 #End Region
 
+#Region "Database"
+    Public Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult Implements IEDMIService.ReturnDatatableFromCache
+        Try
+            _logger.Info($"ReturnDatatableFromCache, Datatable: {Name}")
+
+            Dim oDataset As DataSet = Scheduler.DataSet
+            Dim oDataTable As DataTable = Nothing
+
+            _logger.Debug("DataSet contains [{0}] datatables", oDataset.Tables.Count)
+
+            If oDataset.Tables.Contains(Name) Then
+                oDataTable = oDataset.Tables.Item(Name).Copy()
+
+                ' Apply filter and sorting to data
+                Dim oFilterExpression As String = Utils.NotNull(FilterExpression, String.Empty)
+                Dim oSortByColumn As String = Utils.NotNull(SortByColumn, String.Empty)
+                Dim oFilteredTable = oDataTable.
+                    Select(oFilterExpression, oSortByColumn).
+                    CopyToDataTable()
+
+                _logger.Debug("Datatable Stats for [{0}]:", Name)
+                _logger.Debug("Unfiltered: [{0}] rows", oDataTable.Rows.Count)
+                _logger.Debug("Filtered: [{0}] rows", oFilteredTable.Rows.Count)
+
+                Return New TableResult(oFilteredTable)
+            Else
+                Throw New ApplicationException($"DataTable {Name} does not exist")
+            End If
+
+            'If oDataset.Tables.Contains(Name) Then
+            '    oDataTable = oDataset.Tables.Item(Name).Clone()
+
+            '    Return New TableResult(oDataTable)
+            'Else
+            '    Throw New ApplicationException($"DataTable {Name} does not exist")
+            'End If
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return New TableResult(ex.Message)
+        End Try
+    End Function
+#End Region
+
 #Region "=== Database (MSSQL IDB) ==="
     Public Function ReturnDatatable_MSSQL_IDB(SQL As String) As TableResult Implements IEDMIService.ReturnDatatable_MSSQL_IDB
         Try

Service.EDMIService/EDMIService.vbproj

@@ -67,16 +67,39 @@
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="Quartz, Version=3.2.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.2.3\lib\net461\Quartz.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
@@ -108,6 +131,9 @@
     <Compile Include="Exceptions.vb" />
     <Compile Include="Results\DatabaseResult.vb" />
     <Compile Include="EDMIService.vb" />
+    <Compile Include="Scheduler.vb" />
+    <Compile Include="Scheduler\DatatableJob.vb" />
+    <Compile Include="Scheduler\JobListener.vb" />
     <Compile Include="WindowsService.vb">
       <SubType>Component</SubType>
     </Compile>
@@ -180,6 +206,10 @@
       <Project>{991D0231-4623-496D-8BD0-9CA906029CBC}</Project>
       <Name>Filesystem</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
       <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
       <Name>Logging</Name>

Service.EDMIService/GlobalState.vb

@@ -4,21 +4,23 @@ Imports DigitalData.Modules.Logging
 Public Class GlobalState
     Private ReadOnly _LogConfig As LogConfig
     Private ReadOnly _Logger As Logger
-    Private ReadOnly _MSSQL As MSSQLServer
+    Private ReadOnly _MSSQL_IDB As MSSQLServer
+    Private ReadOnly _MSSQL_ECM As MSSQLServer
 
     Public Property ObjectStores As New List(Of ObjectStore)
 
-    Public Sub New(LogConfig As LogConfig, MSSQL_IDB As MSSQLServer)
+    Public Sub New(LogConfig As LogConfig, MSSQL_IDB As MSSQLServer, MSSQL_ECM As MSSQLServer)
         _LogConfig = LogConfig
         _Logger = LogConfig.GetLogger()
-        _MSSQL = MSSQL_IDB
+        _MSSQL_IDB = MSSQL_IDB
+        _MSSQL_ECM = MSSQL_ECM
     End Sub
 
     Public Sub LoadObjectStores()
         _Logger.Debug("Loading Object Stores")
         Try
             Dim oSQL As String = "SELECT * FROM VWIDB_OBJECTSTORE"
-            Dim oDatatable As DataTable = _MSSQL.GetDatatable(oSQL)
+            Dim oDatatable As DataTable = _MSSQL_IDB.GetDatatable(oSQL)
 
             ObjectStores.Clear()
 
@@ -36,7 +38,6 @@ Public Class GlobalState
             Next
         Catch ex As Exception
             _Logger.Error(ex)
-            Throw ex
         End Try
     End Sub
 

Service.EDMIService/IEDMIService.vb

@@ -11,6 +11,11 @@ Interface IEDMIService
     Function Heartbeat() As Boolean
 #End Region
 
+#Region "Database"
+    <OperationContract>
+    Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult
+#End Region
+
 #Region "Database (Firebird)"
     <OperationContract>
     Function ReturnDatatable_Firebird(SQL As String) As TableResult

Service.EDMIService/Scheduler.vb

@@ -0,0 +1,172 @@
+Imports System.Collections.Specialized
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports Quartz
+Imports Quartz.Impl
+Imports Quartz.Impl.Matchers
+Imports Quartz.Logging
+
+Public Class Scheduler
+    Private _Factory As StdSchedulerFactory
+    Private _MSSQL As MSSQLServer
+    Private _Scheduler As IScheduler
+    Private _LogConfig As LogConfig
+    Private _Logger As DigitalData.Modules.Logging.Logger
+    Private _JobListener As JobListener
+
+    Private _Props = New NameValueCollection From {
+        {"quartz.serializer.type", "binary"}
+    }
+
+    Private Const JOB_GROUP As String = "DatatableJobs"
+
+    Public ReadOnly Property DataSet As DataSet
+        Get
+            Return _JobListener.Dataset
+        End Get
+    End Property
+
+    Public Sub New(LogConfig As LogConfig, MSSQL_ECM As MSSQLServer)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+        _Factory = New StdSchedulerFactory(_Props)
+        _MSSQL = MSSQL_ECM
+
+        Dim oDataSet As New DataSet()
+        _JobListener = New JobListener(LogConfig, _MSSQL, oDataSet)
+
+        Logging.LogProvider.SetCurrentLogProvider(New LogProvider(_Logger))
+    End Sub
+
+    Public Async Sub Start()
+        ' Get new scheduler
+        _Scheduler = Await _Factory.GetScheduler()
+
+        ' configure it
+        _Scheduler.ListenerManager.AddJobListener(_JobListener,
+                                                  GroupMatcher(Of JobKey).GroupEquals(JOB_GROUP))
+
+        ' start it
+        Await _Scheduler.Start()
+
+        Dim oCronjobs As DataTable = Await GetCronJobs()
+
+        Try
+            If oCronjobs IsNot Nothing Then
+                _Logger.Debug("Loaded {0} cron jobs", oCronjobs.Rows.Count)
+
+                For Each oRow As DataRow In oCronjobs.Rows
+                    Dim oDefinition As String = oRow.Item("CRON_DEFINITION")
+                    Dim oTitle As String = oRow.Item("TITLE")
+                    Dim oGuid As Integer = oRow.Item("GUID")
+                    Dim oCronDetails As DataTable = Await GetCronJobDetails(oGuid)
+
+                    If oCronDetails IsNot Nothing Then
+                        _Logger.Debug("Loaded job [{0}]", oTitle)
+                        _Logger.Debug("Job details: {0}", oCronDetails.Rows.Count)
+                        _Logger.Debug("Job definition: {0}", oDefinition)
+
+                        For Each oRowDetail As DataRow In oCronDetails.Rows
+                            Dim oTrigger As ITrigger
+                            Dim oJob As IJobDetail
+                            Dim oDataTableName As String = oRowDetail.Item("DT_NAME")
+                            Dim oRunOnStartup As Boolean = oRowDetail.Item("RUN_ON_STARTUP")
+                            Dim oJobIdentity As String = $"{oGuid}~{oDataTableName}"
+
+                            Dim oBaseTrigger = TriggerBuilder.Create().
+                                WithIdentity(oJobIdentity, JOB_GROUP).
+                                WithCronSchedule(oDefinition)
+
+                            ' Run directly at startup if configured
+                            If oRunOnStartup Then
+                                oBaseTrigger = oBaseTrigger.StartNow()
+                            End If
+
+                            oTrigger = oBaseTrigger.Build()
+
+                            oJob = JobBuilder.Create(Of DatatableJob)().
+                                WithIdentity(oJobIdentity, JOB_GROUP).
+                                UsingJobData(New JobDataMap() From {
+                                    {"LogConfig", _LogConfig},
+                                    {"MSSQL", _MSSQL},
+                                    {"CronJobId", oGuid},
+                                    {"CronJobTitle", oTitle},
+                                    {"CronJobDetails", oRowDetail}
+                                }).
+                                Build()
+
+                            Await _Scheduler.ScheduleJob(oJob, oTrigger)
+                            _Logger.Debug("Scheduled a new job for Cron Job Id [{0}]", oGuid)
+                        Next
+                    Else
+                        _Logger.Warn("CronJob Details for CronJob [{0}] could not be fetched!", oGuid)
+                    End If
+                Next
+            Else
+                _Logger.Warn("CronJobs could not be fetched!")
+            End If
+        Catch ex As Exception
+            _Logger.Error(ex)
+            _Logger.Warn("Unexpected Error while setting up scheduler: " & ex.Message)
+        End Try
+    End Sub
+
+    Public Async Function GetCronJobs() As Task(Of DataTable)
+        Try
+            Dim oSQL As String = "SELECT * FROM TBAPPSERV_CRON_JOB WHERE ACTIVE = 1"
+            Dim oDatatable As DataTable = Await _MSSQL.GetDatatableAsync(oSQL)
+
+            Return oDatatable
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    Public Async Function GetCronJobDetails(CronJobId As Integer) As Task(Of DataTable)
+        Try
+            Dim oSQL As String = $"SELECT * FROM TBAPPSERV_CRON_DETAIL WHERE CRON_ID = {CronJobId}"
+            Dim oDatatable As DataTable = Await _MSSQL.GetDatatableAsync(oSQL)
+
+            Return oDatatable
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    Public Async Sub [Stop]()
+        Await _Scheduler.Shutdown()
+    End Sub
+
+    Private Class LogProvider
+        Implements ILogProvider
+
+        Private _Logger As Modules.Logging.Logger
+
+        Public Sub New(Logger As DigitalData.Modules.Logging.Logger)
+            MyBase.New()
+            _Logger = Logger
+        End Sub
+
+        Public Function OpenNestedContext(message As String) As IDisposable Implements ILogProvider.OpenNestedContext
+            Throw New NotImplementedException()
+        End Function
+
+        Public Function OpenMappedContext(key As String, value As Object, Optional destructure As Boolean = False) As IDisposable Implements ILogProvider.OpenMappedContext
+            Throw New NotImplementedException()
+        End Function
+
+        Private Function GetLogger(name As String) As Logging.Logger Implements ILogProvider.GetLogger
+            Return Function(level, func, exception, parameters)
+                       If exception IsNot Nothing Then
+                           _Logger.Error(exception)
+                       ElseIf level >= LogLevel.Debug AndAlso func IsNot Nothing Then
+                           _Logger.Debug(func(), parameters)
+                       ElseIf level >= LogLevel.Info AndAlso func IsNot Nothing Then
+                           _Logger.Info(func(), parameters)
+                       End If
+
+                       Return True
+                   End Function
+        End Function
+    End Class
+End Class

Service.EDMIService/Scheduler/DatatableJob.vb

@@ -0,0 +1,41 @@
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports Quartz
+
+Public Class DatatableJob
+    Implements IJob
+
+    Public Function Execute(context As IJobExecutionContext) As Task Implements IJob.Execute
+        Dim oJobData = context.MergedJobDataMap
+        Dim oLogConfig As LogConfig = oJobData.Item("LogConfig")
+        Dim oLogger As Logger = oLogConfig.GetLogger()
+
+        Try
+            Dim oCronJobTitle As String = oJobData.Item("CronJobTitle")
+            Dim oDetailRow As DataRow = oJobData.Item("CronJobDetails")
+            Dim oMSSQL As MSSQLServer = oJobData.Item("MSSQL")
+
+            Dim oConnectionId As Integer = oDetailRow.Item("CON_ID")
+            Dim oTitle As String = oDetailRow.Item("TITLE")
+            Dim oDatatableName As String = oDetailRow.Item("DT_NAME")
+            Dim oSQL As String = oDetailRow.Item("COMMAND")
+
+            oLogger.Debug("Running Command-Job [{0}]", oTitle)
+            oLogger.Debug("Datatable Name: {0}", oDatatableName)
+            oLogger.Debug("Connection Id: {0}", oConnectionId)
+
+            Dim oConnectionString = oMSSQL.Get_ConnectionStringforID(oConnectionId)
+
+            Dim oResult = oMSSQL.GetDatatableWithConnection(oSQL, oConnectionString)
+            oResult.TableName = oDatatableName
+            oLogger.Debug("Result Datatable contains [{0}] rows", oResult.Rows.Count)
+
+            ' Das Ergebnis speichern
+            context.Result = oResult
+        Catch ex As Exception
+            oLogger.Warn("Unhandled exception while executing SQL for Datatable {}")
+        End Try
+
+        Return Task.FromResult(True)
+    End Function
+End Class

Service.EDMIService/Scheduler/JobListener.vb

@@ -0,0 +1,56 @@
+Imports System.Threading
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports Quartz
+Imports Quartz.Listener
+
+Public Class JobListener
+    Inherits JobListenerSupport
+    Public Overrides ReadOnly Property Name As String = "JobListener"
+    Public Property Dataset As DataSet
+
+    Private ReadOnly _Logger As Logger
+    Private ReadOnly _LogConfig As LogConfig
+    Private ReadOnly _MSSQL As MSSQLServer
+
+    Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer, ResultDataSet As DataSet)
+        MyBase.New()
+
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+        _MSSQL = MSSQL
+        Dataset = ResultDataSet
+    End Sub
+
+    Public Overrides Function JobWasExecuted(context As IJobExecutionContext, jobException As JobExecutionException, Optional cancellationToken As CancellationToken = Nothing) As Task
+        Try
+            Dim oDataTable As DataTable = context.Result
+            Dim oDetailRow As DataRow = context.MergedJobDataMap.Item("CronJobDetails")
+            Dim oDatatableName As String = oDetailRow.Item("DT_NAME")
+            Dim oDetailId As Integer = oDetailRow.Item("GUID")
+            Dim oDatatableNameTemp As String = oDatatableName & "-TEMP"
+
+            If Dataset.Tables.Contains(oDatatableName) Then
+                _Logger.Debug("DataTable [{0}] exists, renaming and replacing", oDatatableName)
+                ' Rename the new table, add TEMP suffix
+                oDataTable.TableName = oDatatableNameTemp
+                ' Add the new table to the dataset
+                Dataset.Tables.Add(oDataTable)
+                ' Remove the old table
+                Dataset.Tables.Remove(oDatatableName)
+                ' Rename the new table
+                Dataset.Tables.Item(oDatatableNameTemp).TableName = oDatatableName
+            Else
+                _Logger.Debug("DataTable [{0}] does not exist, adding", oDatatableName)
+                Dataset.Tables.Add(oDataTable)
+            End If
+
+            _MSSQL.ExecuteNonQuery($"INSERT INTO TBAPPSERV_CRON_DETAIL_HISTORY (DETAIL_ID) VALUES ({oDetailId})")
+        Catch ex As Exception
+            _Logger.Warn("Unexpected error in JobListener: {0}", ex.Message)
+            _Logger.Error(ex)
+        End Try
+
+        Return MyBase.JobWasExecuted(context, jobException, cancellationToken)
+    End Function
+End Class

Service.EDMIService/WindowsService.vb

@@ -23,6 +23,7 @@ Public Class WindowsService
     Private _Archive As EDMI.File.Archive
     Private _Filesystem As Filesystem.File
     Private _Global As GlobalState
+    Private _Scheduler As Scheduler
 
     Public Sub New()
         ServiceName = SERVICE_NAME
@@ -37,6 +38,7 @@ Public Class WindowsService
             Dim oServicePath As String = AppDomain.CurrentDomain.BaseDirectory
 
             _LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oServicePath)
+            _LogConfig.Debug = True
             _Logger = _LogConfig.GetLogger()
             _Logger.Info("Service {0} is starting...", SERVICE_DISPLAY_NAME)
             _Logger.Info("ServiceDirectory: {0}", oServicePath)
@@ -56,11 +58,15 @@ Public Class WindowsService
 
             _Archive = New EDMI.File.Archive(_LogConfig)
             _Filesystem = New Filesystem.File(_LogConfig)
-            _Global = New GlobalState(_LogConfig, _MSSQL_IDB)
+            _Global = New GlobalState(_LogConfig, _MSSQL_IDB, _MSSQL_ECM)
+            _Scheduler = New Scheduler(_LogConfig, _MSSQL_ECM)
 
             _Logger.Debug("Loading Objectstores")
             _Global.LoadObjectStores()
 
+            _Logger.Debug("Starting Scheduler")
+            _Scheduler.Start()
+
             _Logger.Debug("Preparing WCF ServiceHost")
             EDMIService.MSSQL_ECM = _MSSQL_ECM
             EDMIService.MSSQL_IDB = _MSSQL_IDB
@@ -70,6 +76,7 @@ Public Class WindowsService
             EDMIService.EDMIArchive = _Archive
             EDMIService.Filesystem = _Filesystem
             EDMIService.GlobalState = _Global
+            EDMIService.Scheduler = _Scheduler
 
             _Logger.Debug("Starting WCF ServiceHost")
             _ServiceHost = New ServiceHost(GetType(EDMIService))
@@ -121,6 +128,8 @@ Public Class WindowsService
             _ServiceHost.Close()
             _ServiceHost = Nothing
         End If
+
+        _Scheduler.Stop()
     End Sub
 End Class
 

Service.EDMIService/packages.config

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />
   <package id="NLog" version="4.7.5" targetFramework="net472" />
+  <package id="Quartz" version="3.2.3" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net472" />
 </packages>