EDMI.API: Update for Annette GmbH

Modules.EDMIAPI/Client.vb

@@ -17,8 +17,61 @@ Public Class Client
 
     Private _dummy_table_attributes As DataTable
     Private _channel As IEDMIServiceChannel
+    Private _FileEx As FileSystem.File
 
 
+    ''' <summary>
+    ''' Creates a new EDMI Client object
+    ''' </summary>
+    ''' <param name="LogConfig">LogConfig object</param>
+    ''' <param name="ServiceAdress">The IP address/hostname and port, separated by semicolon or colon, ex localhost:9000</param>
+    Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
+        _logger = LogConfig.GetLogger()
+        _FileEx = New Filesystem.File(LogConfig)
+
+        Dim oServiceAddress As String = ServiceAdress
+        Dim oAddressArray() As String
+
+        If oServiceAddress.Contains(";") Then
+            oAddressArray = oServiceAddress.Split(";")
+        Else
+            oAddressArray = oServiceAddress.Split(":")
+        End If
+
+        Try
+            _IPAddressServer = oAddressArray(0)
+            Dim oBinding = Channel.GetBinding()
+            Dim oAddress = New EndpointAddress($"net.tcp://{oAddressArray(0)}:{oAddressArray(1)}/DigitalData/Services/Main")
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
+
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    ''' <summary>
+    ''' Creates a new EDMI Client object
+    ''' </summary>
+    ''' <param name="LogConfig">LogConfig object</param>
+    ''' <param name="IPAddress">The IP address to connect to</param>
+    ''' <param name="PortNumber">The Port number to use for the connection</param>
+    Public Sub New(LogConfig As LogConfig, IPAddress As String, PortNumber As Integer)
+        _logger = LogConfig.GetLogger()
+        _FileEx = New Filesystem.File(LogConfig)
+
+        Try
+            _IPAddressServer = IPAddress
+            Dim oBinding = Channel.GetBinding()
+            Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
+
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
     ''' <summary>
     ''' Parse a IPAddress:Port String into its parts
     ''' </summary>
@@ -40,55 +93,6 @@ Public Class Client
         Return New Tuple(Of String, Integer)(oAppServerAddress, oAppServerPort)
     End Function
 
-    ''' <summary>
-    ''' Creates a new EDMI Client object
-    ''' </summary>
-    ''' <param name="LogConfig">LogConfig object</param>
-    ''' <param name="ServiceAdress">The IP address/hostname and port, separated by semicolon or colon, ex localhost:9000</param>
-    Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
-        _logger = LogConfig.GetLogger()
-
-        Dim oServiceAddress As String = ServiceAdress
-        Dim oAddressArray() As String
-
-        If oServiceAddress.Contains(";") Then
-            oAddressArray = oServiceAddress.Split(";")
-        Else
-            oAddressArray = oServiceAddress.Split(":")
-        End If
-
-        Try
-            Dim oBinding = Channel.GetBinding()
-            Dim oAddress = New EndpointAddress($"net.tcp://{oAddressArray(0)}:{oAddressArray(1)}/DigitalData/Services/Main")
-            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
-
-            _channelFactory = oFactory
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
-    ''' <summary>
-    ''' Creates a new EDMI Client object
-    ''' </summary>
-    ''' <param name="LogConfig">LogConfig object</param>
-    ''' <param name="IPAddress">The IP address to connect to</param>
-    ''' <param name="PortNumber">The Port number to use for the connection</param>
-    Public Sub New(LogConfig As LogConfig, IPAddress As String, PortNumber As Integer)
-        _logger = LogConfig.GetLogger()
-
-        Try
-            _IPAddressServer = IPAddress
-            Dim oBinding = Channel.GetBinding()
-            Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
-            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
-
-            _channelFactory = oFactory
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
     ''' <summary>
     ''' Connect to the service
     ''' </summary>
@@ -109,26 +113,16 @@ Public Class Client
         End Try
     End Function
 
-    ''' <summary>
-    ''' TODO: Creates a new object
-    ''' </summary>
-    ''' <returns></returns>
-    Public Async Function NewObjectAsync() As Task
-        Throw New NotImplementedException()
-    End Function
-
-
-
     ''' <summary>
     ''' Imports a file from a filepath, creating a IDB ObjectId and Filesystem Object
     ''' </summary>
-    ''' <param name="pObjectStoreType">Type of ObjectStore. Can be WORK or ARCHIVE.</param>
+    ''' <param name="pObjectStoreName">Type of ObjectStore. Can be WORK or ARCHIVE.</param>
     ''' <param name="pBusinessEntity">Business entity that the new file object should belong to.</param>
     ''' <param name="pImportOptions">Other file import options</param>
     ''' <exception cref="FileNotFoundException">When local filepath was not found</exception>
     ''' <exception cref="ApplicationException">When there was a error in the Service</exception>
     ''' <returns>The ObjectId of the newly generated filesystem object</returns>
-    Public Async Function NewFileAsync(pFilePath As String, pObjectStoreType As String, pBusinessEntity As String, Optional pImportOptions As NewFileOptions = Nothing) As Task(Of Long)
+    Public Async Function NewFileAsync(pFilePath As String, pObjectStoreName As String, pObjectKind As String, pBusinessEntity As String, Optional pImportOptions As NewFileOptions = Nothing) As Task(Of Long)
         Try
             ' Set default options
             If pImportOptions Is Nothing Then
@@ -137,35 +131,16 @@ Public Class Client
 
             ' Check if file exists
             If File.Exists(pFilePath) = False Then
-                Throw New FileNotFoundException("ImportFileAsync: Path does not exist")
+                Throw New FileNotFoundException("Path does not exist")
             End If
 
             Dim oFileInfo As New FileInfo(pFilePath)
             Dim oExtension As String = oFileInfo.Extension
 
-            ' Creating new ObjectId
+            Dim oFileName As String = oFileInfo.Name
-            Dim oObjectIdResponse = Await _channel.NewObjectIdAsync(New NewObjectIdRequest With {
+            Dim oFileCreatedAt As Date = oFileInfo?.CreationTime
-                .BusinessEntity = pBusinessEntity,
+            Dim oFileModifiedAt As Date = oFileInfo?.LastWriteTime
-                .KindType = KIND_TYPE_DOC,
+            Dim oFileHash As String = _FileEx.GetChecksum(oFileInfo.FullName)
-                .Who = pImportOptions.Username
-            })
-
-            If oObjectIdResponse.ObjectId = Nothing OrElse oObjectIdResponse.ObjectId = 0 Then
-                Throw New ApplicationException("ImportFileAsync: Could not get ObjectId")
-            End If
-
-            ' Create new FileObject for ObjectId
-            Dim oFilePathResponse = Await _channel.NewFileObjectAsync(New NewFileObjectRequest With {
-                .DateImported = pImportOptions.DateImported,
-                .Extension = oExtension,
-                .KeepExtension = pImportOptions.KeepExtension,
-                .ObjectId = oObjectIdResponse.ObjectId,
-                .StoreType = pObjectStoreType
-            })
-
-            If oFilePathResponse.FileObjectPath = Nothing OrElse oFilePathResponse.FileObjectPath = "" Then
-                Throw New ApplicationException("ImportFileAsync: Could not get FileObject Path")
-            End If
 
             ' Importing the file now
             Using oFileStream As New FileStream(pFilePath, FileMode.Open, FileAccess.Read)
@@ -173,21 +148,26 @@ Public Class Client
                     oFileStream.CopyTo(oMemoryStream)
                     Dim oContents = oMemoryStream.ToArray()
 
-                    Dim oFileImportResponse = Await _channel.ImportFileIntoFileObjectAsync(New ImportFileIntoFileObjectRequest With {
+                    Dim oFileImportResponse = Await _channel.NewFileAsync(New NewFileRequest With {
-                        .FilePath = oFilePathResponse.FileObjectPath,
+                        .BusinessEntity = pBusinessEntity,
-                        .ObjectId = oObjectIdResponse.ObjectId,
+                        .FileName = oFileInfo.Name,
-                        .ObjectStoreType = pObjectStoreType,
+                        .FileCreatedAt = oFileCreatedAt,
-                        .Who = pImportOptions.Username,
+                        .FileChangedAt = oFileModifiedAt,
-                        .Contents = oContents
+                        .FileContents = oContents,
+                        .FileImportedAt = pImportOptions.DateImported,
+                        .FileChecksum = oFileHash,
+                        .KindType = pObjectKind,
+                        .StoreName = pObjectStoreName,
+                        .Who = pImportOptions.Username
                     })
 
-                    If oFileImportResponse.Result = False Then
+                    If oFileImportResponse.OK = False Then
-                        Throw New ApplicationException("ImportFileAsync: Could not Import File Contents")
+                        Throw New ApplicationException("Could not Import File Contents!")
                     End If
+
+                    Return oFileImportResponse.ObjectId
                 End Using
             End Using
-
-            Return oObjectIdResponse.ObjectId
         Catch ex As Exception
             _logger.Error(ex)
             Return INVALID_OBEJCT_ID
@@ -650,15 +630,15 @@ Public Class Client
         ''' <summary>
         ''' Option to keep the original extension when importing. Defaults to false.
         ''' </summary>
-        Public KeepExtension As Boolean = False
+        Public Property KeepExtension As Boolean = False
         ''' <summary>
         ''' Windows username of the user responsible for the import. Defaults to the currently logged in user.
         ''' </summary>
-        Public Username As String = Environment.UserName
+        Public Property Username As String = Environment.UserName
         ''' <summary>
         ''' Date when the file was imported. Can be in the past. Defaults to now.
         ''' </summary>
-        Public DateImported As Date = Date.Now
+        Public Property DateImported As Date = Date.Now
     End Class
 
     Public Class NewObjectOptions

Modules.EDMIAPI/Client/NewFile.vb

@@ -0,0 +1,11 @@
+Imports DigitalData.Modules.Logging
+
+Public Class NewFile
+    Private ReadOnly LogConfig As LogConfig
+    Private ReadOnly Logger As Logger
+
+    Public Sub New(pLogConfig As LogConfig)
+        LogConfig = pLogConfig
+        Logger = LogConfig.GetLogger()
+    End Sub
+End Class

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

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

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

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

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

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

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

@@ -5,6 +5,6 @@
     Renaming the file extension or editing the content of this file may   
     cause the file to be unrecognizable by the program.
 -->
-<GenericObjectDataSource DisplayName="NewObjectIdResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+<GenericObjectDataSource DisplayName="NewFileResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" />
+  <xs:complexType name="NewFileRequest">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="BusinessEntity" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileChangedAt" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileChecksum" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileContents" nillable="true" type="xs:base64Binary" />
+      <xs:element minOccurs="0" name="FileCreatedAt" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="FileImportedAt" type="xs:dateTime" />
+      <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="KindType" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="StoreName" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="NewFileRequest" nillable="true" type="tns:NewFileRequest" />
+  <xs:complexType name="NewFileResponse">
+    <xs:complexContent mixed="false">
+      <xs:extension xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" base="q1:BaseResponse">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="NewFileResponse" nillable="true" type="tns:NewFileResponse" />
+</xs:schema>

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

@@ -2,7 +2,7 @@
 <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="TableResult">
     <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
+      <xs:extension base="tns:BaseResponse">
         <xs:sequence>
           <xs:element minOccurs="0" name="Table" nillable="true">
             <xs:complexType>
@@ -23,16 +23,16 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:element name="TableResult" nillable="true" type="tns:TableResult" />
-  <xs:complexType name="BaseResult">
+  <xs:complexType name="BaseResponse">
     <xs:sequence>
       <xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
       <xs:element minOccurs="0" name="OK" type="xs:boolean" />
     </xs:sequence>
   </xs:complexType>
-  <xs:element name="BaseResult" nillable="true" type="tns:BaseResult" />
+  <xs:element name="BaseResponse" nillable="true" type="tns:BaseResponse" />
   <xs:complexType name="ScalarResult">
     <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
+      <xs:extension base="tns:BaseResponse">
         <xs:sequence>
           <xs:element minOccurs="0" name="Scalar" nillable="true" type="xs:anyType" />
         </xs:sequence>
@@ -42,7 +42,7 @@
   <xs:element name="ScalarResult" nillable="true" type="tns:ScalarResult" />
   <xs:complexType name="NonQueryResult">
     <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
+      <xs:extension base="tns:BaseResponse">
         <xs:sequence />
       </xs:extension>
     </xs:complexContent>

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

@@ -8,6 +8,7 @@
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" />
       <xsd:import namespace="http://schemas.microsoft.com/Message" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" />
     </xsd:schema>
@@ -111,14 +112,11 @@
   <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage">
     <wsdl:part xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q11:UnexpectedErrorFault" />
   </wsdl:message>
-  <wsdl:message name="DocumentImportRequest">
+  <wsdl:message name="IEDMIService_NewFile_InputMessage">
-    <wsdl:part name="parameters" element="tns:DocumentImportRequest" />
+    <wsdl:part name="parameters" element="tns:NewFile" />
   </wsdl:message>
-  <wsdl:message name="DocumentImportResponse">
+  <wsdl:message name="IEDMIService_NewFile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:DocumentImportResponse" />
+    <wsdl:part name="parameters" element="tns:NewFileResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_ImportFile_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q12:UnexpectedErrorFault" />
   </wsdl:message>
   <wsdl:message name="DocumentStreamRequest">
     <wsdl:part name="parameters" element="tns:DocumentStreamRequest" />
@@ -130,10 +128,10 @@
     <wsdl:part name="FileName" element="tns:FileName" />
   </wsdl:message>
   <wsdl:message name="IEDMIService_GetFileByObjectId_ObjectDoesNotExistFaultFault_FaultMessage">
-    <wsdl:part xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q13:ObjectDoesNotExistFault" />
+    <wsdl:part xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q12:ObjectDoesNotExistFault" />
   </wsdl:message>
   <wsdl:message name="IEDMIService_GetFileByObjectId_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q14:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q13:UnexpectedErrorFault" />
   </wsdl:message>
   <wsdl:message name="DocumentInfoRequest">
     <wsdl:part name="parameters" element="tns:DocumentInfoRequest" />
@@ -142,41 +140,14 @@
     <wsdl:part name="parameters" element="tns:DocumentInfoResponse" />
   </wsdl:message>
   <wsdl:message name="IEDMIService_GetFileInfoByObjectId_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q15:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q14:UnexpectedErrorFault" />
   </wsdl:message>
   <wsdl:message name="IEDMIService_ListFilesForUser_InputMessage" />
   <wsdl:message name="DocumentListResponse">
     <wsdl:part name="parameters" element="tns:DocumentListResponse" />
   </wsdl:message>
   <wsdl:message name="IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q15:UnexpectedErrorFault" />
-  </wsdl:message>
-  <wsdl:message name="NewObjectIdRequest">
-    <wsdl:part name="parameters" element="tns:NewObjectIdRequest" />
-  </wsdl:message>
-  <wsdl:message name="NewObjectIdResponse">
-    <wsdl:part name="parameters" element="tns:NewObjectIdResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_NewObjectId_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q17="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q17:UnexpectedErrorFault" />
-  </wsdl:message>
-  <wsdl:message name="NewFileObjectRequest">
-    <wsdl:part name="parameters" element="tns:NewFileObjectRequest" />
-  </wsdl:message>
-  <wsdl:message name="NewFileObjectResponse">
-    <wsdl:part name="parameters" element="tns:NewFileObjectResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_NewFileObject_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q18="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q18:UnexpectedErrorFault" />
-  </wsdl:message>
-  <wsdl:message name="ImportFileIntoFileObjectRequest">
-    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectRequest" />
-  </wsdl:message>
-  <wsdl:message name="ImportFileIntoFileObjectResponse">
-    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectResponse" />
-  </wsdl:message>
-  <wsdl:message name="IEDMIService_ImportFileIntoFileObject_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q19="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q19:UnexpectedErrorFault" />
   </wsdl:message>
   <wsdl:message name="TestObjectIdExistsRequest">
     <wsdl:part name="parameters" element="tns:TestObjectIdExistsRequest" />
@@ -185,7 +156,7 @@
     <wsdl:part name="parameters" element="tns:TestObjectIdExistsResponse" />
   </wsdl:message>
   <wsdl:message name="IEDMIService_TestObjectIdExists_UnexpectedErrorFaultFault_FaultMessage">
-    <wsdl:part xmlns:q20="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q20:UnexpectedErrorFault" />
+    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
   </wsdl:message>
   <wsdl:portType name="IEDMIService">
     <wsdl:operation name="Heartbeat">
@@ -243,10 +214,9 @@
       <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMResponse" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_OutputMessage" />
       <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage" />
     </wsdl:operation>
-    <wsdl:operation name="ImportFile">
+    <wsdl:operation name="NewFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" name="DocumentImportRequest" message="tns:DocumentImportRequest" />
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" message="tns:IEDMIService_NewFile_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse" name="DocumentImportResponse" message="tns:DocumentImportResponse" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse" message="tns:IEDMIService_NewFile_OutputMessage" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportFile_UnexpectedErrorFaultFault_FaultMessage" />
     </wsdl:operation>
     <wsdl:operation name="GetFileByObjectId">
       <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" name="DocumentStreamRequest" message="tns:DocumentStreamRequest" />
@@ -264,21 +234,6 @@
       <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse" name="DocumentListResponse" message="tns:DocumentListResponse" />
       <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage" />
     </wsdl:operation>
-    <wsdl:operation name="NewObjectId">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId" name="NewObjectIdRequest" message="tns:NewObjectIdRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse" name="NewObjectIdResponse" message="tns:NewObjectIdResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_NewObjectId_UnexpectedErrorFaultFault_FaultMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="NewFileObject">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject" name="NewFileObjectRequest" message="tns:NewFileObjectRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse" name="NewFileObjectResponse" message="tns:NewFileObjectResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_NewFileObject_UnexpectedErrorFaultFault_FaultMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="ImportFileIntoFileObject">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject" name="ImportFileIntoFileObjectRequest" message="tns:ImportFileIntoFileObjectRequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResponse" name="ImportFileIntoFileObjectResponse" message="tns:ImportFileIntoFileObjectResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportFileIntoFileObject_UnexpectedErrorFaultFault_FaultMessage" />
-    </wsdl:operation>
     <wsdl:operation name="TestObjectIdExists">
       <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExists" name="TestObjectIdExistsRequest" message="tns:TestObjectIdExistsRequest" />
       <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExistsResponse" name="TestObjectIdExistsResponse" message="tns:TestObjectIdExistsResponse" />

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" />
   <xs:import namespace="http://schemas.microsoft.com/Message" />
   <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" />
   <xs:element name="Heartbeat">
@@ -157,21 +158,17 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="DocumentImportRequest">
+  <xs:element name="NewFile">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
+        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" minOccurs="0" name="Data" nillable="true" type="q11:NewFileRequest" />
-        <xs:element minOccurs="0" name="DocumentType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="ObjectStoreId" type="xs:long" />
-        <xs:element minOccurs="0" name="RetentionDays" type="xs:long" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="DocumentImportResponse">
+  <xs:element name="NewFileResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStorage.NewFile" minOccurs="0" name="NewFileResult" nillable="true" type="q12:NewFileResponse" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -185,7 +182,7 @@
   <xs:element name="DocumentStreamResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q11="http://schemas.microsoft.com/Message" name="FileContents" type="q11:StreamBody" />
+        <xs:element xmlns:q13="http://schemas.microsoft.com/Message" name="FileContents" type="q13:StreamBody" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -201,7 +198,7 @@
   <xs:element name="DocumentInfoResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" minOccurs="0" name="FileRight" type="q12:Rights.AccessRight" />
+        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API" minOccurs="0" name="FileRight" type="q14:Rights.AccessRight" />
         <xs:element minOccurs="0" name="FullPath" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
@@ -226,58 +223,6 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="NewObjectIdRequest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="BusinessEntity" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="KindType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewObjectIdResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewFileObjectRequest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="DateImported" type="xs:dateTime" />
-        <xs:element minOccurs="0" name="Extension" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="KeepExtension" type="xs:boolean" />
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
-        <xs:element minOccurs="0" name="StoreType" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="NewFileObjectResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="FileObjectPath" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ImportFileIntoFileObjectRequest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
-        <xs:element minOccurs="0" name="FilePath" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
-        <xs:element minOccurs="0" name="ObjectStoreType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ImportFileIntoFileObjectResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="Result" type="xs:boolean" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="TestObjectIdExistsRequest">
     <xs:complexType>
       <xs:sequence>

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

@@ -30,6 +30,7 @@
     <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="e0db7004-6943-4cf8-b88f-4811ed14a341" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="6c7bdb47-eea4-4d03-bc52-9747c865bbf0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="DigitalData.Services.EDMIService.Exceptions.xsd" MetadataType="Schema" ID="57cf2e83-7c36-485a-90c3-0bc4a1748882" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.FileStorage.NewFile.xsd" MetadataType="Schema" ID="bbb83dae-4701-48e2-9c2f-747660d3bd68" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="Message.xsd" MetadataType="Schema" ID="2589e82f-d68f-4843-b153-a80edf895f82" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
     <MetadataFile FileName="DigitalData.Modules.EDMI.API.xsd" MetadataType="Schema" ID="4eca5a54-795a-4e5b-a3b1-10c24930efec" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
   </Metadata>

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

@@ -18,13 +18,14 @@ Namespace EDMIServiceReference
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages"& _ 
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResponse", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages"& _ 
         ""),  _
      System.SerializableAttribute(),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NewFileResponse)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))>  _
-    Partial Public Class BaseResult
+    Partial Public Class BaseResponse
         Inherits Object
         Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
         
@@ -89,7 +90,7 @@ Namespace EDMIServiceReference
         ""),  _
      System.SerializableAttribute(),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResponse)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(System.Exception)),  _
@@ -97,9 +98,11 @@ Namespace EDMIServiceReference
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseFault)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DataTableDoesNotExistFault)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ObjectDoesNotExistFault)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NewFileRequest)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NewFileResponse)),  _
      System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.RightsAccessRight))>  _
     Partial Public Class ScalarResult
-        Inherits EDMIServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResponse
         
         <System.Runtime.Serialization.OptionalFieldAttribute()>  _
         Private ScalarField As Object
@@ -124,7 +127,32 @@ Namespace EDMIServiceReference
         ""),  _
      System.SerializableAttribute()>  _
     Partial Public Class NonQueryResult
-        Inherits EDMIServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResponse
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NewFileResponse", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStor"& _ 
+        "age.NewFile"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class NewFileResponse
+        Inherits EDMIServiceReference.BaseResponse
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private ObjectIdField As Long
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property ObjectId() As Long
+            Get
+                Return Me.ObjectIdField
+            End Get
+            Set
+                If (Me.ObjectIdField.Equals(value) <> true) Then
+                    Me.ObjectIdField = value
+                    Me.RaisePropertyChanged("ObjectId")
+                End If
+            End Set
+        End Property
     End Class
     
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
@@ -133,7 +161,7 @@ Namespace EDMIServiceReference
         ""),  _
      System.SerializableAttribute()>  _
     Partial Public Class TableResult
-        Inherits EDMIServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResponse
         
         <System.Runtime.Serialization.OptionalFieldAttribute()>  _
         Private TableField As System.Data.DataTable
@@ -262,6 +290,198 @@ Namespace EDMIServiceReference
         Inherits EDMIServiceReference.BaseFault
     End Class
     
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NewFileRequest", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.FileStor"& _ 
+        "age.NewFile"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class NewFileRequest
+        Inherits Object
+        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+        
+        <System.NonSerializedAttribute()>  _
+        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private BusinessEntityField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileChangedAtField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileChecksumField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileContentsField() As Byte
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileCreatedAtField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileImportedAtField As Date
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private FileNameField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private KindTypeField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private StoreNameField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private WhoField As String
+        
+        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
+        Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
+            Get
+                Return Me.extensionDataField
+            End Get
+            Set
+                Me.extensionDataField = value
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property BusinessEntity() As String
+            Get
+                Return Me.BusinessEntityField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.BusinessEntityField, value) <> true) Then
+                    Me.BusinessEntityField = value
+                    Me.RaisePropertyChanged("BusinessEntity")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileChangedAt() As String
+            Get
+                Return Me.FileChangedAtField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileChangedAtField, value) <> true) Then
+                    Me.FileChangedAtField = value
+                    Me.RaisePropertyChanged("FileChangedAt")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileChecksum() As String
+            Get
+                Return Me.FileChecksumField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileChecksumField, value) <> true) Then
+                    Me.FileChecksumField = value
+                    Me.RaisePropertyChanged("FileChecksum")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileContents() As Byte()
+            Get
+                Return Me.FileContentsField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileContentsField, value) <> true) Then
+                    Me.FileContentsField = value
+                    Me.RaisePropertyChanged("FileContents")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileCreatedAt() As String
+            Get
+                Return Me.FileCreatedAtField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileCreatedAtField, value) <> true) Then
+                    Me.FileCreatedAtField = value
+                    Me.RaisePropertyChanged("FileCreatedAt")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileImportedAt() As Date
+            Get
+                Return Me.FileImportedAtField
+            End Get
+            Set
+                If (Me.FileImportedAtField.Equals(value) <> true) Then
+                    Me.FileImportedAtField = value
+                    Me.RaisePropertyChanged("FileImportedAt")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property FileName() As String
+            Get
+                Return Me.FileNameField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
+                    Me.FileNameField = value
+                    Me.RaisePropertyChanged("FileName")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property KindType() As String
+            Get
+                Return Me.KindTypeField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.KindTypeField, value) <> true) Then
+                    Me.KindTypeField = value
+                    Me.RaisePropertyChanged("KindType")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property StoreName() As String
+            Get
+                Return Me.StoreNameField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.StoreNameField, value) <> true) Then
+                    Me.StoreNameField = value
+                    Me.RaisePropertyChanged("StoreName")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property Who() As String
+            Get
+                Return Me.WhoField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.WhoField, value) <> true) Then
+                    Me.WhoField = value
+                    Me.RaisePropertyChanged("Who")
+                End If
+            End Set
+        End Property
+        
+        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
+        
+        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
+            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
+            If (Not (propertyChanged) Is Nothing) Then
+                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
+            End If
+        End Sub
+    End Class
+    
     <System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
      System.Runtime.Serialization.DataContractAttribute(Name:="Rights.AccessRight", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API")>  _
     Public Enum RightsAccessRight As Integer
@@ -399,15 +619,11 @@ Namespace EDMIServiceReference
             "ponse")>  _
         Function ExecuteNonQuery_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
         
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentImportRequest) von Nachricht "DocumentImportRequest" nicht mit dem Standardwert (ImportFile) übereinstimmt.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse"),  _
+        Function NewFile(ByVal Data As EDMIServiceReference.NewFileRequest) As EDMIServiceReference.NewFileResponse
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileUnexpectedErrorFau"& _ 
-            "ltFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
-        Function ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
+        Function NewFileAsync(ByVal Data As EDMIServiceReference.NewFileRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileResponse)
         
         'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentStreamRequest) von Nachricht "DocumentStreamRequest" nicht mit dem Standardwert (GetFileByObjectId) übereinstimmt.
         <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse"),  _
@@ -444,38 +660,6 @@ Namespace EDMIServiceReference
         <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
         Function ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse)
         
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (NewObjectIdRequest) von Nachricht "NewObjectIdRequest" nicht mit dem Standardwert (NewObjectId) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdUnexpectedErrorFa"& _ 
-            "ultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse")>  _
-        Function NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse)
-        
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (NewFileObjectRequest) von Nachricht "NewFileObjectRequest" nicht mit dem Standardwert (NewFileObject) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectUnexpectedError"& _ 
-            "FaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse")>  _
-        Function NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse)
-        
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (ImportFileIntoFileObjectRequest) von Nachricht "ImportFileIntoFileObjectRequest" nicht mit dem Standardwert (ImportFileIntoFileObject) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResp"& _ 
-            "onse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectUnex"& _ 
-            "pectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
-            "ns")>  _
-        Function ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResp"& _ 
-            "onse")>  _
-        Function ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
-        
         <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExists", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExistsResponse"),  _
          System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExistsUnexpected"& _ 
             "ErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
@@ -487,60 +671,6 @@ Namespace EDMIServiceReference
         Function TestObjectIdExistsAsync(ByVal request As EDMIServiceReference.TestObjectIdExistsRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.TestObjectIdExistsResponse)
     End Interface
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public Contents() As Byte
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public DocumentType As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public FileName As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
-        Public ObjectStoreId As Long
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
-        Public RetentionDays As Long
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long)
-            MyBase.New
-            Me.Contents = Contents
-            Me.DocumentType = DocumentType
-            Me.FileName = FileName
-            Me.ObjectStoreId = ObjectStoreId
-            Me.RetentionDays = RetentionDays
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public ObjectId As Long
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal ObjectId As Long)
-            MyBase.New
-            Me.ObjectId = ObjectId
-        End Sub
-    End Class
-    
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
      System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
@@ -657,160 +787,6 @@ Namespace EDMIServiceReference
         End Sub
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewObjectIdRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public BusinessEntity As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public KindType As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public Who As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String)
-            MyBase.New
-            Me.BusinessEntity = BusinessEntity
-            Me.KindType = KindType
-            Me.Who = Who
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewObjectIdResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public ObjectId As Long
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal ObjectId As Long)
-            MyBase.New
-            Me.ObjectId = ObjectId
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewFileObjectRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewFileObjectRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public DateImported As Date
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public Extension As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public KeepExtension As Boolean
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
-        Public ObjectId As Long
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
-        Public StoreType As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String)
-            MyBase.New
-            Me.DateImported = DateImported
-            Me.Extension = Extension
-            Me.KeepExtension = KeepExtension
-            Me.ObjectId = ObjectId
-            Me.StoreType = StoreType
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="NewFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class NewFileObjectResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public FileObjectPath As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal FileObjectPath As String)
-            MyBase.New
-            Me.FileObjectPath = FileObjectPath
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class ImportFileIntoFileObjectRequest
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public Contents() As Byte
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
-        Public FilePath As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
-        Public ObjectId As Long
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
-        Public ObjectStoreType As String
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
-        Public Who As String
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal Contents() As Byte, ByVal FilePath As String, ByVal ObjectId As Long, ByVal ObjectStoreType As String, ByVal Who As String)
-            MyBase.New
-            Me.Contents = Contents
-            Me.FilePath = FilePath
-            Me.ObjectId = ObjectId
-            Me.ObjectStoreType = ObjectStoreType
-            Me.Who = Who
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class ImportFileIntoFileObjectResponse
-        
-        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
-        Public Result As Boolean
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal Result As Boolean)
-            MyBase.New
-            Me.Result = Result
-        End Sub
-    End Class
-    
     <System.Diagnostics.DebuggerStepThroughAttribute(),  _
      System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
      System.ServiceModel.MessageContractAttribute(WrapperName:="TestObjectIdExistsRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
@@ -974,35 +950,12 @@ Namespace EDMIServiceReference
             Return MyBase.Channel.ExecuteNonQuery_MSSQL_ECMAsync(SQL)
         End Function
         
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Public Function NewFile(ByVal Data As EDMIServiceReference.NewFileRequest) As EDMIServiceReference.NewFileResponse Implements EDMIServiceReference.IEDMIService.NewFile
-        Function EDMIServiceReference_IEDMIService_ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse Implements EDMIServiceReference.IEDMIService.ImportFile
+            Return MyBase.Channel.NewFile(Data)
-            Return MyBase.Channel.ImportFile(request)
         End Function
         
-        Public Function ImportFile(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long) As Long
+        Public Function NewFileAsync(ByVal Data As EDMIServiceReference.NewFileRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileResponse) Implements EDMIServiceReference.IEDMIService.NewFileAsync
-            Dim inValue As EDMIServiceReference.DocumentImportRequest = New EDMIServiceReference.DocumentImportRequest()
+            Return MyBase.Channel.NewFileAsync(Data)
-            inValue.Contents = Contents
-            inValue.DocumentType = DocumentType
-            inValue.FileName = FileName
-            inValue.ObjectStoreId = ObjectStoreId
-            inValue.RetentionDays = RetentionDays
-            Dim retVal As EDMIServiceReference.DocumentImportResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFile(inValue)
-            Return retVal.ObjectId
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse) Implements EDMIServiceReference.IEDMIService.ImportFileAsync
-            Return MyBase.Channel.ImportFileAsync(request)
-        End Function
-        
-        Public Function ImportFileAsync(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
-            Dim inValue As EDMIServiceReference.DocumentImportRequest = New EDMIServiceReference.DocumentImportRequest()
-            inValue.Contents = Contents
-            inValue.DocumentType = DocumentType
-            inValue.FileName = FileName
-            inValue.ObjectStoreId = ObjectStoreId
-            inValue.RetentionDays = RetentionDays
-            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileAsync(inValue)
         End Function
         
         <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
@@ -1068,95 +1021,6 @@ Namespace EDMIServiceReference
             Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue)
         End Function
         
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse Implements EDMIServiceReference.IEDMIService.NewObjectId
-            Return MyBase.Channel.NewObjectId(request)
-        End Function
-        
-        Public Function NewObjectId(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As Long
-            Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest()
-            inValue.BusinessEntity = BusinessEntity
-            inValue.KindType = KindType
-            inValue.Who = Who
-            Dim retVal As EDMIServiceReference.NewObjectIdResponse = CType(Me,EDMIServiceReference.IEDMIService).NewObjectId(inValue)
-            Return retVal.ObjectId
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse) Implements EDMIServiceReference.IEDMIService.NewObjectIdAsync
-            Return MyBase.Channel.NewObjectIdAsync(request)
-        End Function
-        
-        Public Function NewObjectIdAsync(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse)
-            Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest()
-            inValue.BusinessEntity = BusinessEntity
-            inValue.KindType = KindType
-            inValue.Who = Who
-            Return CType(Me,EDMIServiceReference.IEDMIService).NewObjectIdAsync(inValue)
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse Implements EDMIServiceReference.IEDMIService.NewFileObject
-            Return MyBase.Channel.NewFileObject(request)
-        End Function
-        
-        Public Function NewFileObject(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As String
-            Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest()
-            inValue.DateImported = DateImported
-            inValue.Extension = Extension
-            inValue.KeepExtension = KeepExtension
-            inValue.ObjectId = ObjectId
-            inValue.StoreType = StoreType
-            Dim retVal As EDMIServiceReference.NewFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).NewFileObject(inValue)
-            Return retVal.FileObjectPath
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse) Implements EDMIServiceReference.IEDMIService.NewFileObjectAsync
-            Return MyBase.Channel.NewFileObjectAsync(request)
-        End Function
-        
-        Public Function NewFileObjectAsync(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse)
-            Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest()
-            inValue.DateImported = DateImported
-            inValue.Extension = Extension
-            inValue.KeepExtension = KeepExtension
-            inValue.ObjectId = ObjectId
-            inValue.StoreType = StoreType
-            Return CType(Me,EDMIServiceReference.IEDMIService).NewFileObjectAsync(inValue)
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObject
-            Return MyBase.Channel.ImportFileIntoFileObject(request)
-        End Function
-        
-        Public Function ImportFileIntoFileObject(ByVal Contents() As Byte, ByVal FilePath As String, ByVal ObjectId As Long, ByVal ObjectStoreType As String, ByVal Who As String) As Boolean
-            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
-            inValue.Contents = Contents
-            inValue.FilePath = FilePath
-            inValue.ObjectId = ObjectId
-            inValue.ObjectStoreType = ObjectStoreType
-            inValue.Who = Who
-            Dim retVal As EDMIServiceReference.ImportFileIntoFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObject(inValue)
-            Return retVal.Result
-        End Function
-        
-        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse) Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObjectAsync
-            Return MyBase.Channel.ImportFileIntoFileObjectAsync(request)
-        End Function
-        
-        Public Function ImportFileIntoFileObjectAsync(ByVal Contents() As Byte, ByVal FilePath As String, ByVal ObjectId As Long, ByVal ObjectStoreType As String, ByVal Who As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
-            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
-            inValue.Contents = Contents
-            inValue.FilePath = FilePath
-            inValue.ObjectId = ObjectId
-            inValue.ObjectStoreType = ObjectStoreType
-            inValue.Who = Who
-            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObjectAsync(inValue)
-        End Function
-        
         <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Function EDMIServiceReference_IEDMIService_TestObjectIdExists(ByVal request As EDMIServiceReference.TestObjectIdExistsRequest) As EDMIServiceReference.TestObjectIdExistsResponse Implements EDMIServiceReference.IEDMIService.TestObjectIdExists
             Return MyBase.Channel.TestObjectIdExists(request)

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

@@ -173,17 +173,14 @@
         <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
       </wsdl:fault>
     </wsdl:operation>
-    <wsdl:operation name="ImportFile">
+    <wsdl:operation name="NewFile">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" style="document" />
-      <wsdl:input name="DocumentImportRequest">
+      <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
-      <wsdl:output name="DocumentImportResponse">
+      <wsdl:output>
         <soap12:body use="literal" />
       </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
     </wsdl:operation>
     <wsdl:operation name="GetFileByObjectId">
       <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" style="document" />
@@ -225,42 +222,6 @@
         <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
       </wsdl:fault>
     </wsdl:operation>
-    <wsdl:operation name="NewObjectId">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId" style="document" />
-      <wsdl:input name="NewObjectIdRequest">
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="NewObjectIdResponse">
-        <soap12:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="NewFileObject">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject" style="document" />
-      <wsdl:input name="NewFileObjectRequest">
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="NewFileObjectResponse">
-        <soap12:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="ImportFileIntoFileObject">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject" style="document" />
-      <wsdl:input name="ImportFileIntoFileObjectRequest">
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="ImportFileIntoFileObjectResponse">
-        <soap12:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="UnexpectedErrorFaultFault">
-        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
-      </wsdl:fault>
-    </wsdl:operation>
     <wsdl:operation name="TestObjectIdExists">
       <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/TestObjectIdExists" style="document" />
       <wsdl:input name="TestObjectIdExistsRequest">

Modules.EDMIAPI/DatabaseWithFallback.vb

@@ -33,20 +33,6 @@ Public Class DatabaseWithFallback
         _DatabaseIDB = DatabaseIDB
     End Sub
 
-    ''' <summary>
-    ''' Attempt at making loading big tables less annoying
-    ''' </summary>
-    ''' <returns></returns>
-    Public Function GetDatatable(pTable As TableType, Optional FilterExpression As String = "", Optional SortByColumn As String = "", Optional ForceFallback As Boolean = False)
-        Dim oTable = Tables.Where(Function(t) t.DatabaseType = pTable).SingleOrDefault()
-
-        If oTable Is Nothing Then
-            Return Nothing
-        Else
-            Return GetDatatable(oTable.TableName, oTable.SQLCommand, oTable.DatabaseType, FilterExpression, SortByColumn, ForceFallback)
-        End If
-    End Function
-
     Public Function GetDatatable(pDataTableName As String, pFallbackSQL As String, pFallbackType As Constants.DatabaseType, Optional pFilterExpression As String = "", Optional pSortByColumn As String = "", Optional pForceFallback As Boolean = False) As DataTable
         Try
             Dim oResult As DataTable = Nothing

Modules.EDMIAPI/EDMI.API.vbproj

@@ -72,6 +72,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Client\NewFile.vb" />
     <Compile Include="Client\Rights.vb" />
     <Compile Include="Client\Channel.vb" />
     <Compile Include="Connected Services\EDMIServiceReference\Reference.vb">
@@ -108,9 +109,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
@@ -120,13 +118,7 @@
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
@@ -150,6 +142,9 @@
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
       <SubType>Designer</SubType>
     </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.FileStorage.NewFile.xsd">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -190,6 +185,10 @@
       <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
       <Name>Database</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
+      <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
+      <Name>Filesystem</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Language\Language.vbproj">
       <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
       <Name>Language</Name>