bring EDMIService up to date

update Service Reference in EDMI.API
Logging: Version 2.0.0.1
2020-04-07 10:55:09 +02:00 · 2020-04-07 10:54:35 +02:00 · 2020-04-07 10:44:43 +02:00 · 2020-04-07 10:44:33 +02:00
38 changed files with 620 additions and 609 deletions
--- a/GUIs.ClientSuite/ClassService.vb
+++ b/GUIs.ClientSuite/ClassService.vb
@@ -2,7 +2,7 @@
 Imports System.ServiceModel.Channels
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.EDMI.API
-Imports DigitalData.Modules.EDMI.API.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.GUIs.ClientSuite.Base
 Imports System.ServiceModel.Security
@@ -73,15 +73,15 @@ Public Class ClassService
                                           End Function)
    End Function
-    Public Function GetChannelFactory() As IChannelFactory(Of IIDBServiceChannel)
+    Public Function GetChannelFactory() As IChannelFactory(Of IEDMIServiceChannel)
        Return GetChannelFactory(My.SysConfig.ServiceConnection)
    End Function
-    Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IIDBServiceChannel)
+    Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IEDMIServiceChannel)
        Dim oBinding = GetBinding()
        Dim oEndpoint = New EndpointAddress(EndpointURL)
-        Dim oFactory As New ChannelFactory(Of IIDBServiceChannel)(oBinding, oEndpoint)
+        Dim oFactory As New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oEndpoint)
        Return oFactory
    End Function
--- a/GUIs.ClientSuite/Common/ClassCommonCommands.vb
+++ b/GUIs.ClientSuite/Common/ClassCommonCommands.vb
@@ -1,5 +1,5 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMI.API.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Public Class ClassCommonCommands
    Private _LogConfig As LogConfig
--- a/GUIs.ClientSuite/MyApplication.vb
+++ b/GUIs.ClientSuite/MyApplication.vb
@@ -2,7 +2,7 @@
 Imports System.Threading
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMI.API.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Namespace My
    ''' <summary>
@@ -26,8 +26,8 @@ Namespace My
        End Property
        Property LogConfig As LogConfig
-        Property ChannelFactory As ChannelFactory(Of IIDBServiceChannel)
+        Property ChannelFactory As ChannelFactory(Of IEDMIServiceChannel)
-        Property Channel As IIDBServiceChannel
+        Property Channel As IEDMIServiceChannel
        Property MainForm As frmMain
        Property Common As ClassCommon
    End Module
--- a/GUIs.ClientSuite/frmSplash.vb
+++ b/GUIs.ClientSuite/frmSplash.vb
@@ -2,12 +2,12 @@
 Imports System.ServiceModel
 Imports System.Threading
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMI.API.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Public NotInheritable Class frmSplash
    Private _Worker As New BackgroundWorker()
-    Private _ChannelFactory As ChannelFactory(Of IIDBServiceChannel)
+    Private _ChannelFactory As ChannelFactory(Of IEDMIServiceChannel)
-    Private _Channel As IIDBServiceChannel
+    Private _Channel As IEDMIServiceChannel
    Private _Logger As Logger
    Private _CurrentRetry As Integer = 0
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DocumentResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult, 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.DocumentResult2.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DocumentResult2" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2, 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.IndexResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="IndexResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult, 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.NonQueryResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="NonQueryResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult, 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.ScalarResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ScalarResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult, 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.TableResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="TableResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
@@ -0,0 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
 <wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://DigitalData.Services.EDMIService" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
  <wsdl:types>
    <xsd:schema targetNamespace="http://DigitalData.Services.EDMIService/Imports">
      <xsd:import namespace="http://DigitalData.Services.EDMIService" />
      <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
    </xsd:schema>
  </wsdl:types>
  <wsdl:message name="IEDMIService_Heartbeat_InputMessage">
    <wsdl:part name="parameters" element="tns:Heartbeat" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_Heartbeat_OutputMessage">
    <wsdl:part name="parameters" element="tns:HeartbeatResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_CreateDatabaseRequest_InputMessage">
    <wsdl:part name="parameters" element="tns:CreateDatabaseRequest" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_CreateDatabaseRequest_OutputMessage">
    <wsdl:part name="parameters" element="tns:CreateDatabaseRequestResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_CloseDatabaseRequest_InputMessage">
    <wsdl:part name="parameters" element="tns:CloseDatabaseRequest" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_CloseDatabaseRequest_OutputMessage">
    <wsdl:part name="parameters" element="tns:CloseDatabaseRequestResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatableResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalarResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_InputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_OutputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQueryResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_NewFile_InputMessage">
    <wsdl:part name="parameters" element="tns:NewFile" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_NewFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:NewFileResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_UpdateFile_InputMessage">
    <wsdl:part name="parameters" element="tns:UpdateFile" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_UpdateFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:UpdateFileResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFile_InputMessage">
    <wsdl:part name="parameters" element="tns:GetFile" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:GetFileResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_DeleteFile_InputMessage">
    <wsdl:part name="parameters" element="tns:DeleteFile" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_DeleteFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:DeleteFileResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetDocumentByDocumentId_InputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentId" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetDocumentByDocumentId_OutputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentIdResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetDocumentByContainerId_InputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByContainerId" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetDocumentByContainerId_OutputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByContainerIdResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ImportFile_InputMessage">
    <wsdl:part name="parameters" element="tns:ImportFile" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ImportFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:ImportFileResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_NewFileIndex_InputMessage">
    <wsdl:part name="parameters" element="tns:NewFileIndex" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_NewFileIndex_OutputMessage">
    <wsdl:part name="parameters" element="tns:NewFileIndexResponse" />
  </wsdl:message>
  <wsdl:portType name="IEDMIService">
    <wsdl:operation name="Heartbeat">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat" message="tns:IEDMIService_Heartbeat_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse" message="tns:IEDMIService_Heartbeat_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="CreateDatabaseRequest">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest" message="tns:IEDMIService_CreateDatabaseRequest_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestResponse" message="tns:IEDMIService_CreateDatabaseRequest_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="CloseDatabaseRequest">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest" message="tns:IEDMIService_CloseDatabaseRequest_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse" message="tns:IEDMIService_CloseDatabaseRequest_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable" message="tns:IEDMIService_ReturnDatatable_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse" message="tns:IEDMIService_ReturnDatatable_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar" message="tns:IEDMIService_ReturnScalar_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse" message="tns:IEDMIService_ReturnScalar_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery" message="tns:IEDMIService_ExecuteNonQuery_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse" message="tns:IEDMIService_ExecuteNonQuery_OutputMessage" />
    </wsdl:operation>
    <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="UpdateFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile" message="tns:IEDMIService_UpdateFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse" message="tns:IEDMIService_UpdateFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFile" message="tns:IEDMIService_GetFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse" message="tns:IEDMIService_GetFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="DeleteFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile" message="tns:IEDMIService_DeleteFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse" message="tns:IEDMIService_DeleteFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByDocumentId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId" message="tns:IEDMIService_GetDocumentByDocumentId_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdResponse" message="tns:IEDMIService_GetDocumentByDocumentId_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByContainerId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId" message="tns:IEDMIService_GetDocumentByContainerId_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResponse" message="tns:IEDMIService_GetDocumentByContainerId_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ImportFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" message="tns:IEDMIService_ImportFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse" message="tns:IEDMIService_ImportFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="NewFileIndex">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex" message="tns:IEDMIService_NewFileIndex_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse" message="tns:IEDMIService_NewFileIndex_OutputMessage" />
    </wsdl:operation>
  </wsdl:portType>
 </wsdl:definitions>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://DigitalData.Services.IDBService" elementFormDefault="qualified" targetNamespace="http://DigitalData.Services.IDBService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<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.IDBService" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" />
  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
  <xs:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
  <xs:element name="Heartbeat">
@@ -50,7 +50,7 @@
  <xs:element name="ReturnDatatableResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ReturnDatatableResult" nillable="true" type="q1:TableResult" />
+        <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ReturnDatatableResult" nillable="true" type="q1:TableResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -64,7 +64,7 @@
  <xs:element name="ReturnScalarResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ReturnScalarResult" nillable="true" type="q2:ScalarResult" />
+        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ReturnScalarResult" nillable="true" type="q2:ScalarResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -78,7 +78,7 @@
  <xs:element name="ExecuteNonQueryResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ExecuteNonQueryResult" nillable="true" type="q3:NonQueryResult" />
+        <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ExecuteNonQueryResult" nillable="true" type="q3:NonQueryResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -93,7 +93,7 @@
  <xs:element name="NewFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="NewFileResult" nillable="true" type="q4:DocumentResult" />
+        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileResult" nillable="true" type="q4:DocumentResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -108,7 +108,7 @@
  <xs:element name="UpdateFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="UpdateFileResult" nillable="true" type="q6:DocumentResult" />
+        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="UpdateFileResult" nillable="true" type="q6:DocumentResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -122,7 +122,7 @@
  <xs:element name="GetFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetFileResult" nillable="true" type="q8:DocumentResult" />
+        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetFileResult" nillable="true" type="q8:DocumentResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -140,23 +140,6 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
  <xs:element name="ImportFile">
    <xs:complexType>
      <xs:sequence>
        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/System.IO" minOccurs="0" name="FileInfo" nillable="true" type="q10:FileInfo" />
        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
        <xs:element minOccurs="0" name="ReadOnly" type="xs:boolean" />
        <xs:element minOccurs="0" name="RetentionTime" type="xs:int" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
  <xs:element name="ImportFileResponse">
    <xs:complexType>
      <xs:sequence>
        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ImportFileResult" nillable="true" type="q11:DocumentResult2" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
  <xs:element name="GetDocumentByDocumentId">
    <xs:complexType>
      <xs:sequence>
@@ -167,7 +150,7 @@
  <xs:element name="GetDocumentByDocumentIdResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q12:DocumentResult" />
+        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q10:DocumentResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -181,7 +164,24 @@
  <xs:element name="GetDocumentByContainerIdResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q13:DocumentResult" />
+        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q11:DocumentResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
  <xs:element name="ImportFile">
    <xs:complexType>
      <xs:sequence>
        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/System.IO" minOccurs="0" name="FileInfo" nillable="true" type="q12:FileInfo" />
        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
        <xs:element minOccurs="0" name="ReadOnly" type="xs:boolean" />
        <xs:element minOccurs="0" name="RetentionTime" type="xs:int" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
  <xs:element name="ImportFileResponse">
    <xs:complexType>
      <xs:sequence>
        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ImportFileResult" nillable="true" type="q13:DocumentResult2" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -198,7 +198,7 @@
  <xs:element name="NewFileIndexResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q15:IndexResult" />
+        <xs:element xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q15:IndexResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
  <xs:complexType name="TableResult">
    <xs:complexContent mixed="false">
--- a/Services/EDMIServiceReference/Reference.svcmap
+++ b/Services/EDMIServiceReference/Reference.svcmap
@@ -22,11 +22,11 @@
    <MetadataSource Address="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" Protocol="mex" SourceId="1" />
  </MetadataSources>
  <Metadata>
-    <MetadataFile FileName="DigitalData.Services.IDBService.wsdl" MetadataType="Wsdl" ID="c1a28c67-687c-489e-a78c-ad8254acdb1a" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.wsdl" MetadataType="Wsdl" ID="d76afc45-9188-477d-84c2-2d5fd8aa1559" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="63e6618a-fa84-4922-b771-92728dee5bd0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.IDBService.xsd" MetadataType="Schema" ID="bf8a7780-bd95-4c01-8532-928e7d65f528" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.xsd" MetadataType="Schema" ID="8b75b395-459e-4678-b979-5e50ebd6a173" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="1d0f216a-7f01-4129-a6bf-26e91c5e631d" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.IDBService1.xsd" MetadataType="Schema" ID="7e8d682f-5a2c-4dd4-a7e3-fb3e0b95a585" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService1.xsd" MetadataType="Schema" ID="9809989f-5319-4140-b18e-c3bcd5e8d139" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="e0db7004-6943-4cf8-b88f-4811ed14a341" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="6c7bdb47-eea4-4d03-bc52-9747c865bbf0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="DigitalData.Modules.Filesystem.xsd" MetadataType="Schema" ID="cfa7fe70-b4f1-4a12-a957-d0134a8e6279" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@@ -14,18 +14,18 @@ Option Explicit On
 Imports System
 Imports System.Runtime.Serialization
-Namespace IDBServiceReference
+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.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute(),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.ScalarResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult))>  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))>  _
    Partial Public Class BaseResult
        Inherits Object
        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
@@ -87,21 +87,21 @@ Namespace IDBServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute(),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.BaseResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2.DocumentObject)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2.DocumentObject)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentObject)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileInfo)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileSystemInfo))>  _
    Partial Public Class ScalarResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private ScalarField As Object
@@ -122,22 +122,22 @@ Namespace IDBServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class NonQueryResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
    End Class
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class DocumentResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        Private ContentsField() As Byte
-        Private DocumentField As IDBServiceReference.DocumentObject
+        Private DocumentField As EDMIServiceReference.DocumentObject
        Private HasContentsField As Boolean
@@ -155,7 +155,7 @@ Namespace IDBServiceReference
        End Property
        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As IDBServiceReference.DocumentObject
+        Public Property Document() As EDMIServiceReference.DocumentObject
            Get
                Return Me.DocumentField
            End Get
@@ -183,14 +183,14 @@ Namespace IDBServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class DocumentResult2
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        Private ContentsField() As Byte
-        Private DocumentField As IDBServiceReference.DocumentResult2.DocumentObject
+        Private DocumentField As EDMIServiceReference.DocumentResult2.DocumentObject
        Private HasContentsField As Boolean
@@ -208,7 +208,7 @@ Namespace IDBServiceReference
        End Property
        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As IDBServiceReference.DocumentResult2.DocumentObject
+        Public Property Document() As EDMIServiceReference.DocumentResult2.DocumentObject
            Get
                Return Me.DocumentField
            End Get
@@ -235,7 +235,7 @@ Namespace IDBServiceReference
        <System.Diagnostics.DebuggerStepThroughAttribute(),  _
         System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-         System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2.DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+         System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2.DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
         System.SerializableAttribute()>  _
        Partial Public Class DocumentObject
            Inherits Object
@@ -282,10 +282,10 @@ Namespace IDBServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class IndexResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        Private IndexIdField As Long
@@ -305,10 +305,10 @@ Namespace IDBServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class TableResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private TableField As System.Data.DataTable
@@ -404,108 +404,112 @@ Namespace IDBServiceReference
    End Class
    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.IDBService", ConfigurationName:="IDBServiceReference.IIDBService")>  _
+     System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.EDMIService", ConfigurationName:="EDMIServiceReference.IEDMIService")>  _
-    Public Interface IIDBService
+    Public Interface IEDMIService
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse")>  _
        Function Heartbeat() As Boolean
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse")>  _
        Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestRespons"& _ 
            "e")>  _
        Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestRespons"& _ 
            "e")>  _
        Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse"& _ 
            "")>  _
        Sub CloseDatabaseRequest()
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse"& _ 
            "")>  _
        Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse")>  _
-        Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult
+        Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse")>  _
-        Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult)
+        Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse")>  _
-        Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult
+        Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse")>  _
-        Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult)
+        Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse")>  _
-        Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult
+        Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse")>  _
-        Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult)
+        Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
-        Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult
+        Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
-        Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
+        Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
-        Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult
+        Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
-        Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
+        Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
-        Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult
+        Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
-        Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
+        Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse")>  _
-        Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean
+        Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse")>  _
-        Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
+        Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ImportFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
-        Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2
+            "nse")>  _
        Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ImportFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
-        Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2)
+            "nse")>  _
        Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons"& _ 
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
-            "e")>  _
+            "onse")>  _
-        Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult
+        Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons"& _ 
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
-            "e")>  _
+            "onse")>  _
-        Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
+        Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon"& _ 
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
-            "se")>  _
+        Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As EDMIServiceReference.DocumentResult2
        Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon"& _ 
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
-            "se")>  _
+        Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult2)
        Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse")>  _
-        Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult
+        Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse")>  _
-        Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult)
+        Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult)
    End Interface
    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
-    Public Interface IIDBServiceChannel
+    Public Interface IEDMIServiceChannel
-        Inherits IDBServiceReference.IIDBService, System.ServiceModel.IClientChannel
+        Inherits EDMIServiceReference.IEDMIService, System.ServiceModel.IClientChannel
    End Interface
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
-    Partial Public Class IDBServiceClient
+    Partial Public Class EDMIServiceClient
-        Inherits System.ServiceModel.ClientBase(Of IDBServiceReference.IIDBService)
+        Inherits System.ServiceModel.ClientBase(Of EDMIServiceReference.IEDMIService)
-        Implements IDBServiceReference.IIDBService
+        Implements EDMIServiceReference.IEDMIService
        Public Sub New()
            MyBase.New
@@ -527,115 +531,115 @@ Namespace IDBServiceReference
            MyBase.New(binding, remoteAddress)
        End Sub
-        Public Function Heartbeat() As Boolean Implements IDBServiceReference.IIDBService.Heartbeat
+        Public Function Heartbeat() As Boolean Implements EDMIServiceReference.IEDMIService.Heartbeat
            Return MyBase.Channel.Heartbeat
        End Function
-        Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.HeartbeatAsync
+        Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.HeartbeatAsync
            Return MyBase.Channel.HeartbeatAsync
        End Function
-        Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements IDBServiceReference.IIDBService.CreateDatabaseRequest
+        Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequest
            Return MyBase.Channel.CreateDatabaseRequest(Name, Debug)
        End Function
-        Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements IDBServiceReference.IIDBService.CreateDatabaseRequestAsync
+        Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequestAsync
            Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug)
        End Function
-        Public Sub CloseDatabaseRequest() Implements IDBServiceReference.IIDBService.CloseDatabaseRequest
+        Public Sub CloseDatabaseRequest() Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequest
            MyBase.Channel.CloseDatabaseRequest
        End Sub
-        Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements IDBServiceReference.IIDBService.CloseDatabaseRequestAsync
+        Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequestAsync
            Return MyBase.Channel.CloseDatabaseRequestAsync
        End Function
-        Public Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult Implements IDBServiceReference.IIDBService.ReturnDatatable
+        Public Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable
            Return MyBase.Channel.ReturnDatatable(SQL)
        End Function
-        Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult) Implements IDBServiceReference.IIDBService.ReturnDatatableAsync
+        Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatableAsync
            Return MyBase.Channel.ReturnDatatableAsync(SQL)
        End Function
-        Public Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult Implements IDBServiceReference.IIDBService.ReturnScalar
+        Public Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar
            Return MyBase.Channel.ReturnScalar(SQL)
        End Function
-        Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult) Implements IDBServiceReference.IIDBService.ReturnScalarAsync
+        Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalarAsync
            Return MyBase.Channel.ReturnScalarAsync(SQL)
        End Function
-        Public Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult Implements IDBServiceReference.IIDBService.ExecuteNonQuery
+        Public Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery
            Return MyBase.Channel.ExecuteNonQuery(SQL)
        End Function
-        Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult) Implements IDBServiceReference.IIDBService.ExecuteNonQueryAsync
+        Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQueryAsync
            Return MyBase.Channel.ExecuteNonQueryAsync(SQL)
        End Function
-        Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.NewFile
+        Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.NewFile
            Return MyBase.Channel.NewFile(FileName, Contents)
        End Function
-        Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.NewFileAsync
+        Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.NewFileAsync
            Return MyBase.Channel.NewFileAsync(FileName, Contents)
        End Function
-        Public Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.UpdateFile
+        Public Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.UpdateFile
            Return MyBase.Channel.UpdateFile(DocObject, Contents)
        End Function
-        Public Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.UpdateFileAsync
+        Public Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.UpdateFileAsync
            Return MyBase.Channel.UpdateFileAsync(DocObject, Contents)
        End Function
-        Public Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetFile
+        Public Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.GetFile
            Return MyBase.Channel.GetFile(DocObject)
        End Function
-        Public Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetFileAsync
+        Public Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetFileAsync
            Return MyBase.Channel.GetFileAsync(DocObject)
        End Function
-        Public Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean Implements IDBServiceReference.IIDBService.DeleteFile
+        Public Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean Implements EDMIServiceReference.IEDMIService.DeleteFile
            Return MyBase.Channel.DeleteFile(DocObject)
        End Function
-        Public Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.DeleteFileAsync
+        Public Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.DeleteFileAsync
            Return MyBase.Channel.DeleteFileAsync(DocObject)
        End Function
-        Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2 Implements IDBServiceReference.IIDBService.ImportFile
+        Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentId
            Return MyBase.Channel.ImportFile(FileInfo, Contents, [ReadOnly], RetentionTime)
        End Function
        Public Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2) Implements IDBServiceReference.IIDBService.ImportFileAsync
            Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime)
        End Function
        Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByDocumentId
            Return MyBase.Channel.GetDocumentByDocumentId(DocumentId)
        End Function
-        Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByDocumentIdAsync
+        Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentIdAsync
            Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId)
        End Function
-        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByContainerId
+        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerId
            Return MyBase.Channel.GetDocumentByContainerId(ContainerId)
        End Function
-        Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByContainerIdAsync
+        Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerIdAsync
            Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId)
        End Function
-        Public Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult Implements IDBServiceReference.IIDBService.NewFileIndex
+        Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As EDMIServiceReference.DocumentResult2 Implements EDMIServiceReference.IEDMIService.ImportFile
            Return MyBase.Channel.ImportFile(FileInfo, Contents, [ReadOnly], RetentionTime)
        End Function
        Public Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult2) Implements EDMIServiceReference.IEDMIService.ImportFileAsync
            Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime)
        End Function
        Public Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult Implements EDMIServiceReference.IEDMIService.NewFileIndex
            Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value)
        End Function
-        Public Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult) Implements IDBServiceReference.IIDBService.NewFileIndexAsync
+        Public Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) Implements EDMIServiceReference.IEDMIService.NewFileIndexAsync
            Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value)
        End Function
    End Class
--- a/Services/EDMIServiceReference/System.Data.xsd
+++ b/Services/EDMIServiceReference/System.Data.xsd
--- a/Services/EDMIServiceReference/System.IO.xsd
+++ b/Services/EDMIServiceReference/System.IO.xsd
--- a/Services/EDMIServiceReference/System.xsd
+++ b/Services/EDMIServiceReference/System.xsd
--- a/Services/EDMIServiceReference/configuration.svcinfo
+++ b/Services/EDMIServiceReference/configuration.svcinfo
@@ -0,0 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
  <behaviors />
  <bindings>
    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;tcpBinding&quot;&gt;&lt;security mode=&quot;None&quot;&gt;&lt;transport sslProtocols=&quot;None&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="tcpBinding" />
  </bindings>
  <endpoints>
    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;EDMIServiceReference.IEDMIService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;EDMIServiceReference.IEDMIService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="EDMIServiceReference.IEDMIService" name="tcpBinding" />
  </endpoints>
 </configurationSnapshot>
--- a/Services/EDMIServiceReference/configuration91.svcinfo
+++ b/Services/EDMIServiceReference/configuration91.svcinfo
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="gcZhEvE0dzQnwKubt3MrVgLmByo=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="iWIOdzq/CtaAM4SQMzp+vG4wC2Y=">
  <bindingConfigurations>
    <bindingConfiguration bindingType="netTcpBinding" name="tcpBinding">
      <properties>
@@ -81,8 +81,8 @@
        <property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.NetTcpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.NetTcpSecurityElement</serializedValue>
        </property>
-        <property path="/security/mode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.SecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <property path="/security/mode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.SecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>Transport</serializedValue>
+          <serializedValue>None</serializedValue>
        </property>
        <property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.TcpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.TcpTransportSecurityElement</serializedValue>
@@ -121,7 +121,7 @@
    </bindingConfiguration>
  </bindingConfigurations>
  <endpoints>
-    <endpoint name="tcpBinding" contract="IDBServiceReference.IIDBService" bindingType="netTcpBinding" address="net.tcp://localhost:9000/DigitalData/Services/Main" bindingConfiguration="tcpBinding">
+    <endpoint name="tcpBinding" contract="EDMIServiceReference.IEDMIService" bindingType="netTcpBinding" address="net.tcp://localhost:9000/DigitalData/Services/Main" bindingConfiguration="tcpBinding">
      <properties>
        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>net.tcp://localhost:9000/DigitalData/Services/Main</serializedValue>
@@ -136,7 +136,7 @@
          <serializedValue>tcpBinding</serializedValue>
        </property>
        <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>IDBServiceReference.IIDBService</serializedValue>
+          <serializedValue>EDMIServiceReference.IEDMIService</serializedValue>
        </property>
        <property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@@ -1,46 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://DigitalData.Services.IDBService" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="IDBService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://DigitalData.Services.EDMIService" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="EDMIService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
  <wsp:Policy wsu:Id="tcpBinding_policy">
    <wsp:ExactlyOne>
      <wsp:All>
        <msb:BinaryEncoding xmlns:msb="http://schemas.microsoft.com/ws/06/2004/mspolicy/netbinary1">
        </msb:BinaryEncoding>
        <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
          <wsp:Policy>
            <sp:TransportToken>
              <wsp:Policy>
                <msf:WindowsTransportSecurity xmlns:msf="http://schemas.microsoft.com/ws/2006/05/framing/policy">
                  <msf:ProtectionLevel>EncryptAndSign</msf:ProtectionLevel>
                </msf:WindowsTransportSecurity>
              </wsp:Policy>
            </sp:TransportToken>
            <sp:AlgorithmSuite>
              <wsp:Policy>
                <sp:Basic256>
                </sp:Basic256>
              </wsp:Policy>
            </sp:AlgorithmSuite>
            <sp:Layout>
              <wsp:Policy>
                <sp:Strict>
                </sp:Strict>
              </wsp:Policy>
            </sp:Layout>
          </wsp:Policy>
        </sp:TransportBinding>
        <wsaw:UsingAddressing>
        </wsaw:UsingAddressing>
      </wsp:All>
    </wsp:ExactlyOne>
  </wsp:Policy>
-  <wsdl:import namespace="http://DigitalData.Services.IDBService" location="" />
+  <wsdl:import namespace="http://DigitalData.Services.EDMIService" location="" />
  <wsdl:types />
-  <wsdl:binding name="tcpBinding" type="i0:IIDBService">
+  <wsdl:binding name="tcpBinding" type="i0:IEDMIService">
    <wsp:PolicyReference URI="#tcpBinding_policy">
    </wsp:PolicyReference>
    <soap12:binding transport="http://schemas.microsoft.com/soap/tcp" />
    <wsdl:operation name="Heartbeat">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/Heartbeat" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -49,7 +26,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CreateDatabaseRequest">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -58,7 +35,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CloseDatabaseRequest">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -67,7 +44,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -76,7 +53,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -85,7 +62,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -94,7 +71,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="NewFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/NewFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -103,7 +80,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="UpdateFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/UpdateFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -112,7 +89,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="GetFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -121,16 +98,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="DeleteFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/DeleteFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ImportFile">
      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ImportFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -139,7 +107,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByDocumentId">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -148,7 +116,16 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByContainerId">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ImportFile">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -157,7 +134,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="NewFileIndex">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -166,7 +143,7 @@
      </wsdl:output>
    </wsdl:operation>
  </wsdl:binding>
-  <wsdl:service name="IDBService">
+  <wsdl:service name="EDMIService">
    <wsdl:port name="tcpBinding" binding="tns:tcpBinding">
      <soap12:address location="net.tcp://localhost:9000/DigitalData/Services/Main" />
      <wsa10:EndpointReference>
--- a/Services/EDMIServiceReference/service.xsd
+++ b/Services/EDMIServiceReference/service.xsd
--- a/Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl
+++ b/Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl
@@ -1,156 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://DigitalData.Services.IDBService" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://DigitalData.Services.IDBService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
  <wsdl:types>
    <xsd:schema targetNamespace="http://DigitalData.Services.IDBService/Imports">
      <xsd:import namespace="http://DigitalData.Services.IDBService" />
      <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
    </xsd:schema>
  </wsdl:types>
  <wsdl:message name="IIDBService_Heartbeat_InputMessage">
    <wsdl:part name="parameters" element="tns:Heartbeat" />
  </wsdl:message>
  <wsdl:message name="IIDBService_Heartbeat_OutputMessage">
    <wsdl:part name="parameters" element="tns:HeartbeatResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_CreateDatabaseRequest_InputMessage">
    <wsdl:part name="parameters" element="tns:CreateDatabaseRequest" />
  </wsdl:message>
  <wsdl:message name="IIDBService_CreateDatabaseRequest_OutputMessage">
    <wsdl:part name="parameters" element="tns:CreateDatabaseRequestResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_CloseDatabaseRequest_InputMessage">
    <wsdl:part name="parameters" element="tns:CloseDatabaseRequest" />
  </wsdl:message>
  <wsdl:message name="IIDBService_CloseDatabaseRequest_OutputMessage">
    <wsdl:part name="parameters" element="tns:CloseDatabaseRequestResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ReturnDatatable_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ReturnDatatable_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatableResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ReturnScalar_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ReturnScalar_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalarResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ExecuteNonQuery_InputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ExecuteNonQuery_OutputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQueryResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_NewFile_InputMessage">
    <wsdl:part name="parameters" element="tns:NewFile" />
  </wsdl:message>
  <wsdl:message name="IIDBService_NewFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:NewFileResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_UpdateFile_InputMessage">
    <wsdl:part name="parameters" element="tns:UpdateFile" />
  </wsdl:message>
  <wsdl:message name="IIDBService_UpdateFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:UpdateFileResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_GetFile_InputMessage">
    <wsdl:part name="parameters" element="tns:GetFile" />
  </wsdl:message>
  <wsdl:message name="IIDBService_GetFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:GetFileResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_DeleteFile_InputMessage">
    <wsdl:part name="parameters" element="tns:DeleteFile" />
  </wsdl:message>
  <wsdl:message name="IIDBService_DeleteFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:DeleteFileResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ImportFile_InputMessage">
    <wsdl:part name="parameters" element="tns:ImportFile" />
  </wsdl:message>
  <wsdl:message name="IIDBService_ImportFile_OutputMessage">
    <wsdl:part name="parameters" element="tns:ImportFileResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_GetDocumentByDocumentId_InputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentId" />
  </wsdl:message>
  <wsdl:message name="IIDBService_GetDocumentByDocumentId_OutputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentIdResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_GetDocumentByContainerId_InputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByContainerId" />
  </wsdl:message>
  <wsdl:message name="IIDBService_GetDocumentByContainerId_OutputMessage">
    <wsdl:part name="parameters" element="tns:GetDocumentByContainerIdResponse" />
  </wsdl:message>
  <wsdl:message name="IIDBService_NewFileIndex_InputMessage">
    <wsdl:part name="parameters" element="tns:NewFileIndex" />
  </wsdl:message>
  <wsdl:message name="IIDBService_NewFileIndex_OutputMessage">
    <wsdl:part name="parameters" element="tns:NewFileIndexResponse" />
  </wsdl:message>
  <wsdl:portType name="IIDBService">
    <wsdl:operation name="Heartbeat">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/Heartbeat" message="tns:IIDBService_Heartbeat_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse" message="tns:IIDBService_Heartbeat_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="CreateDatabaseRequest">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest" message="tns:IIDBService_CreateDatabaseRequest_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse" message="tns:IIDBService_CreateDatabaseRequest_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="CloseDatabaseRequest">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest" message="tns:IIDBService_CloseDatabaseRequest_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse" message="tns:IIDBService_CloseDatabaseRequest_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable" message="tns:IIDBService_ReturnDatatable_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse" message="tns:IIDBService_ReturnDatatable_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar" message="tns:IIDBService_ReturnScalar_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse" message="tns:IIDBService_ReturnScalar_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery" message="tns:IIDBService_ExecuteNonQuery_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse" message="tns:IIDBService_ExecuteNonQuery_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="NewFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFile" message="tns:IIDBService_NewFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse" message="tns:IIDBService_NewFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="UpdateFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/UpdateFile" message="tns:IIDBService_UpdateFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse" message="tns:IIDBService_UpdateFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetFile" message="tns:IIDBService_GetFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse" message="tns:IIDBService_GetFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="DeleteFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/DeleteFile" message="tns:IIDBService_DeleteFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse" message="tns:IIDBService_DeleteFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="ImportFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ImportFile" message="tns:IIDBService_ImportFile_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse" message="tns:IIDBService_ImportFile_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByDocumentId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId" message="tns:IIDBService_GetDocumentByDocumentId_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdResponse" message="tns:IIDBService_GetDocumentByDocumentId_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByContainerId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId" message="tns:IIDBService_GetDocumentByContainerId_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdResponse" message="tns:IIDBService_GetDocumentByContainerId_OutputMessage" />
    </wsdl:operation>
    <wsdl:operation name="NewFileIndex">
      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex" message="tns:IIDBService_NewFileIndex_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse" message="tns:IIDBService_NewFileIndex_OutputMessage" />
    </wsdl:operation>
  </wsdl:portType>
 </wsdl:definitions>
--- a/Services/IDBServiceReference/configuration.svcinfo
+++ b/Services/IDBServiceReference/configuration.svcinfo
@@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
  <behaviors />
  <bindings>
    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;tcpBinding&quot;&gt;&lt;security&gt;&lt;transport sslProtocols=&quot;None&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="tcpBinding" />
  </bindings>
  <endpoints>
    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;IDBServiceReference.IIDBService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;IDBServiceReference.IIDBService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="IDBServiceReference.IIDBService" name="tcpBinding" />
  </endpoints>
 </configurationSnapshot>
--- a/Modules.EDMIAPI/Document.vb
+++ b/Modules.EDMIAPI/Document.vb
@@ -1,13 +1,13 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMI.API.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports System.ServiceModel
 Imports System.IO
 Public Class Document
    Private _logger As Logger
    Private _logConfig As LogConfig
-    Private _channelFactory As ChannelFactory(Of IIDBServiceChannel)
+    Private _channelFactory As ChannelFactory(Of IEDMIServiceChannel)
-    Private _channel As IIDBServiceChannel
+    Private _channel As IEDMIServiceChannel
    ''' <summary>
    ''' Creates a new EDMIAPI object
@@ -21,7 +21,7 @@ Public Class Document
        Try
            Dim oBinding = Channel.GetBinding()
            Dim oAddress = New EndpointAddress(ServiceAdress)
-            Dim oFactory = New ChannelFactory(Of IIDBServiceChannel)(oBinding, oAddress)
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
            _channelFactory = oFactory
        Catch ex As Exception
@@ -167,7 +167,7 @@ Public Class Document
    ''' Creates a channel and adds a Faulted-Handler
    ''' </summary>
    ''' <returns>A channel object</returns>
-    Private Function GetChannel() As IIDBServiceChannel
+    Private Function GetChannel() As IEDMIServiceChannel
        Try
            _logger.Debug("Creating channel..")
            Dim oChannel = _channelFactory.CreateChannel()
--- a/Modules.EDMIAPI/EDMI.API.vbproj
+++ b/Modules.EDMIAPI/EDMI.API.vbproj
@@ -73,7 +73,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Channel.vb" />
-    <Compile Include="Connected Services\IDBServiceReference\Reference.vb">
+    <Compile Include="Connected Services\EDMIServiceReference\Reference.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Reference.svcmap</DependentUpon>
@@ -106,45 +106,45 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.Filesystem.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.Filesystem.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Services.IDBService.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.wsdl" />
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Services.IDBService.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Services.IDBService1.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\service.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\service.wsdl" />
-    <None Include="Connected Services\IDBServiceReference\service.xsd">
+    <None Include="Connected Services\EDMIServiceReference\service.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.Data.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.Data.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.IO.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.IO.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.xsd">
      <SubType>Designer</SubType>
    </None>
    <None Include="My Project\Application.myapp">
@@ -168,16 +168,16 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <WCFMetadataStorage Include="Connected Services\IDBServiceReference\" />
+    <WCFMetadataStorage Include="Connected Services\EDMIServiceReference\" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Connected Services\IDBServiceReference\configuration91.svcinfo" />
+    <None Include="Connected Services\EDMIServiceReference\configuration91.svcinfo" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Connected Services\IDBServiceReference\configuration.svcinfo" />
+    <None Include="Connected Services\EDMIServiceReference\configuration.svcinfo" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Connected Services\IDBServiceReference\Reference.svcmap">
+    <None Include="Connected Services\EDMIServiceReference\Reference.svcmap">
      <Generator>WCF Proxy Generator</Generator>
      <LastGenOutput>Reference.vb</LastGenOutput>
    </None>
--- a/Modules.EDMIAPI/app.config
+++ b/Modules.EDMIAPI/app.config
@@ -26,7 +26,7 @@
        <bindings>
            <netTcpBinding>
                <binding name="tcpBinding">
-                    <security>
+                    <security mode="None">
                        <transport sslProtocols="None" />
                    </security>
                </binding>
@@ -35,7 +35,7 @@
        <client>
            <endpoint address="net.tcp://localhost:9000/DigitalData/Services/Main"
                binding="netTcpBinding" bindingConfiguration="tcpBinding"
-                contract="IDBServiceReference.IIDBService" name="tcpBinding">
+                contract="EDMIServiceReference.IEDMIService" name="tcpBinding">
                <identity>
                    <dns value="localhost" />
                </identity>
--- a/Modules.Logging/LogConfig.vb
+++ b/Modules.Logging/LogConfig.vb
@@ -219,8 +219,14 @@ Public Class LogConfig
            logFileSuffix = $"-{Suffix}"
        End If
        Dim oProductName As String = "Main"
        If ProductName IsNot Nothing Then
            oProductName = ProductName
        End If
        ' Create config object and initalize it
-        config = GetConfig(ProductName, logFileSuffix)
+        config = GetConfig(oProductName, logFileSuffix)
        ' Save config
        LogFactory = New LogFactory With {
--- 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.0.0.0")>
+<Assembly: AssemblyVersion("2.0.0.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Service.EDMIService/App.config
+++ b/Service.EDMIService/App.config
@@ -2,30 +2,28 @@
 <configuration>
  <system.diagnostics>
    <sources>
-      <source name="System.ServiceModel" switchValue="Information,ActivityTracing"
+      <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
        propagateActivity="true">
        <listeners>
-          <add name="xml" />
+          <add name="xml"/>
        </listeners>
      </source>
      <source name="System.ServiceModel.MessageLogging">
        <listeners>
-          <add name="xml" />
+          <add name="xml"/>
        </listeners>
      </source>
    </sources>
    <sharedListeners>
-      <add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener"
+      <add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml"/>
        name="xml" />
    </sharedListeners>
-    <trace autoflush="true" />
+    <trace autoflush="true"/>
  </system.diagnostics>
  <appSettings>
    <!-- FIREBIRD SETTINGS -->
-    <add key="FIREBIRD_DATASOURCE" value="" />
+    <add key="FIREBIRD_DATASOURCE" value=""/>
-    <add key="FIREBIRD_DATABASE_NAME" value="" />
+    <add key="FIREBIRD_DATABASE_NAME" value=""/>
-    <add key="FIREBIRD_DATABASE_USER" value="" />
+    <add key="FIREBIRD_DATABASE_USER" value=""/>
-    <add key="FIREBIRD_DATABASE_PASS" value="" />
+    <add key="FIREBIRD_DATABASE_PASS" value=""/>
    <!-- END FIREBIRD SETTINGS -->
    <!-- DATASTORE SETTINGS -->
@@ -33,42 +31,36 @@
    <!-- END DATASTORE SETTINGS -->
    <!-- CONTAINER SETTINGS -->
-    <add key="CONTAINER_PATH" value="" />
+    <add key="CONTAINER_PATH" value=""/>
-    <add key="CONTAINER_PASSWORD" value="" />
+    <add key="CONTAINER_PASSWORD" value=""/>
    <!-- END CONTAINER SETTINGS -->
  </appSettings>
  <system.serviceModel>
    <diagnostics wmiProviderEnabled="true">
-      <messageLogging logEntireMessage="true" logMalformedMessages="true"
+      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
-        logMessagesAtTransportLevel="true" />
+      <endToEndTracing propagateActivity="true" activityTracing="true" messageFlowTracing="true"/>
      <endToEndTracing propagateActivity="true" activityTracing="true"
        messageFlowTracing="true" />
    </diagnostics>
    <bindings>
      <netTcpBinding>
-        <binding name="tcpBinding" sendTimeout="00:10:00" transferMode="Buffered"
+        <binding name="tcpBinding" sendTimeout="00:10:00" transferMode="Buffered" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
-          maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
          <readerQuotas maxDepth="32" maxStringContentLength="2147483647"
            maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
          <security mode="None">
-            <transport clientCredentialType="None" />
+            <transport clientCredentialType="None"/>
          </security>
        </binding>
      </netTcpBinding>
    </bindings>
    <services>
      <service behaviorConfiguration="DefaultServiceBehavior" name="DigitalData.Services.EDMIService.EDMIService">
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding"
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding" name="tcpBinding" contract="DigitalData.Services.EDMIService.IEDMIService">
          name="tcpBinding" contract="DigitalData.Services.EDMIService.IEDMIService">
          <identity>
-            <dns value="localhost" />
+            <dns value="localhost"/>
          </identity>
        </endpoint>
-        <endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding"
+        <endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding" contract="IMetadataExchange"/>
          contract="IMetadataExchange" />
        <host>
          <baseAddresses>
-            <add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main" />
+            <add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main"/>
          </baseAddresses>
        </host>
      </service>
@@ -76,15 +68,18 @@
    <behaviors>
      <serviceBehaviors>
        <behavior name="DefaultServiceBehavior">
-          <serviceMetadata httpGetEnabled="false" />
+          <serviceMetadata httpGetEnabled="false"/>
-          <serviceDebug includeExceptionDetailInFaults="true" />
+          <serviceDebug includeExceptionDetailInFaults="true"/>
        </behavior>
      </serviceBehaviors>
    </behaviors>
  </system.serviceModel>
-<system.data>
+  <runtime>
-		<DbProviderFactories>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<remove invariant="FirebirdSql.Data.FirebirdClient" />
+      <dependentAssembly>
-			<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-		</DbProviderFactories>
+        <bindingRedirect oldVersion="0.0.0.0-6.5.0.0" newVersion="6.5.0.0"/>
-	</system.data></configuration>
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -132,167 +132,167 @@ Public Class EDMIService
 #End Region
 #Region "Document (with FileContainer)"
-    'Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMIService.NewFile
+    Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMIService.NewFile
-    '    Try
+        Try
-    '        Dim oContainer As FileContainer
+            Dim oContainer As FileContainer
-    '        Dim oContainerId As String
+            Dim oContainerId As String
-    '        If Not TestUserAuth() Then
+            If Not TestUserAuth() Then
-    '            Throw New Exception($"User {_username} not authorized.")
+                Throw New Exception($"User {_username} not authorized.")
-    '        End If
+            End If
-    '        oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword)
+            oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword)
-    '        oContainerId = oContainer.ContainerId
+            oContainerId = oContainer.ContainerId
-    '        _logger.Debug("Container created with id {0}", oContainerId)
+            _logger.Debug("Container created with id {0}", oContainerId)
-    '        Dim oExtension As String = Path.GetExtension(FileName).Substring(1)
+            Dim oExtension As String = Path.GetExtension(FileName).Substring(1)
-    '        _logger.Debug("File extension of file {0} is {1}", FileName, oExtension)
+            _logger.Debug("File extension of file {0} is {1}", FileName, oExtension)
-    '        Dim oSQL = $"SELECT FNICM_NEW_DOC('010', '{oContainerId}', '{GetContainerName(oContainerId)}', '{FileName}', '{oExtension}', '{_username}') FROM RDB$DATABASE;"
+            Dim oSQL = $"SELECT FNICM_NEW_DOC('010', '{oContainerId}', '{GetContainerName(oContainerId)}', '{FileName}', '{oExtension}', '{_username}') FROM RDB$DATABASE;"
-    '        Dim oDocId As Int64 = Database.GetScalarValue(oSQL)
+            Dim oDocId As Int64 = Database.GetScalarValue(oSQL)
-    '        If oDocId = -1 Then
+            If oDocId = -1 Then
-    '            _logger.Warn("Database returned -1 while creating Document Entry. File was not saved!")
+                _logger.Warn("Database returned -1 while creating Document Entry. File was not saved!")
-    '            Return Nothing
+                Return Nothing
-    '        End If
+            End If
-    '        _logger.Debug("Database Entry created with DocId {0}", oDocId)
+            _logger.Debug("Database Entry created with DocId {0}", oDocId)
-    '        oContainer.SetFile(Contents, FileName)
+            oContainer.SetFile(Contents, FileName)
-    '        oContainer.SaveAs(GetContainerPath(oContainerId))
+            oContainer.SaveAs(GetContainerPath(oContainerId))
-    '        _logger.Debug("File saved in Container!", FileName)
+            _logger.Debug("File saved in Container!", FileName)
-    '        Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName)
+            Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName)
-    '        Return New DocumentResult(oDocument)
+            Return New DocumentResult(oDocument)
-    '    Catch ex As Exception
+        Catch ex As Exception
-    '        _logger.Error(ex)
+            _logger.Error(ex)
-    '        Return New DocumentResult(ex.Message)
+            Return New DocumentResult(ex.Message)
-    '    End Try
+        End Try
-    'End Function
+    End Function
-    'Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
+    Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
-    '    Try
+        Try
-    '        TestFileExists(DocObject.ContainerId)
+            TestFileExists(DocObject.ContainerId)
-    '        ' TODO: update db
+            ' TODO: update db
-    '        Dim oFilePath = GetContainerPath(DocObject.ContainerId)
+            Dim oFilePath = GetContainerPath(DocObject.ContainerId)
-    '        Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
+            Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
-    '        oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
+            oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
-    '        oFileContainer.Save()
+            oFileContainer.Save()
-    '        Return New DocumentResult(DocObject)
+            Return New DocumentResult(DocObject)
-    '    Catch ex As Exception
+        Catch ex As Exception
-    '        _logger.Error(ex)
+            _logger.Error(ex)
-    '        Return Nothing
+            Return Nothing
-    '    End Try
+        End Try
-    'End Function
+    End Function
-    'Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMIService.GetFile
+    Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMIService.GetFile
-    '    Try
+        Try
-    '        TestFileExists(DocObject.ContainerId)
+            TestFileExists(DocObject.ContainerId)
-    '        Dim oContainerPath = GetContainerPath(DocObject.ContainerId)
+            Dim oContainerPath = GetContainerPath(DocObject.ContainerId)
-    '        Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
-    '        Dim oContents As Byte() = oContainer.GetFile().Contents
+            Dim oContents As Byte() = oContainer.GetFile().Contents
-    '        Return New DocumentResult(DocObject, oContents)
+            Return New DocumentResult(DocObject, oContents)
-    '    Catch ex As Exception
+        Catch ex As Exception
-    '        _logger.Error(ex)
+            _logger.Error(ex)
-    '        Return New DocumentResult(ex.Message)
+            Return New DocumentResult(ex.Message)
-    '    End Try
+        End Try
-    'End Function
+    End Function
-    'Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
+    Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
-    '    Try
+        Try
-    '        TestFileExists(DocObject.ContainerId)
+            TestFileExists(DocObject.ContainerId)
-    '        Dim oFilePath = GetContainerPath(DocObject.ContainerId)
+            Dim oFilePath = GetContainerPath(DocObject.ContainerId)
-    '        IO.File.Delete(oFilePath)
+            IO.File.Delete(oFilePath)
-    '        'TODO: Delete doc from db
+            'TODO: Delete doc from db
-    '        Return True
+            Return True
-    '    Catch ex As Exception
+        Catch ex As Exception
-    '        _logger.Error(ex)
+            _logger.Error(ex)
-    '        Return False
+            Return False
-    '    End Try
+        End Try
-    'End Function
+    End Function
-    'Private Function GetContainerPath(ContainerId As String) As String
+    Private Function GetContainerPath(ContainerId As String) As String
-    '    Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId))
+        Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId))
-    'End Function
+    End Function
-    'Private Function GetContainerName(ContainerId As String) As String
+    Private Function GetContainerName(ContainerId As String) As String
-    '    Return ContainerId & ".enc"
+        Return ContainerId & ".enc"
-    'End Function
+    End Function
-    'Private Sub TestFileExists(ContainerId)
+    Private Sub TestFileExists(ContainerId)
-    '    Dim oContainerPath = GetContainerPath(ContainerId)
+        Dim oContainerPath = GetContainerPath(ContainerId)
-    '    If Not IO.File.Exists(oContainerPath) Then
+        If Not IO.File.Exists(oContainerPath) Then
-    '        Throw New FileNotFoundException("Container existiert nicht", oContainerPath)
+            Throw New FileNotFoundException("Container existiert nicht", oContainerPath)
-    '    End If
+        End If
-    'End Sub
+    End Sub
-    'Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMIService.GetDocumentByDocumentId
+    Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMIService.GetDocumentByDocumentId
-    '    Try
+        Try
-    '        Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}"
+            Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}"
-    '        Dim oTable = Database.GetDatatable(oSQL)
+            Dim oTable = Database.GetDatatable(oSQL)
-    '        If oTable.Rows.Count = 0 Then
+            If oTable.Rows.Count = 0 Then
-    '            Return New DocumentResult("Document not found")
+                Return New DocumentResult("Document not found")
-    '        End If
+            End If
-    '        Dim oRow As DataRow = oTable.Rows.Item(0)
+            Dim oRow As DataRow = oTable.Rows.Item(0)
-    '        Dim oDocument As New DocumentObject(
+            Dim oDocument As New DocumentObject(
-    '            oRow.Item("CONTAINER_ID"),
+                oRow.Item("CONTAINER_ID"),
-    '            oRow.Item("GUID"),
+                oRow.Item("GUID"),
-    '            oRow.Item("ORIGINAL_FILENAME")
+                oRow.Item("ORIGINAL_FILENAME")
-    '        )
+            )
-    '        TestFileExists(oDocument.ContainerId)
+            TestFileExists(oDocument.ContainerId)
-    '        Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
+            Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
-    '        Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
-    '        Dim oContents As Byte() = oContainer.GetFile().Contents
+            Dim oContents As Byte() = oContainer.GetFile().Contents
-    '        Return New DocumentResult(oDocument, oContents)
+            Return New DocumentResult(oDocument, oContents)
-    '    Catch ex As Exception
+        Catch ex As Exception
-    '        Return New DocumentResult(ex.Message)
+            Return New DocumentResult(ex.Message)
-    '    End Try
+        End Try
-    'End Function
+    End Function
-    'Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMIService.GetDocumentByContainerId
+    Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMIService.GetDocumentByContainerId
-    '    Try
+        Try
-    '        Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'"
+            Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'"
-    '        Dim oTable = Database.GetDatatable(oSQL)
+            Dim oTable = Database.GetDatatable(oSQL)
-    '        If oTable.Rows.Count = 0 Then
+            If oTable.Rows.Count = 0 Then
-    '            Return New DocumentResult("Document not found")
+                Return New DocumentResult("Document not found")
-    '        End If
+            End If
-    '        Dim oRow As DataRow = oTable.Rows.Item(0)
+            Dim oRow As DataRow = oTable.Rows.Item(0)
-    '        Dim oDocument As New DocumentObject(
+            Dim oDocument As New DocumentObject(
-    '            oRow.Item("CONTAINER_ID"),
+                oRow.Item("CONTAINER_ID"),
-    '            oRow.Item("GUID"),
+                oRow.Item("GUID"),
-    '            oRow.Item("ORIGINAL_FILENAME")
+                oRow.Item("ORIGINAL_FILENAME")
-    '        )
+            )
-    '        TestFileExists(oDocument.ContainerId)
+            TestFileExists(oDocument.ContainerId)
-    '        Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
+            Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
-    '        Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
-    '        Dim oContents As Byte() = oContainer.GetFile().Contents
+            Dim oContents As Byte() = oContainer.GetFile().Contents
-    '        Return New DocumentResult(oDocument, oContents)
+            Return New DocumentResult(oDocument, oContents)
-    '    Catch ex As Exception
+        Catch ex As Exception
-    '        Return New DocumentResult(ex.Message)
+            Return New DocumentResult(ex.Message)
-    '    End Try
+        End Try
-    'End Function
+    End Function
 #End Region
 #Region "Document"
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -11,8 +11,24 @@
    <AssemblyName>EDMIService</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
    <UpdateEnabled>false</UpdateEnabled>
    <UpdateMode>Foreground</UpdateMode>
    <UpdateInterval>7</UpdateInterval>
    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
    <UpdatePeriodically>false</UpdatePeriodically>
    <UpdateRequired>false</UpdateRequired>
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,12 +63,12 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
@@ -64,6 +80,7 @@
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.ServiceProcess" />
    <Reference Include="System.Transactions" />
    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
@@ -162,5 +179,17 @@
      <Name>Logging</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
      <Visible>False</Visible>
      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
      <Install>true</Install>
    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
      <Visible>False</Visible>
      <ProductName>.NET Framework 3.5 SP1</ProductName>
      <Install>false</Install>
    </BootstrapperPackage>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Service.EDMIService/IEDMIService.vb
+++ b/Service.EDMIService/IEDMIService.vb
@@ -28,23 +28,23 @@ Interface IEDMIService
 #End Region
 #Region "Document (with FileContainer)"
-    '<OperationContract>
+    <OperationContract>
-    'Function NewFile(FileName As String, Contents As Byte()) As DocumentResult
+    Function NewFile(FileName As String, Contents As Byte()) As DocumentResult
-    '<OperationContract>
+    <OperationContract>
-    'Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult
+    Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult
-    '<OperationContract>
+    <OperationContract>
-    'Function GetFile(DocObject As DocumentObject) As DocumentResult
+    Function GetFile(DocObject As DocumentObject) As DocumentResult
-    '<OperationContract>
+    <OperationContract>
-    'Function DeleteFile(DocObject As DocumentObject) As Boolean
+    Function DeleteFile(DocObject As DocumentObject) As Boolean
-    '<OperationContract>
+    <OperationContract>
-    'Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult
+    Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult
-    '<OperationContract>
+    <OperationContract>
-    'Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
+    Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
 #End Region
 #Region "Document (New)"
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
            Get
                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.IDBService.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.EDMIService.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
--- 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", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -62,8 +62,8 @@ Namespace My
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
    Friend Module MySettingsProperty
-
+        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
        Friend ReadOnly Property Settings() As Global.DigitalData.Services.EDMIService.My.MySettings
            Get
                Return Global.DigitalData.Services.EDMIService.My.MySettings.Default
--- a/Service.EDMIService/WindowsService.vb
+++ b/Service.EDMIService/WindowsService.vb
@@ -64,7 +64,7 @@ Public Class WindowsService
            _logger.Debug("Starting WCF ServiceHost...")
-            _serviceHost = New ServiceHost(GetType(IEDMIService))
+            _serviceHost = New ServiceHost(GetType(EDMIService))
            _serviceHost.Open()
            _logger.Debug("WCF ServiceHost started.")
--- a/Service.EDMIService/packages.config
+++ b/Service.EDMIService/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.5.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>
Author	SHA1	Message	Date
Jonathan Jenne	d1817fedb5	bring EDMIService up to date	2020-04-07 10:55:09 +02:00
Jonathan Jenne	37a3675d84	update Service Reference in EDMI.API	2020-04-07 10:54:35 +02:00
Jonathan Jenne	fa476e3101	Logging: Version 2.0.0.1	2020-04-07 10:44:43 +02:00
Jonathan Jenne	a394c5e557	set default product name if not supplied	2020-04-07 10:44:33 +02:00