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

EDMIService: Version 2.3.0.0
EDMIService: Update for Annette GmbH
2021-11-25 15:56:40 +01:00 · 2021-11-25 15:55:59 +01:00 · 2021-11-25 15:55:45 +01:00 · 2021-11-25 15:55:00 +01:00 · 2021-11-25 15:54:48 +01:00 · 2021-11-25 15:53:06 +01:00
37 changed files with 862 additions and 1167 deletions
--- a/GUIs.Monitor/Monitor.vbproj
+++ b/GUIs.Monitor/Monitor.vbproj
@@ -151,6 +151,10 @@
    </None>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\Controls.SQLEditor\SQLEditor.vbproj">
+      <Project>{3e7bc8a9-91ef-49b8-8110-2c01f664c24a}</Project>
+      <Name>SQLEditor</Name>
+    </ProjectReference>
    <ProjectReference Include="..\GUIs.Common\Common.vbproj">
      <Project>{d20a6bf2-c7c6-4a7a-b34d-fa27d775a049}</Project>
      <Name>Common</Name>
@@ -197,6 +201,7 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="ChartType_Line.ico" />
+    <None Include="Resources\inserttreeview1.svg" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -110,6 +110,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property inserttreeview() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("inserttreeview", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -118,22 +118,25 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="gettingstarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="enablesearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="managedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="charttype_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="enablesearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="gettingstarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="inserttreeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inserttreeview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/GUIs.Monitor/Resources/inserttreeview1.svg
+++ b/GUIs.Monitor/Resources/inserttreeview1.svg
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.Red{fill:#D11C1C;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="InsertTreeView">
+    <path d="M13,8H5C4.4,8,4,7.6,4,7V3c0-0.5,0.4-1,1-1h8c0.6,0,1,0.5,1,1v4C14,7.6,13.6,8,13,8z M26,17v-4   c0-0.6-0.5-1-1-1h-8c-0.5,0-1,0.4-1,1v4c0,0.5,0.5,1,1,1h8C25.5,18,26,17.5,26,17z M26,27v-4c0-0.5-0.5-1-1-1h-8c-0.5,0-1,0.5-1,1   v4c0,0.5,0.5,1,1,1h8C25.5,28,26,27.5,26,27z" class="Yellow" />
+    <polygon points="14,16 14,14 10,14 10,10 8,10 8,26 14,26 14,24 10,24 10,16  " class="Black" />
+  </g>
+</svg>
--- a/GUIs.Monitor/frmMonitor.Designer.vb
+++ b/GUIs.Monitor/frmMonitor.Designer.vb
@@ -31,8 +31,9 @@ Partial Class frmMonitor
        Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.buttonSearch = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnExportGrid = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnExportTreeview = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -41,13 +42,11 @@ Partial Class frmMonitor
        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
        Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
        Me.cmbSearchKeys = New DevExpress.XtraEditors.ComboBoxEdit()
-        Me.TextEdit2 = New DevExpress.XtraEditors.ComboBoxEdit()
        Me.DateEdit1 = New DevExpress.XtraEditors.DateEdit()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutItemSearchValue_Text = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutItemSearchValue_Date = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
        Me.XtraTabPageFile1 = New DevExpress.XtraTab.XtraTabPage()
        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
@@ -61,7 +60,7 @@ Partial Class frmMonitor
        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.TreeListResults = New DevExpress.XtraTreeList.TreeList()
        Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
-        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.SplitContainerContent = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
        Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
        Me.XtraTabPageSQL1 = New DevExpress.XtraTab.XtraTabPage()
@@ -74,26 +73,23 @@ Partial Class frmMonitor
        Me.GridControl4 = New DevExpress.XtraGrid.GridControl()
        Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.XtraTabPageSQL4 = New DevExpress.XtraTab.XtraTabPage()
-        Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
-        Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
+        Me.tabPageSearch = New DevExpress.XtraTab.XtraTabPage()
+        Me.tabPageDashboard = New DevExpress.XtraTab.XtraTabPage()
        Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
-        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.LayoutControl1.SuspendLayout()
        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.cmbSearchKeys.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutItemSearchValue_Text, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutItemSearchValue_Date, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabControl1.SuspendLayout()
        Me.XtraTabPageFile1.SuspendLayout()
@@ -104,8 +100,8 @@ Partial Class frmMonitor
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TreeListResults, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SplitContainerControl1.SuspendLayout()
+        CType(Me.SplitContainerContent, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerContent.SuspendLayout()
        CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControl3.SuspendLayout()
        CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -120,18 +116,18 @@ Partial Class frmMonitor
        CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView4, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabPageSQL4.SuspendLayout()
-        CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SplitContainerControl2.SuspendLayout()
+        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerMain.SuspendLayout()
        CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabControl2.SuspendLayout()
-        Me.XtraTabPage3.SuspendLayout()
+        Me.tabPageSearch.SuspendLayout()
        Me.SuspendLayout()
        '
        'RibbonControl1
        '
        Me.RibbonControl1.ApplicationButtonDropDownControl = Me.ApplicationMenu1
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportGrid, Me.btnExportTreeview, Me.BarStaticItem1})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
        Me.RibbonControl1.MaxItemId = 7
        Me.RibbonControl1.Name = "RibbonControl1"
@@ -156,27 +152,34 @@ Partial Class frmMonitor
        '
        'buttonSearch
        '
-        Me.buttonSearch.Caption = "Sicht laden"
+        Me.buttonSearch.Caption = "Suche starten (F5)"
        Me.buttonSearch.Id = 1
        Me.buttonSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.gettingstarted
        Me.buttonSearch.Name = "buttonSearch"
        Me.buttonSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
        '
-        'BarButtonItem2
+        'btnExportGrid
        '
-        Me.BarButtonItem2.Caption = "Export Grid als XLSX"
-        Me.BarButtonItem2.Enabled = False
-        Me.BarButtonItem2.Id = 4
-        Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.export
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.btnExportGrid.Caption = "Export Grid als XLSX"
+        Me.btnExportGrid.Enabled = False
+        Me.btnExportGrid.Id = 4
+        Me.btnExportGrid.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.export
+        Me.btnExportGrid.Name = "btnExportGrid"
        '
-        'BarButtonItem3
+        'btnExportTreeview
        '
-        Me.BarButtonItem3.Caption = "Export als XLSX"
-        Me.BarButtonItem3.Id = 5
-        Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem3.Name = "BarButtonItem3"
+        Me.btnExportTreeview.Caption = "Export Treeview als XLSX"
+        Me.btnExportTreeview.Id = 5
+        Me.btnExportTreeview.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.inserttreeview
+        Me.btnExportTreeview.Name = "btnExportTreeview"
+        '
+        'BarStaticItem1
+        '
+        Me.BarStaticItem1.Id = 6
+        Me.BarStaticItem1.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarStaticItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.BarStaticItem1.Name = "BarStaticItem1"
+        Me.BarStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        '
        'RibbonPage1
        '
@@ -193,8 +196,8 @@ Partial Class frmMonitor
        'RibbonPageGroup2
        '
        Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportTreeview)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportGrid)
        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
        Me.RibbonPageGroup2.Text = "Export"
        '
@@ -215,7 +218,6 @@ Partial Class frmMonitor
        '
        Me.LayoutControl1.Controls.Add(Me.TextEdit1)
        Me.LayoutControl1.Controls.Add(Me.cmbSearchKeys)
-        Me.LayoutControl1.Controls.Add(Me.TextEdit2)
        Me.LayoutControl1.Controls.Add(Me.DateEdit1)
        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
@@ -244,16 +246,6 @@ Partial Class frmMonitor
        Me.cmbSearchKeys.StyleController = Me.LayoutControl1
        Me.cmbSearchKeys.TabIndex = 5
        '
-        'TextEdit2
-        '
-        Me.TextEdit2.Location = New System.Drawing.Point(15, 169)
-        Me.TextEdit2.MenuManager = Me.RibbonControl1
-        Me.TextEdit2.Name = "TextEdit2"
-        Me.TextEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.TextEdit2.Size = New System.Drawing.Size(205, 20)
-        Me.TextEdit2.StyleController = Me.LayoutControl1
-        Me.TextEdit2.TabIndex = 6
-        '
        'DateEdit1
        '
        Me.DateEdit1.EditValue = Nothing
@@ -270,7 +262,7 @@ Partial Class frmMonitor
        '
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutItemSearchValue_Text, Me.LayoutControlItem2, Me.LayoutItemSearchValue_Date, Me.LayoutControlItem3})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutItemSearchValue_Text, Me.LayoutControlItem2, Me.LayoutItemSearchValue_Date})
        Me.Root.Name = "Root"
        Me.Root.Size = New System.Drawing.Size(235, 564)
        Me.Root.TextVisible = False
@@ -282,7 +274,7 @@ Partial Class frmMonitor
        Me.LayoutItemSearchValue_Text.Name = "LayoutItemSearchValue_Text"
        Me.LayoutItemSearchValue_Text.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
        Me.LayoutItemSearchValue_Text.Size = New System.Drawing.Size(215, 46)
-        Me.LayoutItemSearchValue_Text.Text = "Parameter"
+        Me.LayoutItemSearchValue_Text.Text = "Text Parameter"
        Me.LayoutItemSearchValue_Text.TextLocation = DevExpress.Utils.Locations.Top
        Me.LayoutItemSearchValue_Text.TextSize = New System.Drawing.Size(88, 13)
        '
@@ -293,7 +285,7 @@ Partial Class frmMonitor
        Me.LayoutControlItem2.Name = "LayoutControlItem2"
        Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
        Me.LayoutControlItem2.Size = New System.Drawing.Size(215, 46)
-        Me.LayoutControlItem2.Text = "Sicht Titel"
+        Me.LayoutControlItem2.Text = "Suche nach"
        Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top
        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(88, 13)
        '
@@ -303,23 +295,12 @@ Partial Class frmMonitor
        Me.LayoutItemSearchValue_Date.Location = New System.Drawing.Point(0, 92)
        Me.LayoutItemSearchValue_Date.Name = "LayoutItemSearchValue_Date"
        Me.LayoutItemSearchValue_Date.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 46)
+        Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 452)
        Me.LayoutItemSearchValue_Date.Text = "Datum Parameter"
        Me.LayoutItemSearchValue_Date.TextLocation = DevExpress.Utils.Locations.Top
        Me.LayoutItemSearchValue_Date.TextSize = New System.Drawing.Size(88, 13)
        Me.LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never
        '
-        'LayoutControlItem3
-        '
-        Me.LayoutControlItem3.Control = Me.TextEdit2
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 138)
-        Me.LayoutControlItem3.Name = "LayoutControlItem3"
-        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(215, 406)
-        Me.LayoutControlItem3.Text = "Auswertung"
-        Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(88, 13)
-        '
        'XtraTabControl1
        '
        Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
@@ -422,7 +403,6 @@ Partial Class frmMonitor
        Me.TreeListResults.Location = New System.Drawing.Point(0, 0)
        Me.TreeListResults.MenuManager = Me.RibbonControl1
        Me.TreeListResults.Name = "TreeListResults"
-        Me.TreeListResults.OptionsView.ShowColumns = False
        Me.TreeListResults.Size = New System.Drawing.Size(713, 181)
        Me.TreeListResults.TabIndex = 4
        '
@@ -439,19 +419,19 @@ Partial Class frmMonitor
        Me.SvgImageCollection1.Add("actions_user", "image://svgimages/icon builder/actions_user.svg")
        Me.SvgImageCollection1.Add("highimportance", "image://svgimages/outlook inspired/highimportance.svg")
        '
-        'SplitContainerControl1
+        'SplitContainerContent
        '
-        Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
-        Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0)
-        Me.SplitContainerControl1.Name = "SplitContainerControl1"
-        Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControl1)
-        Me.SplitContainerControl1.Panel1.Text = "Panel1"
-        Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl3)
-        Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(958, 564)
-        Me.SplitContainerControl1.SplitterPosition = 235
-        Me.SplitContainerControl1.TabIndex = 9
+        Me.SplitContainerContent.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
+        Me.SplitContainerContent.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerContent.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainerContent.Name = "SplitContainerContent"
+        Me.SplitContainerContent.Panel1.Controls.Add(Me.LayoutControl1)
+        Me.SplitContainerContent.Panel1.Text = "Panel1"
+        Me.SplitContainerContent.Panel2.Controls.Add(Me.SplitContainerControl3)
+        Me.SplitContainerContent.Panel2.Text = "Panel2"
+        Me.SplitContainerContent.Size = New System.Drawing.Size(958, 564)
+        Me.SplitContainerContent.SplitterPosition = 235
+        Me.SplitContainerContent.TabIndex = 9
        '
        'SplitContainerControl3
        '
@@ -554,58 +534,51 @@ Partial Class frmMonitor
        Me.XtraTabPageSQL4.Size = New System.Drawing.Size(711, 350)
        Me.XtraTabPageSQL4.Text = "SQL 4"
        '
-        'SplitContainerControl2
+        'SplitContainerMain
        '
-        Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
-        Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0)
-        Me.SplitContainerControl2.Name = "SplitContainerControl2"
-        Me.SplitContainerControl2.Panel1.Controls.Add(Me.SplitContainerControl1)
-        Me.SplitContainerControl2.Panel1.Text = "Panel1"
-        Me.SplitContainerControl2.Panel2.Controls.Add(Me.XtraTabControl1)
-        Me.SplitContainerControl2.Panel2.Text = "Panel2"
-        Me.SplitContainerControl2.Size = New System.Drawing.Size(1377, 564)
-        Me.SplitContainerControl2.SplitterPosition = 958
-        Me.SplitContainerControl2.TabIndex = 10
+        Me.SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+        Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainerMain.Name = "SplitContainerMain"
+        Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerContent)
+        Me.SplitContainerMain.Panel1.Text = "Panel1"
+        Me.SplitContainerMain.Panel2.Controls.Add(Me.XtraTabControl1)
+        Me.SplitContainerMain.Panel2.Text = "Panel2"
+        Me.SplitContainerMain.Size = New System.Drawing.Size(1377, 564)
+        Me.SplitContainerMain.SplitterPosition = 958
+        Me.SplitContainerMain.TabIndex = 10
        '
        'XtraTabControl2
        '
        Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.XtraTabControl2.Location = New System.Drawing.Point(0, 159)
        Me.XtraTabControl2.Name = "XtraTabControl2"
-        Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3
+        Me.XtraTabControl2.SelectedTabPage = Me.tabPageSearch
        Me.XtraTabControl2.Size = New System.Drawing.Size(1379, 590)
        Me.XtraTabControl2.TabIndex = 11
-        Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4})
+        Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageSearch, Me.tabPageDashboard})
        '
-        'XtraTabPage3
+        'tabPageSearch
        '
-        Me.XtraTabPage3.Controls.Add(Me.SplitContainerControl2)
-        Me.XtraTabPage3.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch
-        Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.XtraTabPage3.Name = "XtraTabPage3"
-        Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 564)
-        Me.XtraTabPage3.Text = "Auswahl Sicht"
+        Me.tabPageSearch.Controls.Add(Me.SplitContainerMain)
+        Me.tabPageSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch
+        Me.tabPageSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
+        Me.tabPageSearch.Name = "tabPageSearch"
+        Me.tabPageSearch.Size = New System.Drawing.Size(1377, 564)
+        Me.tabPageSearch.Text = "Suche"
        '
-        'XtraTabPage4
+        'tabPageDashboard
        '
-        Me.XtraTabPage4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.bo_dashboard
-        Me.XtraTabPage4.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.XtraTabPage4.Name = "XtraTabPage4"
-        Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 564)
-        Me.XtraTabPage4.Text = "Dashboard"
+        Me.tabPageDashboard.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.bo_dashboard
+        Me.tabPageDashboard.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
+        Me.tabPageDashboard.Name = "tabPageDashboard"
+        Me.tabPageDashboard.Size = New System.Drawing.Size(1377, 564)
+        Me.tabPageDashboard.Text = "Dashboard"
        '
        'XtraSaveFileDialog1
        '
        Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
        '
-        'BarStaticItem1
-        '
-        Me.BarStaticItem1.Id = 6
-        Me.BarStaticItem1.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarStaticItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarStaticItem1.Name = "BarStaticItem1"
-        '
        'frmMonitor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -625,14 +598,12 @@ Partial Class frmMonitor
        Me.LayoutControl1.ResumeLayout(False)
        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.cmbSearchKeys.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutItemSearchValue_Text, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutItemSearchValue_Date, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabControl1.ResumeLayout(False)
        Me.XtraTabPageFile1.ResumeLayout(False)
@@ -643,8 +614,8 @@ Partial Class frmMonitor
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TreeListResults, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainerControl1.ResumeLayout(False)
+        CType(Me.SplitContainerContent, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerContent.ResumeLayout(False)
        CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerControl3.ResumeLayout(False)
        CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -659,11 +630,11 @@ Partial Class frmMonitor
        CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView4, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabPageSQL4.ResumeLayout(False)
-        CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainerControl2.ResumeLayout(False)
+        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerMain.ResumeLayout(False)
        CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabControl2.ResumeLayout(False)
-        Me.XtraTabPage3.ResumeLayout(False)
+        Me.tabPageSearch.ResumeLayout(False)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -680,9 +651,7 @@ Partial Class frmMonitor
    Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
    Friend WithEvents LayoutItemSearchValue_Text As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents buttonSearch As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents TextEdit2 As DevExpress.XtraEditors.ComboBoxEdit
    Friend WithEvents TreeListResults As DevExpress.XtraTreeList.TreeList
    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
@@ -691,7 +660,7 @@ Partial Class frmMonitor
    Friend WithEvents XtraTabPageFile2 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents XtraTabPageHtml1 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents XtraTabPageHtml2 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents SplitContainerContent As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents XtraTabControl3 As DevExpress.XtraTab.XtraTabControl
    Friend WithEvents XtraTabPageSQL1 As DevExpress.XtraTab.XtraTabPage
@@ -704,10 +673,10 @@ Partial Class frmMonitor
    Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridView4 As DevExpress.XtraGrid.Views.Grid.GridView
    Friend WithEvents XtraTabPageSQL4 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents XtraTabControl2 As DevExpress.XtraTab.XtraTabControl
-    Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents XtraTabPage4 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents tabPageSearch As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents tabPageDashboard As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents DocumentViewer1 As Controls.DocumentViewer.DocumentViewer
    Friend WithEvents DocumentViewer2 As Controls.DocumentViewer.DocumentViewer
    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
@@ -717,9 +686,9 @@ Partial Class frmMonitor
    Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
    Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnExportGrid As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
-    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnExportTreeview As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
 End Class
--- a/GUIs.Monitor/frmMonitor.resx
+++ b/GUIs.Monitor/frmMonitor.resx
@@ -121,73 +121,28 @@
    <value>183, 17</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="BarButtonItem3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA
-        AY1JREFUOE9j+P//PwMQMJ6fZr/v/FS7/+cm2/4/O9Hm/5kJ1v9P9ljsB8oxgdTgwhCCgYH57ETr/78e
-        L/z/4/6c/99vT/3/7Vrf/33FmiBJVnRNyBhCMDCwnOwy///1au//z6cq/388Wvz/47HK/ztzVEGSbOia
-        kDGEANpytNHw/4djFf/f7s74/3pbIhAn/9+apgySZEfXhIwhBNAFu0q09+zIVvm/LV35/5ZUxf+bkxX+
-        r4mV3wuUYwNiRiBmQsIgPooBIAFWIOYorJ0BEuACYk4gZj831W4/vsCFOwWGC2pn/s+vns6QVz0NqIZw
-        4GIYkF0x5X9m2aT/GaUT/6cW9v0nFLgYBqQBNaUU9DIk53WDXEAwcDEMiM/p+B+X1c4Qm9EKMgBf4GL3
-        QlRq8/+I5EaGsKR6kAGgwAXFAihAuYGYB0qzAzH2QAyJr/0fHFvDEBhTBVRDOIljGOAfWfHfN6KMwSe8
-        FGQA6bHgFVJ83jO46L9HUOF/t4A80mMBGYNsITkWkDEQEIiF/wwAEzc5In1OcF0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BarButtonItem3.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA
-        BelJREFUWEet1glQ1FUcB/C1Q8vK0QSbEjDNctKMQ2C5PSYFvEUERRDFBA/EkpyJtLzI1Bx1UlEDtcMj
-        QxGVPECQKxUsCW/Lq2usGcBluXGab9/ff/+7LOvmsNqb+cz77/73vfd7b/h/+WvU1o7aX0gNLri8bTgu
-        bx9hINdprV1KFcFqPxw/bgos4tiO9JhMBMAmxvY4dTyzJgD/1P3aBrdNilf4yiyd6QmZyNoiD2JsUkCn
-        Uyv9cO/vfDT/cbC1340yW7n3Vy4KlnjJLHb0JLWztsiDGJtU37lgmTcab+5C442v0HRrj4XdaLq5m/el
-        34WGX3bQduR+4CGzvEDt6aELkOq75i30RN3Fdag9twR15StRf3Et6q9sQsPVLbQZ9Zc2oP7CGtSVLUdt
-        aRL7ZBxPdJNZXqRHLsA+e4Eb6n5agZrT81Fzir6fRwkGRXOhL4qHvnAOzYa+YDZqS5LwXbyzzNKdOtBD
-        FaA8AdTtaIILas8u4uSzDPJnUhz0J2NVM6DPm47qXBGDmuJ3cCjuDZnFkR69gMMz+3Pnidwxd1/8rmoe
-        d86TKEzgzuNRU8BT4O71+VLgLGTE9P1fTkD+CLtsGuFYuG1MD4i00Qapo8yMdDL5XIxwwvqhDsUca0/K
-        U0AP1SREnqLnSXbjRD3oZTHAd4KU2tNML7WX33SjZ0kKkHn+izzqxuv7CpUv5IZMIkcpxZh4DY6SAp42
-        I8n3DD1HsriQ78zJfWG8L+SzzCknbvW05Mv7eA+ZKgWYfyfFdihLCSw4vyUI57cGoZzkunyzpUCUpwwj
-        6QNRsv6tIo6VAmWOtkWn9+BoeA+Jll4Zw6ZEd+HHPq1iuS3yFmtlM6botrqgJa/BU6AdNEWjHRyljGFT
-        ojt/qRej+ySaf2M0mxxAk0quWz5n4N6dE8hJcpcCTNFtdUFL2kFR0A6Mkp5jlKZEd85CDzRc/wKNjOXG
-        GxLhYqfqa4PrBg3XUtFwZSuOJrpKAabotrqgJS4Oz4GRLMLAIyACbj6hOPaeG2rLPkHNmSTU/rCUKbqa
-        Ub2ekb2RMb4BdefX8j6TtfRD6IuZLSWLcMiQnKbotrqgJY+ASHgGTNYItSnRnZXgjJqzi1GdPwfVJ2fR
-        TIPcOOhyY6E7MYPehi5HxDDQEpERqySnKbisLmhJduzhHyE9xyhPgZKcmUxOffECTj4duuwYmgbd8amq
-        aOiOReHuURGJu0cmozpvDtKnvS4FmKLb6oKW3P0j4O43if0kjmkpYB9juDp/LncdT4ZT0OXxJHLZn4hF
-        NelyeArZPIFsQ5F7IvvYfgID/CaCNO6kDFKje92w7oUpwY5ICXbAxiBHcsCGQDPDWnwmhjpg5aCXWke3
-        tQUtDfBlAb7h7MM5RmkSIpJoXcmBJLKNEW30ipneKvmdPAGSiPIoty0H3HzC4OYbxr5VAXIKkmidqItK
-        /pcIKUyedSG7NZLvJb7l+NuehFKAq0+YxtU7TBnDpvwdnF7lV1D6qT9K+TJbQnJdYmk1rfIj6f1RmOxj
-        exS7eE+Ai1co+1BlDJsSxUfm97Mat4pac7dMDsYrT4FtUczF4czFpQi1KVGcldAXzXdy0HR7n5l0K75V
-        NP95DBkzXpMCbItiF+14kMaZ1KZEcUZcHyX1Gi6noPHn7aptaLxm0CD91TS+0KYZkrFsDfZG95YCbIvi
-        N7UhcPYMgbHv7zkW/dxGIn3qq9CfYhDl8X2xiFF7ZhEjORl151Ypas4u5/0kJSvuMpyq82Zj58ReUoBt
-        UWxObUoU747oxcnjUZUVjqrDEyjUIHM8KjNDUHlAjENlhhjDZJyGHSEvyyS2BZE5ZZCahF+G9mTkTufk
-        Y1G5fwyNRuW+UaqRqEwfjoq9IhgV3wSh6tBEvmc6ySS2RbE5ZZBagLy8VmVFcNeTOLkIR+VBnkZmGCoy
-        eRIHQlHBU6jYbzQOm5maHPvIJ6BE8UeedoXJXvZI9rLDcq092WGZOc8WS4WHHd537Wp7FJtTmzGKrb5F
-        q6y9RcvvZHEJIj7KGs2/P84ZFqX5IpcAAAAASUVORK5CYII=
-</value>
-  </data>
  <data name="BarStaticItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAMdEVYdFRpdGxlAEFib3V0O1VEZxsAAADVSURBVDhPpdPNCcJAEIbhnBTFUhSEgNiETdmAnvwB
-        ISkjB/GmLQgqYhWKosb3C0Z2lzUh5PAcnJn9THQnGI0TV4glTnjhhiNWGMCaNz80oYNvpAUitGAFNLCB
-        74DPFm38AubwDRaJkQV0oXf1DeVf4OvJUM2pU6wiVsDeKZrKnuCs5t0pmsoCHnUDUjXrvMJFzYlTNJUF
-        RGrqb3waRVNRgG5smA/MvsUqtBvWVV7DN+izg3WVRQuywL9bKeppmTrIzpkBuR60G1ph/TZXHKBH7sOY
-        TYIP2fNBkIMCKs8AAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAx0RVh0VGl0
+        bGUAQWJvdXQ7VURnGwAAANVJREFUOE+l080JwkAQhuGcFMVSFISA2IRN2YCe/AEhKSMH8aYtCCpiFYqi
+        xvcLRnaXNSHk8Bycmf1MdCcYjRNXiCVOeOGGI1YYwJo3PzShg2+kBSK0YAU0sIHvgM8WbfwC5vANFomR
+        BXShd/UN5V/g68lQzalTrCJWwN4pmsqe4Kzm3SmaygIedQNSNeu8wkXNiVM0lQVEaupvfBpFU1GAbmyY
+        D8y+xSq0G9ZVXsM36LODdZVFC7LAv1sp6mmZOsjOmQG5HrQbWmH9NlccoEfuw5hNgg/Z80GQgwIqzwAA
+        AABJRU5ErkJggg==
 </value>
  </data>
  <data name="BarStaticItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAMdEVYdFRpdGxlAEFib3V0O1VEZxsAAAHFSURBVFhHxda9SkNBEIbh3ERUECxEUMErESwtxM5K
-        hICVIFZGvAbBwlIQhAiiWNkoeAla2FgKBv8QFH+O74STcHZm2GSDORZPsZOZ+ZYTTVLJsuxfucUyucUy
-        ucUymcJc/SxmDGs4wR2e8YhbHKGGYXizLTrPFLwhSPA+vpB18YFdDMHs0nmm4Awt4hVeWMwDZhHs03mm
-        oAbW4S3vlTyxJXR26jxTKDTLoLc0lVyi8yR0ninkjRN4g7ewH/J2VGHyTEGa0IC3SGv3e69pOzB5pkDT
-        JH7yoW5SLiD/HVWdFxwETZuFob+2rPOCg6DpUg3FpDwBcajzgoOgST7dvGFP6gWudV5wEM5QTOoFmjov
-        OAhnKGYgFxjkW3Cj84KDoOlKDcWkXqCh84KDoGlbDcWkXqCm84KDoGlGDcWkXOATIzovOAiaxGk+1E3K
-        BfZg8kxBmjAN+ej0FvXjCaMweaYgTTn5eeUtSyXfK/No7dV5ptBuzG3BW9orCV9FZ6fOM4Vic24F7/AC
-        Yl6wgGCfzjMFPZCbwjF6+Zr+xgHkh6zZpfNMwRsqkD/OOi7QRDv0HufYwDi82RadZwplc4tlcotlcovl
-        ySq/BghXOy4DehcAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAx0RVh0VGl0
+        bGUAQWJvdXQ7VURnGwAAAcVJREFUWEfF1r1KQ0EQhuHcRFQQLERQwSsRLC3EzkqEgJUgVka8BsHCUhCE
+        CKJY2Sh4CVrYWAoG/xAUf47vhJNwdmbYZIM5Fk+xk5n5lhNNUsmy7F+5xTK5xTK5xTKZwlz9LGYMazjB
+        HZ7xiFscoYZheLMtOs8UvCFI8D6+kHXxgV0MwezSeabgDC3iFV5YzANmEezTeaagBtbhLe+VPLEldHbq
+        PFMoNMugtzSVXKLzJHSeKeSNE3iDt7Af8nZUYfJMQZrQgLdIa/d7r2k7MHmmQNMkfvKhblIuIP8dVZ0X
+        HARNm4Whv7as84KDoOlSDcWkPAFxqPOCg6BJPt28YU/qBa51XnAQzlBM6gWaOi84CGcoZiAXGORbcKPz
+        goOg6UoNxaReoKHzgoOgaVsNxaReoKbzgoOgaUYNxaRc4BMjOi84CJrEaT7UTcoF9mDyTEGaMA356PQW
+        9eMJozB5piBNOfl55S1LJd8r82jt1Xmm0G7MbcFb2isJX0Vnp84zhWJzbgXv8AJiXrCAYJ/OMwU9kJvC
+        MXr5mv7GAeSHrNml80zBGyqQP846LtBEO/Qe59jAOLzZFp1nCmVzi2Vyi2Vyi+XJKr8GCFc7LgN6FwAA
+        AABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/GUIs.Monitor/frmMonitor.vb
+++ b/GUIs.Monitor/frmMonitor.vb
@@ -1,12 +1,12 @@
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraTreeList.Nodes
-Imports DigitalData.Controls.SQLConfig
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language.Utils
+Imports DigitalData.Controls.SQLConfig
 Imports DevExpress.XtraTab
 Imports DigitalData.Controls.DocumentViewer
 Imports DevExpress.XtraEditors
@@ -100,7 +100,7 @@ Public Class frmMonitor
                Console.WriteLine(ConfigManager.Config.SearchKeySQL)

            End If
-                Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
+            Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
            Database = New MSSQLServer(LogConfig, oConnectionString)
            GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4})
            GridBuilder.
@@ -125,21 +125,23 @@ Public Class frmMonitor
            For Each oGrid In SQLResultGrids
                AddHandler oGrid.Enter, Sub()
                                            ActiveSQLResultGrid = oGrid
-                                            BarButtonItem2.Enabled = True
+                                            btnExportGrid.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                                        End Sub

                AddHandler oGrid.Leave, Sub()
                                            ActiveSQLResultGrid = Nothing
-                                            BarButtonItem2.Enabled = False
+                                            btnExportGrid.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                                        End Sub
            Next

+            AddHandler TreeListResults.Enter, Sub() btnExportTreeview.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            AddHandler TreeListResults.Leave, Sub() btnExportTreeview.Visibility = DevExpress.XtraBars.BarItemVisibility.Never

            For Each oViewer As DocumentViewer In FileResultViewers
                oViewer.Init(LogConfig, oLicense)
            Next
            SplitContainerControl3.Collapsed = True
-            SplitContainerControl2.Collapsed = True
+            SplitContainerMain.Collapsed = True
        Catch ex As Exception
            ShowErrorMessage(ex)
        End Try
@@ -147,19 +149,27 @@ Public Class frmMonitor

    Private Function LoadGDPicture() As String
        Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
-        Return Database.GetScalarValue(oSQL)
+        Return Database.GetScalarValue(oSQL)?.ToString
    End Function

    Private Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick
-        LoadData()
+        If cmbSearchKeys.EditValue Is Nothing Then
+            Exit Sub
+        End If
+        Dim oAttributeId As Integer = cmbSearchKeys.EditValue
+        Dim oAttributeValue As String = TextEdit1.EditValue.ToString
+
+        LoadData(oAttributeId, oAttributeValue)
    End Sub

-    Private Function LoadData() As Boolean
+    Private Function LoadData(pAttribute As Integer, pValue As String) As Boolean
        Try
+            TreeListResults.ShowLoadingPanel()
+            SplitContainerContent.Enabled = False

-
-            Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{cmbSearchKeys.EditValue}','{TextEdit1.EditValue.ToString}',1"
+            Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{pAttribute}','{pValue}',1"
            Dim oTable As DataTable = Database.GetDatatable(oSQL)
+            Dim oStateColumn As TreeListColumn = TreeListResults.Columns.Item("STATE")

            TreeListResults.DataSource = oTable
            TreeListResults.PopulateColumns()
@@ -171,19 +181,14 @@ Public Class frmMonitor
                oColumn.Visible = DisplayColumns.Contains(oColumn.FieldName)
                If oColumn.FieldName = "ADDED_WHEN" Then
                    oColumn.Format.FormatType = FormatType.DateTime
-                    oColumn.Format.FormatString = "dd.MM.yyyy  HH:MM:ss"
+                    oColumn.Format.FormatString = "dd.MM.yyyy  HH:mm:ss"
                End If

            Next
-            'Dim edit As New RepositoryItemDateEdit()
-            'TreeListResults.Columns("ADDED_WHEN").ColumnEdit = edit
-            'edit.Mask.EditMask = "g"
-            'edit.Mask.UseMaskAsDisplayFormat = True
-            Dim oStateColumn As TreeListColumn = TreeListResults.Columns.Item("STATE")

            For Each oNode As TreeListNode In TreeListResults.Nodes
                ExpandNodes(oNode, Function(n)
-                                       Dim oObjectValue = n.GetValue(oStateColumn)
+                                       Dim oObjectValue = n.GetValue(oStateColumn)?.ToString
                                       Dim oValue As String = NotNull(oObjectValue, String.Empty)
                                       Return oValue IsNot Nothing AndAlso (oValue = STATE_WARNING Or oValue = STATE_FAILURE)
                                   End Function)
@@ -192,6 +197,9 @@ Public Class frmMonitor
        Catch ex As Exception
            ShowErrorMessage(ex)
            Return False
+        Finally
+            SplitContainerContent.Enabled = False
+            TreeListResults.HideLoadingPanel()
        End Try
    End Function

@@ -321,7 +329,7 @@ Public Class frmMonitor
        Next

        SplitContainerControl3.Collapsed = oSQLCommands.Count = 0
-        SplitContainerControl2.Collapsed = (oFilePaths.Count + oHtmlDocuments.Count) = 0
+        SplitContainerMain.Collapsed = (oFilePaths.Count + oHtmlDocuments.Count) = 0

        For Each oSQLCommand As KeyValuePair(Of String, String) In oSQLCommands
            Try
@@ -542,7 +550,7 @@ Public Class frmMonitor
    End Sub

    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Dim oSQLConfig As New frmSQLConfig(LogConfig)
+        Dim oSQLConfig As New DigitalData.Controls.SQLConfig.frmSQLConfig(LogConfig)
        If oSQLConfig.ShowDialog() = DialogResult.OK Then
            ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
            ConfigManager.Save()
@@ -553,7 +561,7 @@ Public Class frmMonitor
        End If
    End Sub

-    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportGrid.ItemClick
        If ActiveSQLResultGrid IsNot Nothing Then
            XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx"

@@ -563,13 +571,22 @@ Public Class frmMonitor
        End If
    End Sub

-    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportTreeview.ItemClick
        XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx"

        If XtraSaveFileDialog1.ShowDialog() = DialogResult.OK Then
            TreeListResults.ExportToXlsx(XtraSaveFileDialog1.FileName)
        End If
    End Sub
+
+    Private Sub TextEdit1_KeyDown(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyDown
+        If e.KeyCode = Keys.Enter Or e.KeyCode = Keys.F5 Then
+            Dim oAttributeId As Integer = cmbSearchKeys.EditValue
+            Dim oAttributeValue As String = TextEdit1.EditValue.ToString
+
+            LoadData(oAttributeId, oAttributeValue)
+        End If
+    End Sub
 End Class

 Friend Class SearchKey
--- a/GUIs.Test.ZUGFeRDTest/App.config
+++ b/GUIs.Test.ZUGFeRDTest/App.config
@@ -14,10 +14,10 @@
    <applicationSettings>
        <ZUGFeRDTest.My.MySettings>
            <setting name="FB_DATABASE" serializeAs="String">
-                <value>172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</value>
+                <value>172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB</value>
            </setting>
            <setting name="FB_DATASOURCE" serializeAs="String">
-                <value>172.24.12.41</value>
+                <value>172.24.12.50</value>
            </setting>
        </ZUGFeRDTest.My.MySettings>
    </applicationSettings>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -56,7 +56,7 @@ Namespace My
        
        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB")>  _
        Public ReadOnly Property FB_DATABASE() As String
            Get
                Return CType(Me("FB_DATABASE"),String)
@@ -65,7 +65,7 @@ Namespace My
        
        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.41")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.50")>  _
        Public ReadOnly Property FB_DATASOURCE() As String
            Get
                Return CType(Me("FB_DATASOURCE"),String)
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -3,10 +3,10 @@
  <Profiles />
  <Settings>
    <Setting Name="FB_DATABASE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</Value>
+      <Value Profile="(Default)">172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB</Value>
    </Setting>
    <Setting Name="FB_DATASOURCE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">172.24.12.41</Value>
+      <Value Profile="(Default)">172.24.12.50</Value>
    </Setting>
    <Setting Name="FB_USER" Type="System.String" Scope="User">
      <Value Profile="(Default)">sysdba</Value>
--- a/Modules.EDMIAPI/Client.vb
+++ b/Modules.EDMIAPI/Client.vb
@@ -17,8 +17,61 @@ Public Class Client

    Private _dummy_table_attributes As DataTable
    Private _channel As IEDMIServiceChannel
+    Private _FileEx As FileSystem.File


+    ''' <summary>
+    ''' Creates a new EDMI Client object
+    ''' </summary>
+    ''' <param name="LogConfig">LogConfig object</param>
+    ''' <param name="ServiceAdress">The IP address/hostname and port, separated by semicolon or colon, ex localhost:9000</param>
+    Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
+        _logger = LogConfig.GetLogger()
+        _FileEx = New Filesystem.File(LogConfig)
+
+        Dim oServiceAddress As String = ServiceAdress
+        Dim oAddressArray() As String
+
+        If oServiceAddress.Contains(";") Then
+            oAddressArray = oServiceAddress.Split(";")
+        Else
+            oAddressArray = oServiceAddress.Split(":")
+        End If
+
+        Try
+            _IPAddressServer = oAddressArray(0)
+            Dim oBinding = Channel.GetBinding()
+            Dim oAddress = New EndpointAddress($"net.tcp://{oAddressArray(0)}:{oAddressArray(1)}/DigitalData/Services/Main")
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
+
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    ''' <summary>
+    ''' Creates a new EDMI Client object
+    ''' </summary>
+    ''' <param name="LogConfig">LogConfig object</param>
+    ''' <param name="IPAddress">The IP address to connect to</param>
+    ''' <param name="PortNumber">The Port number to use for the connection</param>
+    Public Sub New(LogConfig As LogConfig, IPAddress As String, PortNumber As Integer)
+        _logger = LogConfig.GetLogger()
+        _FileEx = New Filesystem.File(LogConfig)
+
+        Try
+            _IPAddressServer = IPAddress
+            Dim oBinding = Channel.GetBinding()
+            Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
+
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
    ''' <summary>
    ''' Parse a IPAddress:Port String into its parts
    ''' </summary>
@@ -40,55 +93,6 @@ Public Class Client
        Return New Tuple(Of String, Integer)(oAppServerAddress, oAppServerPort)
    End Function

-    ''' <summary>
-    ''' Creates a new EDMI Client object
-    ''' </summary>
-    ''' <param name="LogConfig">LogConfig object</param>
-    ''' <param name="ServiceAdress">The IP address/hostname and port, separated by semicolon or colon, ex localhost:9000</param>
-    Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
-        _logger = LogConfig.GetLogger()
-
-        Dim oServiceAddress As String = ServiceAdress
-        Dim oAddressArray() As String
-
-        If oServiceAddress.Contains(";") Then
-            oAddressArray = oServiceAddress.Split(";")
-        Else
-            oAddressArray = oServiceAddress.Split(":")
-        End If
-
-        Try
-            Dim oBinding = Channel.GetBinding()
-            Dim oAddress = New EndpointAddress($"net.tcp://{oAddressArray(0)}:{oAddressArray(1)}/DigitalData/Services/Main")
-            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
-
-            _channelFactory = oFactory
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
-    ''' <summary>
-    ''' Creates a new EDMI Client object
-    ''' </summary>
-    ''' <param name="LogConfig">LogConfig object</param>
-    ''' <param name="IPAddress">The IP address to connect to</param>
-    ''' <param name="PortNumber">The Port number to use for the connection</param>
-    Public Sub New(LogConfig As LogConfig, IPAddress As String, PortNumber As Integer)
-        _logger = LogConfig.GetLogger()
-
-        Try
-            _IPAddressServer = IPAddress
-            Dim oBinding = Channel.GetBinding()
-            Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
-            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
-
-            _channelFactory = oFactory
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
    ''' <summary>
    ''' Connect to the service
    ''' </summary>
@@ -109,26 +113,16 @@ Public Class Client
        End Try
    End Function

-    ''' <summary>
-    ''' TODO: Creates a new object
-    ''' </summary>
-    ''' <returns></returns>
-    Public Async Function NewObjectAsync() As Task
-        Throw New NotImplementedException()
-    End Function
-
-
-
    ''' <summary>
    ''' Imports a file from a filepath, creating a IDB ObjectId and Filesystem Object
    ''' </summary>
-    ''' <param name="pObjectStoreType">Type of ObjectStore. Can be WORK or ARCHIVE.</param>
+    ''' <param name="pObjectStoreName">Type of ObjectStore. Can be WORK or ARCHIVE.</param>
    ''' <param name="pBusinessEntity">Business entity that the new file object should belong to.</param>
    ''' <param name="pImportOptions">Other file import options</param>
    ''' <exception cref="FileNotFoundException">When local filepath was not found</exception>
    ''' <exception cref="ApplicationException">When there was a error in the Service</exception>
    ''' <returns>The ObjectId of the newly generated filesystem object</returns>
-    Public Async Function NewFileAsync(pFilePath As String, pObjectStoreType As String, pBusinessEntity As String, Optional pImportOptions As NewFileOptions = Nothing) As Task(Of Long)
+    Public Async Function NewFileAsync(pFilePath As String, pObjectStoreName As String, pObjectKind As String, pBusinessEntity As String, Optional pImportOptions As NewFileOptions = Nothing) As Task(Of Long)
        Try
            ' Set default options
            If pImportOptions Is Nothing Then
@@ -137,35 +131,16 @@ Public Class Client

            ' Check if file exists
            If File.Exists(pFilePath) = False Then
-                Throw New FileNotFoundException("ImportFileAsync: Path does not exist")
+                Throw New FileNotFoundException("Path does not exist")
            End If

            Dim oFileInfo As New FileInfo(pFilePath)
            Dim oExtension As String = oFileInfo.Extension

-            ' Creating new ObjectId
-            Dim oObjectIdResponse = Await _channel.NewObjectIdAsync(New NewObjectIdRequest With {
-                .BusinessEntity = pBusinessEntity,
-                .KindType = KIND_TYPE_DOC,
-                .Who = pImportOptions.Username
-            })
-
-            If oObjectIdResponse.ObjectId = Nothing OrElse oObjectIdResponse.ObjectId = 0 Then
-                Throw New ApplicationException("ImportFileAsync: Could not get ObjectId")
-            End If
-
-            ' Create new FileObject for ObjectId
-            Dim oFilePathResponse = Await _channel.NewFileObjectAsync(New NewFileObjectRequest With {
-                .DateImported = pImportOptions.DateImported,
-                .Extension = oExtension,
-                .KeepExtension = pImportOptions.KeepExtension,
-                .ObjectId = oObjectIdResponse.ObjectId,
-                .StoreType = pObjectStoreType
-            })
-
-            If oFilePathResponse.FileObjectPath = Nothing OrElse oFilePathResponse.FileObjectPath = "" Then
-                Throw New ApplicationException("ImportFileAsync: Could not get FileObject Path")
-            End If
+            Dim oFileName As String = oFileInfo.Name
+            Dim oFileCreatedAt As Date = oFileInfo?.CreationTime
+            Dim oFileModifiedAt As Date = oFileInfo?.LastWriteTime
+            Dim oFileHash As String = _FileEx.GetChecksum(oFileInfo.FullName)

            ' Importing the file now
            Using oFileStream As New FileStream(pFilePath, FileMode.Open, FileAccess.Read)
@@ -173,21 +148,26 @@ Public Class Client
                    oFileStream.CopyTo(oMemoryStream)
                    Dim oContents = oMemoryStream.ToArray()

-                    Dim oFileImportResponse = Await _channel.ImportFileIntoFileObjectAsync(New ImportFileIntoFileObjectRequest With {
-                        .FilePath = oFilePathResponse.FileObjectPath,
-                        .ObjectId = oObjectIdResponse.ObjectId,
-                        .ObjectStoreType = pObjectStoreType,
-                        .Who = pImportOptions.Username,
-                        .Contents = oContents
+                    Dim oFileImportResponse = Await _channel.NewFileAsync(New NewFileRequest With {
+                        .BusinessEntity = pBusinessEntity,
+                        .FileName = oFileInfo.Name,
+                        .FileCreatedAt = oFileCreatedAt,
+                        .FileChangedAt = oFileModifiedAt,
+                        .FileContents = oContents,
+                        .FileImportedAt = pImportOptions.DateImported,
+                        .FileChecksum = oFileHash,
+                        .KindType = pObjectKind,
+                        .StoreName = pObjectStoreName,
+                        .Who = pImportOptions.Username
                    })

-                    If oFileImportResponse.Result = False Then
-                        Throw New ApplicationException("ImportFileAsync: Could not Import File Contents")
+                    If oFileImportResponse.OK = False Then
+                        Throw New ApplicationException("Could not Import File Contents!")
                    End If
+
+                    Return oFileImportResponse.ObjectId
                End Using
            End Using
-
-            Return oObjectIdResponse.ObjectId
        Catch ex As Exception
            _logger.Error(ex)
            Return INVALID_OBEJCT_ID
@@ -650,15 +630,15 @@ Public Class Client
        ''' <summary>
        ''' Option to keep the original extension when importing. Defaults to false.
        ''' </summary>
-        Public KeepExtension As Boolean = False
+        Public Property KeepExtension As Boolean = False
        ''' <summary>
        ''' Windows username of the user responsible for the import. Defaults to the currently logged in user.
        ''' </summary>
-        Public Username As String = Environment.UserName
+        Public Property Username As String = Environment.UserName
        ''' <summary>
        ''' Date when the file was imported. Can be in the past. Defaults to now.
        ''' </summary>
-        Public DateImported As Date = Date.Now
+        Public Property DateImported As Date = Date.Now
    End Class

    Public Class NewObjectOptions
--- a/Modules.EDMIAPI/Client/NewFile.vb
+++ b/Modules.EDMIAPI/Client/NewFile.vb
@@ -0,0 +1,11 @@
+Imports DigitalData.Modules.Logging
+
+Public Class NewFile
+    Private ReadOnly LogConfig As LogConfig
+    Private ReadOnly Logger As Logger
+
+    Public Sub New(pLogConfig As LogConfig)
+        LogConfig = pLogConfig
+        Logger = LogConfig.GetLogger()
+    End Sub
+End Class
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.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="DocumentImportResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.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="ImportFileIntoFileObjectResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.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="NewFileObjectResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource
@@ -5,6 +5,6 @@
    Renaming the file extension or editing the content of this file may   
    cause the file to be unrecognizable by the program.
 -->
-<GenericObjectDataSource DisplayName="NewObjectIdResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+<GenericObjectDataSource DisplayName="NewFileResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.FileStorage.NewFile.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.FileStorage.NewFile.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" />
+  <xs:complexType name="NewFileRequest">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="BusinessEntity" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileChangedAt" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileChecksum" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileContents" nillable="true" type="xs:base64Binary" />
+      <xs:element minOccurs="0" name="FileCreatedAt" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileImportedAt" type="xs:dateTime" />
+      <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="KindType" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="StoreName" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="NewFileRequest" nillable="true" type="tns:NewFileRequest" />
+  <xs:complexType name="NewFileResponse">
+    <xs:complexContent mixed="false">
+      <xs:extension xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" base="q1:BaseResponse">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="NewFileResponse" nillable="true" type="tns:NewFileResponse" />
+</xs:schema>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.Messages.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.Messages.xsd
@@ -2,7 +2,7 @@
 <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:complexType name="TableResult">
    <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
+      <xs:extension base="tns:BaseResponse">
        <xs:sequence>
          <xs:element minOccurs="0" name="Table" nillable="true">
            <xs:complexType>
@@ -23,16 +23,16 @@
    </xs:complexContent>
  </xs:complexType>
  <xs:element name="TableResult" nillable="true" type="tns:TableResult" />
-  <xs:complexType name="BaseResult">
+  <xs:complexType name="BaseResponse">
    <xs:sequence>
      <xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="OK" type="xs:boolean" />
    </xs:sequence>
  </xs:complexType>
-  <xs:element name="BaseResult" nillable="true" type="tns:BaseResult" />
+  <xs:element name="BaseResponse" nillable="true" type="tns:BaseResponse" />
  <xs:complexType name="ScalarResult">
    <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
+      <xs:extension base="tns:BaseResponse">
        <xs:sequence>
          <xs:element minOccurs="0" name="Scalar" nillable="true" type="xs:anyType" />
        </xs:sequence>
@@ -42,7 +42,7 @@
  <xs:element name="ScalarResult" nillable="true" type="tns:ScalarResult" />
  <xs:complexType name="NonQueryResult">
    <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
+      <xs:extension base="tns:BaseResponse">
        <xs:sequence />
      </xs:extension>
    </xs:complexContent>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
@@ -8,6 +8,7 @@
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" />
      <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.Services.EDMIService.FileStorage.NewFile" />
      <xsd:import namespace="http://schemas.microsoft.com/Message" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" />
    </xsd:schema>
@@ -111,14 +112,11 @@
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q11:UnexpectedErrorFault" />
  </wsdl:message>
-  <wsdl:message name="DocumentImportRequest">
-    <wsdl:part name="parameters" element="tns:DocumentImportRequest" />
+  <wsdl:message name="IEDMIService_NewFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:NewFile" />
  </wsdl:message>
-  <wsdl:message name="DocumentImportResponse">
-    <wsdl:part name="parameters" element="tns:DocumentImportResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_ImportFile_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q12:UnexpectedErrorFault" />
+  <wsdl:message name="IEDMIService_NewFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:NewFileResponse" />
  </wsdl:message>
  <wsdl:message name="DocumentStreamRequest">
    <wsdl:part name="parameters" element="tns:DocumentStreamRequest" />
@@ -130,10 +128,10 @@
    <wsdl:part name="FileName" element="tns:FileName" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFileByObjectId_ObjectDoesNotExistFaultFault_FaultMessage">
-    <wsdl:part xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q13:ObjectDoesNotExistFault" />
+    <wsdl:part xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q12:ObjectDoesNotExistFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFileByObjectId_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q14:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q13:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="DocumentInfoRequest">
    <wsdl:part name="parameters" element="tns:DocumentInfoRequest" />
@@ -142,41 +140,14 @@
    <wsdl:part name="parameters" element="tns:DocumentInfoResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFileInfoByObjectId_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q15:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q14:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ListFilesForUser_InputMessage" />
  <wsdl:message name="DocumentListResponse">
    <wsdl:part name="parameters" element="tns:DocumentListResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
-  </wsdl:message>
-  <wsdl:message name="NewObjectIdRequest">
-    <wsdl:part name="parameters" element="tns:NewObjectIdRequest" />
-  </wsdl:message>
-  <wsdl:message name="NewObjectIdResponse">
-    <wsdl:part name="parameters" element="tns:NewObjectIdResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_NewObjectId_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q17="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q17:UnexpectedErrorFault" />
-  </wsdl:message>
-  <wsdl:message name="NewFileObjectRequest">
-    <wsdl:part name="parameters" element="tns:NewFileObjectRequest" />
-  </wsdl:message>
-  <wsdl:message name="NewFileObjectResponse">
-    <wsdl:part name="parameters" element="tns:NewFileObjectResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_NewFileObject_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q18="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q18:UnexpectedErrorFault" />
-  </wsdl:message>
-  <wsdl:message name="ImportFileIntoFileObjectRequest">
-    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectRequest" />
-  </wsdl:message>
-  <wsdl:message name="ImportFileIntoFileObjectResponse">
-    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_ImportFileIntoFileObject_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q19="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q19:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q15:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="TestObjectIdExistsRequest">
    <wsdl:part name="parameters" element="tns:TestObjectIdExistsRequest" />
@@ -185,7 +156,7 @@
    <wsdl:part name="parameters" element="tns:TestObjectIdExistsResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_TestObjectIdExists_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q20="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q20:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:portType name="IEDMIService">
    <wsdl:operation name="Heartbeat">
@@ -243,10 +214,9 @@
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMResponse" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
-    <wsdl:operation name="ImportFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" name="DocumentImportRequest" message="tns:DocumentImportRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse" name="DocumentImportResponse" message="tns:DocumentImportResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportFile_UnexpectedErrorFaultFault_FaultMessage" />
+    <wsdl:operation name="NewFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" message="tns:IEDMIService_NewFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse" message="tns:IEDMIService_NewFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetFileByObjectId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" name="DocumentStreamRequest" message="tns:DocumentStreamRequest" />
@@ -264,21 +234,6 @@
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse" name="DocumentListResponse" message="tns:DocumentListResponse" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
-    <wsdl:operation name="NewObjectId">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId" name="NewObjectIdRequest" message="tns:NewObjectIdRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse" name="NewObjectIdResponse" message="tns:NewObjectIdResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_NewObjectId_UnexpectedErrorFaultFault_FaultMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="NewFileObject">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject" name="NewFileObjectRequest" message="tns:NewFileObjectRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse" name="NewFileObjectResponse" message="tns:NewFileObjectResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_NewFileObject_UnexpectedErrorFaultFault_FaultMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="ImportFileIntoFileObject">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject" name="ImportFileIntoFileObjectRequest" message="tns:ImportFileIntoFileObjectRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResponse" name="ImportFileIntoFileObjectResponse" message="tns:ImportFileIntoFileObjectResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportFileIntoFileObject_UnexpectedErrorFaultFault_FaultMessage" />
-    </wsdl:operation>
    <wsdl:operation name="TestObjectIdExists">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExists" name="TestObjectIdExistsRequest" message="tns:TestObjectIdExistsRequest" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExistsResponse" name="TestObjectIdExistsResponse" message="tns:TestObjectIdExistsResponse" />
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
@@ -1,6 +1,7 @@
 <?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.Messages" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" />
  <xs:import namespace="http://schemas.microsoft.com/Message" />
  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" />
  <xs:element name="Heartbeat">
@@ -157,21 +158,17 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="DocumentImportRequest">
+  <xs:element name="NewFile">
    <xs:complexType>
      <xs:sequence>
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
-        <xs:element minOccurs="0" name="DocumentType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="ObjectStoreId" type="xs:long" />
-        <xs:element minOccurs="0" name="RetentionDays" type="xs:long" />
+        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" minOccurs="0" name="Data" nillable="true" type="q11:NewFileRequest" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="DocumentImportResponse">
+  <xs:element name="NewFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" minOccurs="0" name="NewFileResult" nillable="true" type="q12:NewFileResponse" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -185,7 +182,7 @@
  <xs:element name="DocumentStreamResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q11="http://schemas.microsoft.com/Message" name="FileContents" type="q11:StreamBody" />
+        <xs:element xmlns:q13="http://schemas.microsoft.com/Message" name="FileContents" type="q13:StreamBody" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -201,7 +198,7 @@
  <xs:element name="DocumentInfoResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" minOccurs="0" name="FileRight" type="q12:Rights.AccessRight" />
+        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" minOccurs="0" name="FileRight" type="q14:Rights.AccessRight" />
        <xs:element minOccurs="0" name="FullPath" nillable="true" type="xs:string" />
      </xs:sequence>
    </xs:complexType>
@@ -226,58 +223,6 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="NewObjectIdRequest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="BusinessEntity" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="KindType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewObjectIdResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewFileObjectRequest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="DateImported" type="xs:dateTime" />
-        <xs:element minOccurs="0" name="Extension" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="KeepExtension" type="xs:boolean" />
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
-        <xs:element minOccurs="0" name="StoreType" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewFileObjectResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="FileObjectPath" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ImportFileIntoFileObjectRequest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
-        <xs:element minOccurs="0" name="FilePath" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
-        <xs:element minOccurs="0" name="ObjectStoreType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ImportFileIntoFileObjectResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="Result" type="xs:boolean" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
  <xs:element name="TestObjectIdExistsRequest">
    <xs:complexType>
      <xs:sequence>
--- a/Services/EDMIServiceReference/Reference.svcmap
+++ b/Services/EDMIServiceReference/Reference.svcmap
@@ -30,6 +30,7 @@
    <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.Services.EDMIService.Exceptions.xsd" MetadataType="Schema" ID="57cf2e83-7c36-485a-90c3-0bc4a1748882" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.FileStorage.NewFile.xsd" MetadataType="Schema" ID="bbb83dae-4701-48e2-9c2f-747660d3bd68" 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" />
    <MetadataFile FileName="DigitalData.Modules.EDMI.API.xsd" MetadataType="Schema" ID="4eca5a54-795a-4e5b-a3b1-10c24930efec" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
  </Metadata>
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@@ -18,13 +18,14 @@ 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.Messages"& _ 
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResponse", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages"& _ 
        ""),  _
     System.SerializableAttribute(),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NewFileResponse)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))>  _
-    Partial Public Class BaseResult
+    Partial Public Class BaseResponse
        Inherits Object
        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
        
@@ -89,7 +90,7 @@ Namespace EDMIServiceReference
        ""),  _
     System.SerializableAttribute(),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResponse)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.Exception)),  _
@@ -97,9 +98,11 @@ Namespace EDMIServiceReference
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DataTableDoesNotExistFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ObjectDoesNotExistFault)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NewFileRequest)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NewFileResponse)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.RightsAccessRight))>  _
    Partial Public Class ScalarResult
-        Inherits EDMIServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResponse
        
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private ScalarField As Object
@@ -124,7 +127,32 @@ Namespace EDMIServiceReference
        ""),  _
     System.SerializableAttribute()>  _
    Partial Public Class NonQueryResult
-        Inherits EDMIServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResponse
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NewFileResponse", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStor"& _ 
+        "age.NewFile"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class NewFileResponse
+        Inherits EDMIServiceReference.BaseResponse
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private ObjectIdField As Long
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property ObjectId() As Long
+            Get
+                Return Me.ObjectIdField
+            End Get
+            Set
+                If (Me.ObjectIdField.Equals(value) <> true) Then
+                    Me.ObjectIdField = value
+                    Me.RaisePropertyChanged("ObjectId")
+                End If
+            End Set
+        End Property
    End Class
    
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
@@ -133,7 +161,7 @@ Namespace EDMIServiceReference
        ""),  _
     System.SerializableAttribute()>  _
    Partial Public Class TableResult
-        Inherits EDMIServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResponse
        
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private TableField As System.Data.DataTable
@@ -262,6 +290,198 @@ Namespace EDMIServiceReference
        Inherits EDMIServiceReference.BaseFault
    End Class
    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NewFileRequest", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStor"& _ 
+        "age.NewFile"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class NewFileRequest
+        Inherits Object
+        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+        
+        <System.NonSerializedAttribute()>  _
+        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private BusinessEntityField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileChangedAtField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileChecksumField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileContentsField() As Byte
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileCreatedAtField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileImportedAtField As Date
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileNameField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private KindTypeField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private StoreNameField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private WhoField 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()>  _
+        Public Property BusinessEntity() As String
+            Get
+                Return Me.BusinessEntityField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.BusinessEntityField, value) <> true) Then
+                    Me.BusinessEntityField = value
+                    Me.RaisePropertyChanged("BusinessEntity")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileChangedAt() As String
+            Get
+                Return Me.FileChangedAtField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileChangedAtField, value) <> true) Then
+                    Me.FileChangedAtField = value
+                    Me.RaisePropertyChanged("FileChangedAt")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileChecksum() As String
+            Get
+                Return Me.FileChecksumField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileChecksumField, value) <> true) Then
+                    Me.FileChecksumField = value
+                    Me.RaisePropertyChanged("FileChecksum")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileContents() As Byte()
+            Get
+                Return Me.FileContentsField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileContentsField, value) <> true) Then
+                    Me.FileContentsField = value
+                    Me.RaisePropertyChanged("FileContents")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileCreatedAt() As String
+            Get
+                Return Me.FileCreatedAtField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileCreatedAtField, value) <> true) Then
+                    Me.FileCreatedAtField = value
+                    Me.RaisePropertyChanged("FileCreatedAt")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileImportedAt() As Date
+            Get
+                Return Me.FileImportedAtField
+            End Get
+            Set
+                If (Me.FileImportedAtField.Equals(value) <> true) Then
+                    Me.FileImportedAtField = value
+                    Me.RaisePropertyChanged("FileImportedAt")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        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
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property KindType() As String
+            Get
+                Return Me.KindTypeField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.KindTypeField, value) <> true) Then
+                    Me.KindTypeField = value
+                    Me.RaisePropertyChanged("KindType")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property StoreName() As String
+            Get
+                Return Me.StoreNameField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.StoreNameField, value) <> true) Then
+                    Me.StoreNameField = value
+                    Me.RaisePropertyChanged("StoreName")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property Who() As String
+            Get
+                Return Me.WhoField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.WhoField, value) <> true) Then
+                    Me.WhoField = value
+                    Me.RaisePropertyChanged("Who")
+                End If
+            End Set
+        End Property
+        
+        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
+        
+        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
+            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
+            If (Not (propertyChanged) Is Nothing) Then
+                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
+            End If
+        End Sub
+    End Class
+    
    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
     System.Runtime.Serialization.DataContractAttribute(Name:="Rights.AccessRight", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API")>  _
    Public Enum RightsAccessRight As Integer
@@ -399,15 +619,11 @@ Namespace EDMIServiceReference
            "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"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileUnexpectedErrorFau"& _ 
-            "ltFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
+        Function NewFile(ByVal Data As EDMIServiceReference.NewFileRequest) As EDMIServiceReference.NewFileResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
-        Function ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
+        Function NewFileAsync(ByVal Data As EDMIServiceReference.NewFileRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileResponse)
        
        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentStreamRequest) von Nachricht "DocumentStreamRequest" nicht mit dem Standardwert (GetFileByObjectId) übereinstimmt.
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse"),  _
@@ -444,38 +660,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)
        
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (NewObjectIdRequest) von Nachricht "NewObjectIdRequest" nicht mit dem Standardwert (NewObjectId) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdUnexpectedErrorFa"& _ 
-            "ultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse")>  _
-        Function NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse)
-        
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (NewFileObjectRequest) von Nachricht "NewFileObjectRequest" nicht mit dem Standardwert (NewFileObject) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectUnexpectedError"& _ 
-            "FaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse")>  _
-        Function NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse)
-        
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (ImportFileIntoFileObjectRequest) von Nachricht "ImportFileIntoFileObjectRequest" nicht mit dem Standardwert (ImportFileIntoFileObject) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResp"& _ 
-            "onse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectUnex"& _ 
-            "pectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResp"& _ 
-            "onse")>  _
-        Function ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
-        
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExists", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExistsResponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExistsUnexpected"& _ 
            "ErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
@@ -487,60 +671,6 @@ Namespace EDMIServiceReference
        Function TestObjectIdExistsAsync(ByVal request As EDMIServiceReference.TestObjectIdExistsRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.TestObjectIdExistsResponse)
    End Interface
    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public Contents() As Byte
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public DocumentType As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public FileName As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
-        Public ObjectStoreId As Long
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
-        Public RetentionDays As Long
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long)
-            MyBase.New
-            Me.Contents = Contents
-            Me.DocumentType = DocumentType
-            Me.FileName = FileName
-            Me.ObjectStoreId = ObjectStoreId
-            Me.RetentionDays = RetentionDays
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public ObjectId As Long
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal ObjectId As Long)
-            MyBase.New
-            Me.ObjectId = ObjectId
-        End Sub
-    End Class
-    
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
@@ -657,160 +787,6 @@ Namespace EDMIServiceReference
        End Sub
    End Class
    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewObjectIdRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public BusinessEntity As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public KindType As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public Who As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String)
-            MyBase.New
-            Me.BusinessEntity = BusinessEntity
-            Me.KindType = KindType
-            Me.Who = Who
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewObjectIdResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public ObjectId As Long
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal ObjectId As Long)
-            MyBase.New
-            Me.ObjectId = ObjectId
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewFileObjectRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewFileObjectRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public DateImported As Date
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public Extension As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public KeepExtension As Boolean
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
-        Public ObjectId As Long
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
-        Public StoreType As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String)
-            MyBase.New
-            Me.DateImported = DateImported
-            Me.Extension = Extension
-            Me.KeepExtension = KeepExtension
-            Me.ObjectId = ObjectId
-            Me.StoreType = StoreType
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewFileObjectResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public FileObjectPath As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal FileObjectPath As String)
-            MyBase.New
-            Me.FileObjectPath = FileObjectPath
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class ImportFileIntoFileObjectRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public Contents() As Byte
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public FilePath As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public ObjectId As Long
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
-        Public ObjectStoreType As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
-        Public Who As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal Contents() As Byte, ByVal FilePath As String, ByVal ObjectId As Long, ByVal ObjectStoreType As String, ByVal Who As String)
-            MyBase.New
-            Me.Contents = Contents
-            Me.FilePath = FilePath
-            Me.ObjectId = ObjectId
-            Me.ObjectStoreType = ObjectStoreType
-            Me.Who = Who
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class ImportFileIntoFileObjectResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public Result As Boolean
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal Result As Boolean)
-            MyBase.New
-            Me.Result = Result
-        End Sub
-    End Class
-    
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
     System.ServiceModel.MessageContractAttribute(WrapperName:="TestObjectIdExistsRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
@@ -974,35 +950,12 @@ Namespace EDMIServiceReference
            Return MyBase.Channel.ExecuteNonQuery_MSSQL_ECMAsync(SQL)
        End Function
        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse Implements EDMIServiceReference.IEDMIService.ImportFile
-            Return MyBase.Channel.ImportFile(request)
+        Public Function NewFile(ByVal Data As EDMIServiceReference.NewFileRequest) As EDMIServiceReference.NewFileResponse Implements EDMIServiceReference.IEDMIService.NewFile
+            Return MyBase.Channel.NewFile(Data)
        End Function
        
-        Public Function ImportFile(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long) As Long
-            Dim inValue As EDMIServiceReference.DocumentImportRequest = New EDMIServiceReference.DocumentImportRequest()
-            inValue.Contents = Contents
-            inValue.DocumentType = DocumentType
-            inValue.FileName = FileName
-            inValue.ObjectStoreId = ObjectStoreId
-            inValue.RetentionDays = RetentionDays
-            Dim retVal As EDMIServiceReference.DocumentImportResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFile(inValue)
-            Return retVal.ObjectId
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse) Implements EDMIServiceReference.IEDMIService.ImportFileAsync
-            Return MyBase.Channel.ImportFileAsync(request)
-        End Function
-        
-        Public Function ImportFileAsync(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
-            Dim inValue As EDMIServiceReference.DocumentImportRequest = New EDMIServiceReference.DocumentImportRequest()
-            inValue.Contents = Contents
-            inValue.DocumentType = DocumentType
-            inValue.FileName = FileName
-            inValue.ObjectStoreId = ObjectStoreId
-            inValue.RetentionDays = RetentionDays
-            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileAsync(inValue)
+        Public Function NewFileAsync(ByVal Data As EDMIServiceReference.NewFileRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileResponse) Implements EDMIServiceReference.IEDMIService.NewFileAsync
+            Return MyBase.Channel.NewFileAsync(Data)
        End Function
        
        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
@@ -1068,95 +1021,6 @@ Namespace EDMIServiceReference
            Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue)
        End Function
        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse Implements EDMIServiceReference.IEDMIService.NewObjectId
-            Return MyBase.Channel.NewObjectId(request)
-        End Function
-        
-        Public Function NewObjectId(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As Long
-            Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest()
-            inValue.BusinessEntity = BusinessEntity
-            inValue.KindType = KindType
-            inValue.Who = Who
-            Dim retVal As EDMIServiceReference.NewObjectIdResponse = CType(Me,EDMIServiceReference.IEDMIService).NewObjectId(inValue)
-            Return retVal.ObjectId
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse) Implements EDMIServiceReference.IEDMIService.NewObjectIdAsync
-            Return MyBase.Channel.NewObjectIdAsync(request)
-        End Function
-        
-        Public Function NewObjectIdAsync(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse)
-            Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest()
-            inValue.BusinessEntity = BusinessEntity
-            inValue.KindType = KindType
-            inValue.Who = Who
-            Return CType(Me,EDMIServiceReference.IEDMIService).NewObjectIdAsync(inValue)
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse Implements EDMIServiceReference.IEDMIService.NewFileObject
-            Return MyBase.Channel.NewFileObject(request)
-        End Function
-        
-        Public Function NewFileObject(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As String
-            Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest()
-            inValue.DateImported = DateImported
-            inValue.Extension = Extension
-            inValue.KeepExtension = KeepExtension
-            inValue.ObjectId = ObjectId
-            inValue.StoreType = StoreType
-            Dim retVal As EDMIServiceReference.NewFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).NewFileObject(inValue)
-            Return retVal.FileObjectPath
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse) Implements EDMIServiceReference.IEDMIService.NewFileObjectAsync
-            Return MyBase.Channel.NewFileObjectAsync(request)
-        End Function
-        
-        Public Function NewFileObjectAsync(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse)
-            Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest()
-            inValue.DateImported = DateImported
-            inValue.Extension = Extension
-            inValue.KeepExtension = KeepExtension
-            inValue.ObjectId = ObjectId
-            inValue.StoreType = StoreType
-            Return CType(Me,EDMIServiceReference.IEDMIService).NewFileObjectAsync(inValue)
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObject
-            Return MyBase.Channel.ImportFileIntoFileObject(request)
-        End Function
-        
-        Public Function ImportFileIntoFileObject(ByVal Contents() As Byte, ByVal FilePath As String, ByVal ObjectId As Long, ByVal ObjectStoreType As String, ByVal Who As String) As Boolean
-            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
-            inValue.Contents = Contents
-            inValue.FilePath = FilePath
-            inValue.ObjectId = ObjectId
-            inValue.ObjectStoreType = ObjectStoreType
-            inValue.Who = Who
-            Dim retVal As EDMIServiceReference.ImportFileIntoFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObject(inValue)
-            Return retVal.Result
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse) Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObjectAsync
-            Return MyBase.Channel.ImportFileIntoFileObjectAsync(request)
-        End Function
-        
-        Public Function ImportFileIntoFileObjectAsync(ByVal Contents() As Byte, ByVal FilePath As String, ByVal ObjectId As Long, ByVal ObjectStoreType As String, ByVal Who As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
-            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
-            inValue.Contents = Contents
-            inValue.FilePath = FilePath
-            inValue.ObjectId = ObjectId
-            inValue.ObjectStoreType = ObjectStoreType
-            inValue.Who = Who
-            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObjectAsync(inValue)
-        End Function
-        
        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Function EDMIServiceReference_IEDMIService_TestObjectIdExists(ByVal request As EDMIServiceReference.TestObjectIdExistsRequest) As EDMIServiceReference.TestObjectIdExistsResponse Implements EDMIServiceReference.IEDMIService.TestObjectIdExists
            Return MyBase.Channel.TestObjectIdExists(request)
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@@ -173,17 +173,14 @@
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
-    <wsdl:operation name="ImportFile">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" style="document" />
-      <wsdl:input name="DocumentImportRequest">
+    <wsdl:operation name="NewFile">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" style="document" />
+      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
-      <wsdl:output name="DocumentImportResponse">
+      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="GetFileByObjectId">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" style="document" />
@@ -225,42 +222,6 @@
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
-    <wsdl:operation name="NewObjectId">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId" style="document" />
-      <wsdl:input name="NewObjectIdRequest">
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="NewObjectIdResponse">
-        <soap12:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="NewFileObject">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject" style="document" />
-      <wsdl:input name="NewFileObjectRequest">
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="NewFileObjectResponse">
-        <soap12:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="ImportFileIntoFileObject">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject" style="document" />
-      <wsdl:input name="ImportFileIntoFileObjectRequest">
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="ImportFileIntoFileObjectResponse">
-        <soap12:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
-    </wsdl:operation>
    <wsdl:operation name="TestObjectIdExists">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExists" style="document" />
      <wsdl:input name="TestObjectIdExistsRequest">
--- a/Modules.EDMIAPI/DatabaseWithFallback.vb
+++ b/Modules.EDMIAPI/DatabaseWithFallback.vb
@@ -33,20 +33,6 @@ Public Class DatabaseWithFallback
        _DatabaseIDB = DatabaseIDB
    End Sub

-    ''' <summary>
-    ''' Attempt at making loading big tables less annoying
-    ''' </summary>
-    ''' <returns></returns>
-    Public Function GetDatatable(pTable As TableType, Optional FilterExpression As String = "", Optional SortByColumn As String = "", Optional ForceFallback As Boolean = False)
-        Dim oTable = Tables.Where(Function(t) t.DatabaseType = pTable).SingleOrDefault()
-
-        If oTable Is Nothing Then
-            Return Nothing
-        Else
-            Return GetDatatable(oTable.TableName, oTable.SQLCommand, oTable.DatabaseType, FilterExpression, SortByColumn, ForceFallback)
-        End If
-    End Function
-
    Public Function GetDatatable(pDataTableName As String, pFallbackSQL As String, pFallbackType As Constants.DatabaseType, Optional pFilterExpression As String = "", Optional pSortByColumn As String = "", Optional pForceFallback As Boolean = False) As DataTable
        Try
            Dim oResult As DataTable = Nothing
--- a/Modules.EDMIAPI/EDMI.API.vbproj
+++ b/Modules.EDMIAPI/EDMI.API.vbproj
@@ -72,6 +72,7 @@
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Client\NewFile.vb" />
    <Compile Include="Client\Rights.vb" />
    <Compile Include="Client\Channel.vb" />
    <Compile Include="Connected Services\EDMIServiceReference\Reference.vb">
@@ -108,9 +109,6 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
@@ -120,13 +118,7 @@
    <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.ImportFileIntoFileObjectResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
@@ -150,6 +142,9 @@
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
      <SubType>Designer</SubType>
    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.FileStorage.NewFile.xsd">
+      <SubType>Designer</SubType>
+    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
      <SubType>Designer</SubType>
    </None>
@@ -190,6 +185,10 @@
      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
      <Name>Database</Name>
    </ProjectReference>
+    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
+      <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>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("EDMIAPI")>
-<Assembly: AssemblyCopyright("Copyright ©  2018")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyCopyright("Copyright © 2021")>
+<Assembly: AssemblyTrademark("1.3.0.0")>

 <Assembly: ComVisible(False)>

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.2.4.0")>
-<Assembly: AssemblyFileVersion("1.2.4.0")>
+<Assembly: AssemblyVersion("1.3.0.0")>
+<Assembly: AssemblyFileVersion("1.3.0.0")>
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -9,7 +9,8 @@ Imports System.ServiceModel.Description
 Imports DigitalData.Services.EDMIService.Messages
 Imports DigitalData.Modules.EDMI.API.Rights
 Imports DigitalData.Services.EDMIService.Exceptions
-
+Imports DigitalData.Services.EDMIService.GlobalState
+Imports DigitalData.Services.EDMIService.FileStorage

 <ServiceBehavior(InstanceContextMode:=InstanceContextMode.PerSession)>
 Public Class EDMIService
@@ -54,16 +55,110 @@ Public Class EDMIService
        _Logger.Debug("New Request by User [{0}]", _Username)
    End Sub

-    Private Function StripDomainFromUsername(UserName As String)
-        If UserName.Contains("\") Then
-            Return UserName.Split("\")(1)
-        ElseIf UserName.Contains("@") Then
-            Return UserName.Split("@")(0)
-        Else
-            Return UserName
-        End If
+    Public Function NewFile(Data As NewFile.NewFileRequest) As NewFile.NewFileResponse Implements IEDMIService.NewFile
+        _Logger.Debug("Start of Method [NewFile]")
+
+        Try
+            Dim oNewObjectIdSQL = $"DECLARE @NEW_IDB_OBJ_ID BIGINT
+                            EXEC PRIDB_NEW_OBJECT '{Data.KindType}','{Data.Who}','{Data.BusinessEntity}',0, @IDB_OBJ_ID = @NEW_IDB_OBJ_ID OUTPUT;
+                            SELECT @NEW_IDB_OBJ_ID"
+            Dim oObjectId As Long = MSSQL_IDB.GetScalarValue(oNewObjectIdSQL)
+            _Logger.Info("New Object with Id [{0}] created!", oObjectId)
+
+            If IsNothing(oObjectId) Then
+                LogAndThrow("Could not create new ObjectId!")
+            End If
+
+            '---------------------------------------------------------------------------
+
+            ' Find ObjectStore by Title
+            _Logger.Debug("Checking for DataStore [{0}].", Data.StoreName)
+            Dim oStore = GlobalState.ObjectStores.
+                Where(Function(store) store.Path.Equals(Data.StoreName, StringComparison.OrdinalIgnoreCase)).
+                SingleOrDefault()
+
+            If oStore Is Nothing Then
+                LogAndThrow($"DataStore [{Data.StoreName}] does not exist. Exiting.")
+            End If
+
+            ' Get Store base path
+            Dim oBasePath As String = oStore.Path
+            _Logger.Debug("Store BasePath is [{0}]", oBasePath)
+
+            ' Get directory by DateImported or, if not supplied, by current date
+            Dim oSubDirectory As String
+            If IsNothing(Data.FileImportedAt) Then
+                oSubDirectory = GetDateSubDirectory(Now)
+            Else
+                oSubDirectory = GetDateSubDirectory(Data.FileImportedAt)
+            End If
+            _Logger.Debug("Subdirectory is [{0}]", oSubDirectory)
+
+            ' Check and create final path, if necessary
+            Dim oFinalPath = Path.Combine(oBasePath, oSubDirectory)
+            If Not Directory.Exists(oFinalPath) Then
+                Try
+                    _Logger.Debug("Path does not exist, creating: [{0}]", oFinalPath)
+                    Directory.CreateDirectory(oFinalPath)
+                    _Logger.Debug("Created folder [{0}]", oFinalPath)
+                Catch ex As Exception
+                    Throw GetFault(ex)
+                End Try
+            End If
+            _Logger.Debug("Final Directory is [{0}]", oFinalPath)
+
+            ' Get filename
+            Dim oKeepFileName As Boolean = False
+            If oStore.IsArchive Then
+                _Logger.Debug("Object Store is an archive: [{0}]", oStore.IsArchive)
+                oKeepFileName = True
+            End If
+
+            Dim oFileName As String = GetFileObjectFileName(oObjectId, Data.FileName, oKeepFileName)
+            _Logger.Debug("Filename is [{0}]", oFileName)
+
+            Dim oFileObjectPath As String = Path.Combine(oFinalPath, oFileName)
+            Dim oFileObjectInfo As FileInfo = New FileInfo(oFileObjectPath)
+
+            Dim oFileObjectSize As Long = Data.FileContents.Length
+            Dim oFileObjectExtension As String = oFileObjectInfo.Extension.Substring(1)
+            Dim oFileObjectName As String = oFileObjectInfo.Name
+
+            _Logger.Debug("File Information for [{0}]:", oFileObjectName)
+            _Logger.Debug("Size: [{0}]", oFileObjectSize)
+            _Logger.Debug("Extension: [{0}]", oFileObjectExtension)
+            _Logger.Debug("Checksum: [{0}]", Data.FileChecksum)
+
+            Try
+                Using oStream = New FileStream(oFileObjectPath, FileMode.Create, FileAccess.Write)
+                    _Logger.Info("ImportFile: Saving file to path [{0}]", oFileObjectPath)
+                    _Logger.Info("ImportFile: Content Length: {0}", oFileObjectSize)
+
+                    oStream.Write(Data.FileContents, 0, oFileObjectSize)
+                    oStream.Flush(True)
+                    oStream.Close()
+                End Using
+            Catch ex As Exception
+                _Logger.Error(ex)
+                LogAndThrow("Could not write file to disk!")
+            End Try
+
+            ' Insert into DB
+            Dim oSQL As String = $"EXEC PRIDB_NEW_IDBFO '{oFileObjectPath}', '{oFileObjectName}', '{oFileObjectExtension}',{oFileObjectSize},{Data.FileChecksum} ,'{Data.Who}','{oObjectId}',{oStore.Id}"
+            Dim oResult As Boolean = MSSQL_IDB.ExecuteNonQuery(oSQL)
+
+            If oResult = False Then
+                LogAndThrow("IDB FileObject could not be created!")
+            End If
+
+            Return New NewFile.NewFileResponse(oObjectId)
+        Catch ex As FaultException
+            Return New NewFile.NewFileResponse(ex)
+
+        End Try
    End Function

+
 #Region "=== Heartbeat ==="
    Public Function Heartbeat() As Boolean Implements IEDMIService.Heartbeat
        Return True
@@ -288,56 +383,56 @@ Public Class EDMIService
    ''' Imports a file according to ObjectStoreId
    ''' </summary>
    ''' <returns></returns>
-    Public Function ImportFile(Data As DocumentImportRequest) As DocumentImportResponse Implements IEDMIService.ImportFile
-        Dim oObjectStore = GlobalState.ObjectStores.First()
-        Dim EDMIPath = New EDMI.File.Path(LogConfig, oObjectStore.Path)
+    'Public Function ImportFile(Data As DocumentImportRequest) As DocumentImportResponse Implements IEDMIService.ImportFile
+    '    Dim oObjectStore = GlobalState.ObjectStores.First()
+    '    Dim EDMIPath = New EDMI.File.Path(LogConfig, oObjectStore.Path)

-        ' TODO: 
-        ' - Get Object Store -> Object Catalog -> Catalog Path
-        ' - If IS_ARCHIVE = True And RetentionDays <> Nothing:
-        '   DoArchive!
-        ' - Refactor EDMIPath to get ObjectStore at service start up
-        '   and return ObjectStore Path from ObjectStoreId + RelativePath
-        ' VWIDB_OBJECTSTORE
+    '    ' TODO: 
+    '    ' - Get Object Store -> Object Catalog -> Catalog Path
+    '    ' - If IS_ARCHIVE = True And RetentionDays <> Nothing:
+    '    '   DoArchive!
+    '    ' - Refactor EDMIPath to get ObjectStore at service start up
+    '    '   and return ObjectStore Path from ObjectStoreId + RelativePath
+    '    ' VWIDB_OBJECTSTORE

-        Dim oRelativePath As String = EDMIPath.GetRelativePath(Data.DocumentType, Data.FileName)
-        Dim oAbsolutePath As String = EDMIPath.GetFullPath(Data.DocumentType, Data.FileName)
-        Dim oDirectoryPath = EDMIPath.GetFullPath(Data.DocumentType)
+    '    Dim oRelativePath As String = EDMIPath.GetRelativePath(Data.DocumentType, Data.FileName)
+    '    Dim oAbsolutePath As String = EDMIPath.GetFullPath(Data.DocumentType, Data.FileName)
+    '    Dim oDirectoryPath = EDMIPath.GetFullPath(Data.DocumentType)

-        Try
-            Directory.CreateDirectory(oDirectoryPath)
+    '    Try
+    '        Directory.CreateDirectory(oDirectoryPath)

-            Dim oVersionedFileName As String = Filesystem.GetVersionedFilename(oAbsolutePath)
+    '        Dim oVersionedFileName As String = Filesystem.GetVersionedFilename(oAbsolutePath)

-            _Logger.Info("ImportFile: Saving file [{0}] to path [{1}]", Data.FileName, oVersionedFileName)
-            Using oStream = New FileStream(oVersionedFileName, FileMode.CreateNew)
-                oStream.Write(Data.Contents, 0, Data.Contents.Length)
-                oStream.Flush(True)
-                oStream.Close()
-            End Using
+    '        _Logger.Info("ImportFile: Saving file [{0}] to path [{1}]", Data.FileName, oVersionedFileName)
+    '        Using oStream = New FileStream(oVersionedFileName, FileMode.CreateNew)
+    '            oStream.Write(Data.Contents, 0, Data.Contents.Length)
+    '            oStream.Flush(True)
+    '            oStream.Close()
+    '        End Using

-            ' insert into db
-            Dim oCommand As New SqlCommand("PRIDB_NEW_DOCUMENT")
-            oCommand.Parameters.AddWithValue("@OBJ_ST_ID", 1)
-            oCommand.Parameters.AddWithValue("@REL_PATH", oRelativePath)
-            oCommand.Parameters.AddWithValue("@WHO", _Username)
-            oCommand.Parameters.AddWithValue("@REF_DOCID", 0)
-            oCommand.Parameters.Add(New SqlParameter("@IDB_OBJ_ID", SqlDbType.BigInt))
+    '        ' insert into db
+    '        Dim oCommand As New SqlCommand("PRIDB_NEW_DOCUMENT")
+    '        oCommand.Parameters.AddWithValue("@OBJ_ST_ID", 1)
+    '        oCommand.Parameters.AddWithValue("@REL_PATH", oRelativePath)
+    '        oCommand.Parameters.AddWithValue("@WHO", _Username)
+    '        oCommand.Parameters.AddWithValue("@REF_DOCID", 0)
+    '        oCommand.Parameters.Add(New SqlParameter("@IDB_OBJ_ID", SqlDbType.BigInt))

-            Dim oObjectId = MSSQL_IDB.GetScalarValue(oCommand, "@IDB_OBJ_ID")
+    '        Dim oObjectId = MSSQL_IDB.GetScalarValue(oCommand, "@IDB_OBJ_ID")

-            Return New DocumentImportResponse() With {.ObjectId = oObjectId}
+    '        Return New DocumentImportResponse() With {.ObjectId = oObjectId}

-        Catch ex As FaultException
-            _Logger.Error(ex)
-            Throw ex
+    '    Catch ex As FaultException
+    '        _Logger.Error(ex)
+    '        Throw ex

-        Catch ex As Exception
-            _Logger.Error(ex)
-            Throw GetFault(ex)
+    '    Catch ex As Exception
+    '        _Logger.Error(ex)
+    '        Throw GetFault(ex)

-        End Try
-    End Function
+    '    End Try
+    'End Function

    Public Function GetFileByObjectId(Data As DocumentStreamRequest) As DocumentStreamResponse Implements IEDMIService.GetFileByObjectId
        Try
@@ -447,29 +542,6 @@ Public Class EDMIService
        End Try
    End Function

-    Public Function NewObjectId(Data As NewObjectIdRequest) As NewObjectIdResponse Implements IEDMIService.NewObjectId
-        Try
-            Dim oSQL As String = $"DECLARE @NEW_IDB_OBJ_ID BIGINT
-                EXEC PRIDB_NEW_OBJECT '{Data.KindType}','{Data.Who}','{Data.BusinessEntity}',0, @IDB_OBJ_ID = @NEW_IDB_OBJ_ID OUTPUT;
-                SELECT @NEW_IDB_OBJ_ID"
-            Dim oObjectId = MSSQL_IDB.GetScalarValue(oSQL)
-
-            If oObjectId Is Nothing Then
-                Throw GetFault("NewObjectId: Could not create new ObjectId!")
-            End If
-
-            Return New NewObjectIdResponse With {.ObjectId = oObjectId}
-        Catch ex As FaultException
-            _Logger.Error(ex)
-            Throw ex
-
-        Catch ex As Exception
-            _Logger.Error(ex)
-            Throw GetFault(ex)
-
-        End Try
-    End Function
-
    Public Function TestObjectIdExists(Data As TestObjectIdExistsRequest) As TestObjectIdExistsResponse Implements IEDMIService.TestObjectIdExists
        Try
            Dim oSQL As String = $"SELECT IDB_OBJ_ID, ACTIVE, DELETED FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {Data.ObjectId}"
@@ -496,119 +568,20 @@ Public Class EDMIService
        End Try
    End Function

-    Public Function NewFileObject(Data As NewFileObjectRequest) As NewFileObjectResponse Implements IEDMIService.NewFileObject
-        Try
-            Dim oStoreType As String = Data.StoreType

-            _Logger.Debug("DataStore type is [{0}]", oStoreType)

-            If oStoreType = String.Empty Then
-                _Logger.Debug("DataStore empty, set to [{0}]", ClassConstants.FileStoreWork)
-                oStoreType = ClassConstants.FileStoreWork
-            End If

-            Dim oBasePath As String = GetFileStorePraefix(oStoreType)
-            Dim oSubDirectory As String
-
-            If IsNothing(Data.DateImported) Then
-                oSubDirectory = GetDateSubDirectory(Now)
-            Else
-                oSubDirectory = GetDateSubDirectory(Data.DateImported)
-            End If
-
-            _Logger.Debug("Subdirectory is [{0}]", oSubDirectory)
-
-            Dim oFinalPath = Path.Combine(oBasePath, oSubDirectory)
-
-            If Not Directory.Exists(oFinalPath) Then
-                Try
-                    _Logger.Debug("Path does not exist, creating: [{0}]", oFinalPath)
-                    Directory.CreateDirectory(oFinalPath)
-                    _Logger.Debug("Created folder [{0}]", oFinalPath)
-                Catch ex As Exception
-                    Throw GetFault(ex)
-                End Try
-            End If
-
-            _Logger.Debug("Final Directory is [{0}]", oFinalPath)
-
-            Dim oFileName As String = GetFileObjectFileName(Data.ObjectId, Data.Extension, Data.KeepExtension)
-
-            Dim oFileObjectPath As String = Path.Combine(oFinalPath, oFileName)
-            _Logger.Debug("Final Path is [{0}]", oFileObjectPath)
-
-            Return New NewFileObjectResponse With {.FileObjectPath = oFileObjectPath}
-        Catch ex As FaultException
-            _Logger.Error(ex)
-            Throw ex
-
-        Catch ex As Exception
-            _Logger.Error(ex)
-            Throw GetFault(ex)
-
-        End Try
-    End Function
-
-    Public Function ImportFileIntoFileObject(Data As ImportFileIntoFileObjectRequest) As ImportFileIntoFileObjectResponse Implements IEDMIService.ImportFileIntoFileObject
-        Try
-            Dim oObjectStore = GlobalState.GetObjectStore(Data.ObjectStoreType)
-            If oObjectStore Is Nothing Then
-                Throw New KeyNotFoundException($"ObjectStore [{Data.ObjectStoreType}] was not found.")
-            End If
-
-            Using oStream = New FileStream(Data.FilePath, FileMode.Create, FileAccess.Write)
-                _Logger.Info("ImportFile: Saving file to path [{0}]", Data.FilePath)
-                _Logger.Info("ImportFile: Content Length: {0}", Data.Contents.Length)
-
-                oStream.Write(Data.Contents, 0, Data.Contents.Length)
-                oStream.Flush(True)
-                oStream.Close()
-            End Using
-
-            ' Insert into DB
-            Dim oSQL As String = $"EXEC PRIDB_NEW_IDBFO '{Data.FilePath}',{Data.Contents.Length},'{Data.Who}','{Data.ObjectId}',{oObjectStore.Id}"
-            Dim oResult As Boolean = MSSQL_IDB.ExecuteNonQuery(oSQL)
-
-            Return New ImportFileIntoFileObjectResponse() With {.Result = oResult}
-
-        Catch ex As FaultException
-            _Logger.Error(ex)
-            Throw ex
-
-        Catch ex As Exception
-            _Logger.Error(ex)
-            Throw GetFault(ex)
-
-        End Try
-    End Function
 #End Region

 #Region "=== Private ==="
-    Private Function GetFileObjectFileName(IDB_OBJ_ID As Long, pExtension As String, pKeepExtension As Boolean) As String
-        If Not pExtension.StartsWith("."c) Then
-            pExtension &= "."c
-        End If
-
-        If pKeepExtension Then
-            Return $"{IDB_OBJ_ID}{pExtension}"
+    Private Function GetFileObjectFileName(IDB_OBJ_ID As Long, pFilename As String, pKeepFilename As Boolean) As String
+        If pKeepFilename Then
+            Return pFilename
        Else
            Return $"{IDB_OBJ_ID}.ddfo"
        End If
    End Function

-    Private Function GetFileStorePraefix(pStoreType As String) As String
-        Dim oObjectStore
-
-        If pStoreType = ClassConstants.FileStoreArchive Then
-            oObjectStore = GlobalState.ObjectStores.Item(0)
-        Else ' pStoreType = ClassConstants.FileStoreWork Then
-            oObjectStore = GlobalState.ObjectStores.Item(1)
-        End If
-
-        _Logger.Debug($"oObjectStore is [{oObjectStore.Path}]")
-        Return oObjectStore.Path
-    End Function
-
    Private Function GetDateSubDirectory(pDate As Date) As String
        Return Path.Combine(pDate.ToString("yyyy"), pDate.ToString("MM"), pDate.ToString("dd"))
    End Function
@@ -690,6 +663,21 @@ Public Class EDMIService
            Return AccessRight.VIEW_ONLY
        End Try
    End Function
+
+    Private Function StripDomainFromUsername(UserName As String)
+        If UserName.Contains("\") Then
+            Return UserName.Split("\")(1)
+        ElseIf UserName.Contains("@") Then
+            Return UserName.Split("@")(0)
+        Else
+            Return UserName
+        End If
+    End Function
+
+    Private Function LogAndThrow(pMessage As String)
+        _Logger.Warn(pMessage)
+        Throw New ApplicationException(pMessage)
+    End Function
 #End Region


--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -129,10 +129,12 @@
  <ItemGroup>
    <Compile Include="ClassConstants.vb" />
    <Compile Include="Config.vb" />
+    <Compile Include="Filestorage\NewFile\NewFileRequest.vb" />
+    <Compile Include="Filestorage\NewFile\NewFileResponse.vb" />
    <Compile Include="GlobalState.vb" />
    <Compile Include="Helpers\AccessRightResult.vb" />
    <Compile Include="Helpers\Messages.vb" />
-    <Compile Include="Helpers\BaseResult.vb" />
+    <Compile Include="Helpers\BaseResponse.vb" />
    <Compile Include="Helpers\Exceptions.vb" />
    <Compile Include="Helpers\DatabaseResult.vb" />
    <Compile Include="EDMIService.vb" />
--- a/Service.EDMIService/Filestorage/NewFile/NewFileRequest.vb
+++ b/Service.EDMIService/Filestorage/NewFile/NewFileRequest.vb
@@ -0,0 +1,69 @@
+Imports System.Runtime.Serialization
+
+Namespace FileStorage.NewFile
+    <Serializable>
+    <DataContract>
+    Public Class NewFileRequest
+        ''' <summary>
+        ''' Absolute filename of the file to be imported
+        ''' </summary>
+        <DataMember>
+        Public Property FileName As String
+
+        ''' <summary>
+        ''' Creation date of the original file from the filesystem
+        ''' </summary>
+        <DataMember>
+        Public Property FileCreatedAt As String
+
+        ''' <summary>
+        ''' Modification date of the original file from the filesystem
+        ''' </summary>
+        <DataMember>
+        Public Property FileChangedAt As String
+
+        ''' <summary>
+        ''' Date for which the file should be show as imported
+        ''' </summary>
+        <DataMember>
+        Public Property FileImportedAt As Date
+
+        ''' <summary>
+        ''' The byte array representing the file contents
+        ''' </summary>
+        <DataMember>
+        Public Property FileContents As Byte()
+
+        ''' <summary>
+        ''' The SHA256 Hash of the file contents
+        ''' </summary>
+        <DataMember>
+        Public Property FileChecksum As String
+
+        ''' <summary>
+        ''' Name/title of the ObjectStore to save the file to, ex. Work
+        ''' </summary>
+        <DataMember>
+        Public Property StoreName As String
+
+        ''' <summary>
+        ''' The business entity of the file, ex DEFAULT
+        ''' </summary>
+        <DataMember>
+        Public Property BusinessEntity As String
+
+        ''' <summary>
+        ''' The kind of object to be created, ex. DOC
+        ''' </summary>
+        <DataMember>
+        Public Property KindType As String
+
+        ''' <summary>
+        ''' The name of the user importing the file, ex. JenneJ
+        ''' </summary>
+        <DataMember>
+        Public Property Who As String
+    End Class
+
+End Namespace
+
--- a/Service.EDMIService/Filestorage/NewFile/NewFileResponse.vb
+++ b/Service.EDMIService/Filestorage/NewFile/NewFileResponse.vb
@@ -0,0 +1,22 @@
+Imports System.Runtime.Serialization
+
+Namespace FileStorage.NewFile
+    <Serializable>
+    <DataContract>
+    Public Class NewFileResponse
+        Inherits Messages.BaseResponse
+
+        <DataMember>
+        Public Property ObjectId As Long
+
+        Public Sub New(pObjectId As Long)
+            MyBase.New()
+            ObjectId = pObjectId
+        End Sub
+
+        Public Sub New(pException As Exception)
+            MyBase.New(pException)
+        End Sub
+    End Class
+
+End Namespace
--- a/Service.EDMIService/Helpers/AccessRightResult.vb
+++ b/Service.EDMIService/Helpers/AccessRightResult.vb
@@ -6,7 +6,7 @@ Namespace Messages
    <DataContract>
    <Serializable>
    Public Class AccessRightResult
-        Inherits BaseResult
+        Inherits BaseResponse

        <DataMember>
        Public Property Right As AccessRight = AccessRight.VIEW_ONLY
--- a/Service.EDMIService/Helpers/BaseResponse.vb
+++ b/Service.EDMIService/Helpers/BaseResponse.vb
@@ -4,7 +4,7 @@ Namespace Messages
    <Serializable>
    <DataContract>
    <KnownType(GetType(DBNull))>
-    Public MustInherit Class BaseResult
+    Public MustInherit Class BaseResponse
        <DataMember>
        Public Property OK As Boolean
        <DataMember>
--- a/Service.EDMIService/Helpers/DatabaseResult.vb
+++ b/Service.EDMIService/Helpers/DatabaseResult.vb
@@ -6,7 +6,7 @@ Namespace Messages
    <DataContract>
    <KnownType(GetType(DBNull))>
    Public Class TableResult
-        Inherits BaseResult
+        Inherits BaseResponse

        <DataMember>
        Public Property Table As DataTable
@@ -25,7 +25,7 @@ Namespace Messages
    <DataContract>
    <KnownType(GetType(DBNull))>
    Public Class ScalarResult
-        Inherits BaseResult
+        Inherits BaseResponse

        <DataMember>
        Public Property Scalar As Object
@@ -44,7 +44,7 @@ Namespace Messages
    <DataContract>
    <KnownType(GetType(DBNull))>
    Public Class NonQueryResult
-        Inherits BaseResult
+        Inherits BaseResponse

        Public Sub New()
            MyBase.New()
--- a/Service.EDMIService/Helpers/Messages.vb
+++ b/Service.EDMIService/Helpers/Messages.vb
@@ -26,64 +26,6 @@ Namespace Messages
        Public ObjectId As Long
    End Class
 #End Region
-#Region "FileImport 2021"
-    <MessageContract>
-    Public Class ImportFileIntoFileObjectRequest
-        <MessageBodyMember>
-        Public Contents() As Byte
-        <MessageBodyMember>
-        Public Who As String
-        <MessageBodyMember>
-        Public FilePath As String
-        <MessageBodyMember>
-        Public ObjectId As Long
-        <MessageBodyMember>
-        Public ObjectStoreType As String
-    End Class
-
-    <MessageContract>
-    Public Class ImportFileIntoFileObjectResponse
-        <MessageBodyMember>
-        Public Result As Boolean
-    End Class
-
-    <MessageContract>
-    Public Class NewObjectIdRequest
-        <MessageBodyMember>
-        Public KindType As String
-        <MessageBodyMember>
-        Public Who As String
-        <MessageBodyMember>
-        Public BusinessEntity As String
-    End Class
-
-    <MessageContract>
-    Public Class NewObjectIdResponse
-        <MessageBodyMember>
-        Public ObjectId As Long
-    End Class
-
-    <MessageContract>
-    Public Class NewFileObjectRequest
-        <MessageBodyMember>
-        Public ObjectId As Long
-        <MessageBodyMember>
-        Public StoreType As String
-        <MessageBodyMember>
-        Public DateImported As Date
-        <MessageBodyMember>
-        Public Extension As String
-        <MessageBodyMember>
-        Public KeepExtension As Boolean
-    End Class
-
-    <MessageContract>
-    Public Class NewFileObjectResponse
-        <MessageBodyMember>
-        Public FileObjectPath As String
-    End Class
-
-#End Region

 #Region "DocumentStream"
    <MessageContract>
--- a/Service.EDMIService/IEDMIService.vb
+++ b/Service.EDMIService/IEDMIService.vb
@@ -3,6 +3,7 @@ Imports System.ServiceModel
 Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Services.EDMIService.Exceptions
 Imports DigitalData.Services.EDMIService.Messages
+Imports DigitalData.Services.EDMIService.FileStorage

 <ServiceContract(Name:="IEDMIService", [Namespace]:="http://DigitalData.Services.EDMIService")>
 Interface IEDMIService
@@ -63,8 +64,11 @@ Interface IEDMIService

 #Region "Document (New)"
    <OperationContract>
-    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function ImportFile(Data As DocumentImportRequest) As DocumentImportResponse
+    Function NewFile(Data As NewFile.NewFileRequest) As NewFile.NewFileResponse
+
+    '-----------------------------------------------------
+    ' Everything below this line is subject to change!
+    '-----------------------------------------------------

    <OperationContract>
    <FaultContract(GetType(ObjectDoesNotExistFault))>
@@ -79,17 +83,7 @@ Interface IEDMIService
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ListFilesForUser() As DocumentListResponse

-    <OperationContract>
-    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function NewObjectId(Data As NewObjectIdRequest) As NewObjectIdResponse

-    <OperationContract>
-    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function NewFileObject(Data As NewFileObjectRequest) As NewFileObjectResponse
-
-    <OperationContract>
-    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function ImportFileIntoFileObject(Data As ImportFileIntoFileObjectRequest) As ImportFileIntoFileObjectResponse
 #End Region

 #Region "Helpers"
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.2.0.0")>
-<Assembly: AssemblyFileVersion("2.2.0.0")>
+<Assembly: AssemblyVersion("2.3.0.0")>
+<Assembly: AssemblyFileVersion("2.3.0.0")>
--- a/Service.EDMIService/Scheduler/DatatableJob.vb
+++ b/Service.EDMIService/Scheduler/DatatableJob.vb
@@ -44,8 +44,9 @@ Public Class DatatableJob
                    oLogger.Debug("Connection Id: {0}", oConnectionId)

                    Dim oConnectionString = oMSSQL.Get_ConnectionStringforID(oConnectionId)
+                    Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConnectionString)

-                    Dim oTable = oMSSQL.GetDatatableWithConnection(oSQL, oConnectionString, COMMAND_SQL_TIMEOUT)
+                    Dim oTable = oMSSQL.GetDatatableWithConnection(oSQL, oDecryptedConnectionString, COMMAND_SQL_TIMEOUT)
                    oTable.TableName = oDatatableName

                    Dim oView As DataView = Nothing
Author	SHA1	Message	Date
Jonathan Jenne	2bd54ccad0	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo	2021-11-25 15:56:40 +01:00
Jonathan Jenne	dfacd8fb43	EDMIService: Version 2.3.0.0	2021-11-25 15:55:59 +01:00
Jonathan Jenne	8846a5bf1c	EDMIService: Update for Annette GmbH	2021-11-25 15:55:45 +01:00
Jonathan Jenne	6df72b07ad	EDMI.API: Version 1.3.0.0	2021-11-25 15:55:00 +01:00
Jonathan Jenne	3149b8fa35	EDMI.API: Update for Annette GmbH	2021-11-25 15:54:48 +01:00
Jonathan Jenne	7a1c135b1f	ZUGFeRDTest: Clean up	2021-11-25 15:53:06 +01:00
Jonathan Jenne	ec13c76f15	Monitor: UI Changes	2021-11-25 15:52:43 +01:00