EDMI.API: Clean up Client

2021-06-14 14:46:32 +02:00 · 2021-06-14 14:46:32 +02:00 · ab1cb2c847
commit ab1cb2c847
parent 6fc4541567
10 changed files with 334 additions and 151 deletions
--- a/Modules.EDMIAPI/Client.vb
+++ b/Modules.EDMIAPI/Client.vb
@ -7,7 +7,6 @@ Imports System.IO
 Public Class Client
    Private ReadOnly _logger As Logger
    Private ReadOnly _channelFactory As ChannelFactory(Of IEDMIServiceChannel)
-    Private _ServiceAddress As String
    Private _IPAddressServer As String
    Private _channel As IEDMIServiceChannel

@ -34,7 +33,6 @@ Public Class Client
        _logger = LogConfig.GetLogger()

        Try
-            _ServiceAddress = ServiceAdress
            Dim oBinding = Channel.GetBinding()
            Dim oAddress = New EndpointAddress(ServiceAdress)
            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
@ -281,41 +279,56 @@ Public Class Client
            Throw ex
        End Try
    End Function
-    Public Function NewFileStoreObject(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String
+
+    Public Function CreateObjectId(pKindType As String, pWho As String, pBusinessEntity As String) As Long
        Try
+            Dim oArgs As New NewObjectIdRequest With {
+                .KindType = pKindType,
+                .BusinessEntity = pBusinessEntity,
+                .Who = pWho
+            }
+            Dim oResponse = _channel.NewObjectId(oArgs)
+            Return oResponse.ObjectId
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Function CreateFileStoreObject(pObjectId As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String
+        Try
+            ' Remove dot in Extension 
            If pExtension.StartsWith(".") Then
-                pExtension = pExtension.Replace(".", "")
+                pExtension = pExtension.Substring(1)
            End If
-            Dim oResponse = _channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension)
-            Return oResponse
+
+            Dim oArgs As New NewFileObjectRequest With {
+                .ObjectId = pObjectId,
+                .StoreType = pStoreType,
+                .DateImported = pDate,
+                .Extension = pExtension,
+                .KeepExtension = pKeepExtension
+            }
+            Dim oResponse = _channel.NewFileObject(oargs)
+            Return oResponse.FileObjectPath
        Catch ex As Exception
            _logger.Error(ex)
            Throw ex
        End Try
    End Function
-    Public Function NewIDB_OBJ_ID(pKindType As String, pWho As String, pBusinessEntity As String) As Long
+
+    Public Async Function ImportFileObjectAsync(pContent As Byte(), pWho As String, pObjectId As Long, pObjectStoreID As Short, pFileObjectPath As String) As Task(Of Boolean)
        Try
-            Dim oResponse = _channel.New_IDB_OBJECT(pKindType, pWho, pBusinessEntity)
-            Return oResponse
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-    Public Async Function ImportIDBFOAsync(pContent As Byte(), pWho As String, pIDB_OBJ_ID As Long, pObjectStoreID As Short, pIDBFOPath As String) As Task(Of Boolean)
-        Try
-            Dim oData As New DocumentImportIDBFORequest() With {
+            Dim oData As New ImportFileIntoFileObjectRequest() With {
                .Contents = pContent,
                .pWho = pWho,
-                    .pIDBFilePath = pIDBFOPath,
-                    .pIDB_OBJ_ID = pIDB_OBJ_ID,
+                .pIDBFilePath = pFileObjectPath,
+                .pIDB_OBJ_ID = pObjectId,
                .pObjectStoreID = pObjectStoreID
            }

-            Dim oResponse = Await _channel.ImportNewIDBFOAsync(oData)
-
+            Dim oResponse = Await _channel.ImportFileIntoFileObjectAsync(oData)
            Return oResponse.Result
-
        Catch ex As Exception
            _logger.Error(ex)
            Return False
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.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="DocumentImportIDBFOResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="ImportFileIntoFileObjectResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="NewFileObjectResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource
@ -0,0 +1,10 @@
+<?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="NewObjectIdResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
@ -1,5 +1,5 @@
 <?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: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:soap="http://schemas.xmlsoap.org/wsdl/soap/" 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:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" 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" />
@ -151,31 +151,31 @@
  <wsdl:message name="IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_FileStore_Object_InputMessage">
-    <wsdl:part name="parameters" element="tns:New_FileStore_Object" />
+  <wsdl:message name="NewObjectIdRequest">
+    <wsdl:part name="parameters" element="tns:NewObjectIdRequest" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_FileStore_Object_OutputMessage">
-    <wsdl:part name="parameters" element="tns:New_FileStore_ObjectResponse" />
+  <wsdl:message name="NewObjectIdResponse">
+    <wsdl:part name="parameters" element="tns:NewObjectIdResponse" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_FileStore_Object_UnexpectedErrorFaultFault_FaultMessage">
+  <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="IEDMIService_New_IDB_OBJECT_InputMessage">
-    <wsdl:part name="parameters" element="tns:New_IDB_OBJECT" />
+  <wsdl:message name="NewFileObjectRequest">
+    <wsdl:part name="parameters" element="tns:NewFileObjectRequest" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_IDB_OBJECT_OutputMessage">
-    <wsdl:part name="parameters" element="tns:New_IDB_OBJECTResponse" />
+  <wsdl:message name="NewFileObjectResponse">
+    <wsdl:part name="parameters" element="tns:NewFileObjectResponse" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_IDB_OBJECT_UnexpectedErrorFaultFault_FaultMessage">
+  <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="DocumentImportIDBFORequest">
-    <wsdl:part name="parameters" element="tns:DocumentImportIDBFORequest" />
+  <wsdl:message name="ImportFileIntoFileObjectRequest">
+    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectRequest" />
  </wsdl:message>
-  <wsdl:message name="DocumentImportIDBFOResponse">
-    <wsdl:part name="parameters" element="tns:DocumentImportIDBFOResponse" />
+  <wsdl:message name="ImportFileIntoFileObjectResponse">
+    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectResponse" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_ImportNewIDBFO_UnexpectedErrorFaultFault_FaultMessage">
+  <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:portType name="IEDMIService">
@ -255,20 +255,20 @@
      <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="New_FileStore_Object">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object" message="tns:IEDMIService_New_FileStore_Object_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectResponse" message="tns:IEDMIService_New_FileStore_Object_OutputMessage" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_New_FileStore_Object_UnexpectedErrorFaultFault_FaultMessage" />
+    <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="New_IDB_OBJECT">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT" message="tns:IEDMIService_New_IDB_OBJECT_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTResponse" message="tns:IEDMIService_New_IDB_OBJECT_OutputMessage" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_New_IDB_OBJECT_UnexpectedErrorFaultFault_FaultMessage" />
+    <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="ImportNewIDBFO">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO" name="DocumentImportIDBFORequest" message="tns:DocumentImportIDBFORequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOResponse" name="DocumentImportIDBFOResponse" message="tns:DocumentImportIDBFOResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportNewIDBFO_UnexpectedErrorFaultFault_FaultMessage" />
+    <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:portType>
 </wsdl:definitions>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
@ -226,41 +226,41 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="New_FileStore_Object">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="IDB_OBJ_ID" type="xs:long" />
-        <xs:element minOccurs="0" name="pStoreType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pDate" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pExtension" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pKeepExtension" type="xs:boolean" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="New_FileStore_ObjectResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="New_FileStore_ObjectResult" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="New_IDB_OBJECT">
+  <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="pWho" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pBusinessEntity" 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="New_IDB_OBJECTResponse">
+  <xs:element name="NewObjectIdResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element minOccurs="0" name="New_IDB_OBJECTResult" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="DocumentImportIDBFORequest">
+  <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" />
@ -271,7 +271,7 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="DocumentImportIDBFOResponse">
+  <xs:element name="ImportFileIntoFileObjectResponse">
    <xs:complexType>
      <xs:sequence>
        <xs:element minOccurs="0" name="Result" type="xs:boolean" />
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@ -444,35 +444,37 @@ Namespace EDMIServiceReference
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
        Function ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse)
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectResponse"& _ 
-            ""),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectUnexpect"& _ 
-            "edErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
+        '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 New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String
+        Function NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectResponse"& _ 
-            "")>  _
-        Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String)
+        <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)
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTUnexpectedErro"& _ 
-            "rFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
+        '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 New_IDB_OBJECT(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As String
+        Function NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTResponse")>  _
-        Function New_IDB_OBJECTAsync(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As System.Threading.Tasks.Task(Of String)
+        <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 (DocumentImportIDBFORequest) von Nachricht "DocumentImportIDBFORequest" nicht mit dem Standardwert (ImportNewIDBFO) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOUnexpectedErro"& _ 
-            "rFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
+        '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 ImportNewIDBFO(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As EDMIServiceReference.DocumentImportIDBFOResponse
+        Function ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOResponse")>  _
-        Function ImportNewIDBFOAsync(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse)
+        <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)
    End Interface
    
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
@ -648,8 +650,108 @@ Namespace EDMIServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportIDBFORequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportIDBFORequest
+     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
@ -683,8 +785,8 @@ Namespace EDMIServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportIDBFOResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportIDBFOResponse
+     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
@ -912,51 +1014,93 @@ Namespace EDMIServiceReference
            Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue)
        End Function
        
-        Public Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String Implements EDMIServiceReference.IEDMIService.New_FileStore_Object
-            Return MyBase.Channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension)
+        <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 New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.New_FileStore_ObjectAsync
-            Return MyBase.Channel.New_FileStore_ObjectAsync(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension)
-        End Function
-        
-        Public Function New_IDB_OBJECT(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As String Implements EDMIServiceReference.IEDMIService.New_IDB_OBJECT
-            Return MyBase.Channel.New_IDB_OBJECT(KindType, pWho, pBusinessEntity)
-        End Function
-        
-        Public Function New_IDB_OBJECTAsync(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.New_IDB_OBJECTAsync
-            Return MyBase.Channel.New_IDB_OBJECTAsync(KindType, pWho, pBusinessEntity)
+        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_ImportNewIDBFO(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As EDMIServiceReference.DocumentImportIDBFOResponse Implements EDMIServiceReference.IEDMIService.ImportNewIDBFO
-            Return MyBase.Channel.ImportNewIDBFO(request)
+        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 ImportNewIDBFO(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As Boolean
-            Dim inValue As EDMIServiceReference.DocumentImportIDBFORequest = New EDMIServiceReference.DocumentImportIDBFORequest()
+        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 pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As Boolean
+            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
            inValue.Contents = Contents
            inValue.pIDBFilePath = pIDBFilePath
            inValue.pIDB_OBJ_ID = pIDB_OBJ_ID
            inValue.pObjectStoreID = pObjectStoreID
            inValue.pWho = pWho
-            Dim retVal As EDMIServiceReference.DocumentImportIDBFOResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportNewIDBFO(inValue)
+            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_ImportNewIDBFOAsync(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse) Implements EDMIServiceReference.IEDMIService.ImportNewIDBFOAsync
-            Return MyBase.Channel.ImportNewIDBFOAsync(request)
+        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 ImportNewIDBFOAsync(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse)
-            Dim inValue As EDMIServiceReference.DocumentImportIDBFORequest = New EDMIServiceReference.DocumentImportIDBFORequest()
+        Public Function ImportFileIntoFileObjectAsync(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
+            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
            inValue.Contents = Contents
            inValue.pIDBFilePath = pIDBFilePath
            inValue.pIDB_OBJ_ID = pIDB_OBJ_ID
            inValue.pObjectStoreID = pObjectStoreID
            inValue.pWho = pWho
-            Return CType(Me,EDMIServiceReference.IEDMIService).ImportNewIDBFOAsync(inValue)
+            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObjectAsync(inValue)
        End Function
    End Class
 End Namespace
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@ -225,36 +225,36 @@
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
-    <wsdl:operation name="New_FileStore_Object">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object" style="document" />
-      <wsdl:input>
+    <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>
+      <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="New_IDB_OBJECT">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT" style="document" />
-      <wsdl:input>
+    <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>
+      <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="ImportNewIDBFO">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO" style="document" />
-      <wsdl:input name="DocumentImportIDBFORequest">
+    <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="DocumentImportIDBFOResponse">
+      <wsdl:output name="ImportFileIntoFileObjectResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
--- a/Modules.EDMIAPI/EDMI.API.vbproj
+++ b/Modules.EDMIAPI/EDMI.API.vbproj
@ -108,9 +108,6 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
@ -123,6 +120,15 @@
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>