diff --git a/GUIs.ClientSuite/ClassService.vb b/GUIs.ClientSuite/ClassService.vb index 44d91658..f64ec31f 100644 --- a/GUIs.ClientSuite/ClassService.vb +++ b/GUIs.ClientSuite/ClassService.vb @@ -2,7 +2,7 @@ Imports System.ServiceModel.Channels Imports DigitalData.Modules.Logging Imports DigitalData.Modules.EDMI.API -Imports DigitalData.Modules.EDMI.API.IDBServiceReference +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports DigitalData.GUIs.ClientSuite.Base Imports System.ServiceModel.Security @@ -73,15 +73,15 @@ Public Class ClassService End Function) End Function - Public Function GetChannelFactory() As IChannelFactory(Of IIDBServiceChannel) + Public Function GetChannelFactory() As IChannelFactory(Of IEDMIServiceChannel) Return GetChannelFactory(My.SysConfig.ServiceConnection) End Function - Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IIDBServiceChannel) + Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IEDMIServiceChannel) Dim oBinding = GetBinding() Dim oEndpoint = New EndpointAddress(EndpointURL) - Dim oFactory As New ChannelFactory(Of IIDBServiceChannel)(oBinding, oEndpoint) + Dim oFactory As New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oEndpoint) Return oFactory End Function diff --git a/GUIs.ClientSuite/Common/ClassCommonCommands.vb b/GUIs.ClientSuite/Common/ClassCommonCommands.vb index 7825b62e..21e36b7b 100644 --- a/GUIs.ClientSuite/Common/ClassCommonCommands.vb +++ b/GUIs.ClientSuite/Common/ClassCommonCommands.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMI.API.IDBServiceReference +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Public Class ClassCommonCommands Private _LogConfig As LogConfig diff --git a/GUIs.ClientSuite/MyApplication.vb b/GUIs.ClientSuite/MyApplication.vb index 780ddc56..6751fcf3 100644 --- a/GUIs.ClientSuite/MyApplication.vb +++ b/GUIs.ClientSuite/MyApplication.vb @@ -2,7 +2,7 @@ Imports System.Threading Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMI.API.IDBServiceReference +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Namespace My ''' @@ -26,8 +26,8 @@ Namespace My End Property Property LogConfig As LogConfig - Property ChannelFactory As ChannelFactory(Of IIDBServiceChannel) - Property Channel As IIDBServiceChannel + Property ChannelFactory As ChannelFactory(Of IEDMIServiceChannel) + Property Channel As IEDMIServiceChannel Property MainForm As frmMain Property Common As ClassCommon End Module diff --git a/GUIs.ClientSuite/frmSplash.vb b/GUIs.ClientSuite/frmSplash.vb index 4e6563dc..d353e0fb 100644 --- a/GUIs.ClientSuite/frmSplash.vb +++ b/GUIs.ClientSuite/frmSplash.vb @@ -2,12 +2,12 @@ Imports System.ServiceModel Imports System.Threading Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMI.API.IDBServiceReference +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Public NotInheritable Class frmSplash Private _Worker As New BackgroundWorker() - Private _ChannelFactory As ChannelFactory(Of IIDBServiceChannel) - Private _Channel As IIDBServiceChannel + Private _ChannelFactory As ChannelFactory(Of IEDMIServiceChannel) + Private _Channel As IEDMIServiceChannel Private _Logger As Logger Private _CurrentRetry As Integer = 0 diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource similarity index 66% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource index 7556312d..4bf7be0e 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult + DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2.datasource similarity index 66% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2.datasource index a599a44e..e6f36b46 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2 + DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource similarity index 66% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult.datasource rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource index 2c03f29f..ab3d3148 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult.datasource +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult + DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource similarity index 66% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource index f22396cc..08cbd66d 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult + DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource similarity index 66% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult.datasource rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource index 4a52d3d7..b025563c 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult.datasource +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult + DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource similarity index 66% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult.datasource rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource index 874e19a8..ec10938e 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult.datasource +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult + DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd similarity index 100% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl new file mode 100644 index 00000000..4c17fb89 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd similarity index 82% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd index 6dfd78af..51c95fc6 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd @@ -1,6 +1,6 @@  - - + + @@ -50,7 +50,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -140,23 +140,6 @@ - - - - - - - - - - - - - - - - - @@ -167,7 +150,7 @@ - + @@ -181,7 +164,24 @@ - + + + + + + + + + + + + + + + + + + @@ -198,7 +198,7 @@ - + diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd similarity index 95% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd index 8166c598..7d1468d5 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd @@ -1,5 +1,5 @@  - + diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.svcmap b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap similarity index 84% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.svcmap rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap index f757fb08..93c22c81 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.svcmap +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap @@ -22,11 +22,11 @@ - + - + - + diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.vb b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb similarity index 63% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.vb rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb index 6e9cdd65..046c5ea1 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.vb +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb @@ -14,18 +14,18 @@ Option Explicit On Imports System Imports System.Runtime.Serialization -Namespace IDBServiceReference +Namespace EDMIServiceReference _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))> _ Partial Public Class BaseResult Inherits Object Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged @@ -87,21 +87,21 @@ Namespace IDBServiceReference _ Partial Public Class ScalarResult - Inherits IDBServiceReference.BaseResult + Inherits EDMIServiceReference.BaseResult _ Private ScalarField As Object @@ -122,22 +122,22 @@ Namespace IDBServiceReference _ Partial Public Class NonQueryResult - Inherits IDBServiceReference.BaseResult + Inherits EDMIServiceReference.BaseResult End Class _ Partial Public Class DocumentResult - Inherits IDBServiceReference.BaseResult + Inherits EDMIServiceReference.BaseResult Private ContentsField() As Byte - Private DocumentField As IDBServiceReference.DocumentObject + Private DocumentField As EDMIServiceReference.DocumentObject Private HasContentsField As Boolean @@ -155,7 +155,7 @@ Namespace IDBServiceReference End Property _ - Public Property Document() As IDBServiceReference.DocumentObject + Public Property Document() As EDMIServiceReference.DocumentObject Get Return Me.DocumentField End Get @@ -183,14 +183,14 @@ Namespace IDBServiceReference _ Partial Public Class DocumentResult2 - Inherits IDBServiceReference.BaseResult + Inherits EDMIServiceReference.BaseResult Private ContentsField() As Byte - Private DocumentField As IDBServiceReference.DocumentResult2.DocumentObject + Private DocumentField As EDMIServiceReference.DocumentResult2.DocumentObject Private HasContentsField As Boolean @@ -208,7 +208,7 @@ Namespace IDBServiceReference End Property _ - Public Property Document() As IDBServiceReference.DocumentResult2.DocumentObject + Public Property Document() As EDMIServiceReference.DocumentResult2.DocumentObject Get Return Me.DocumentField End Get @@ -235,7 +235,7 @@ Namespace IDBServiceReference _ Partial Public Class DocumentObject Inherits Object @@ -282,10 +282,10 @@ Namespace IDBServiceReference _ Partial Public Class IndexResult - Inherits IDBServiceReference.BaseResult + Inherits EDMIServiceReference.BaseResult Private IndexIdField As Long @@ -305,10 +305,10 @@ Namespace IDBServiceReference _ Partial Public Class TableResult - Inherits IDBServiceReference.BaseResult + Inherits EDMIServiceReference.BaseResult _ Private TableField As System.Data.DataTable @@ -404,108 +404,112 @@ Namespace IDBServiceReference End Class _ - Public Interface IIDBService + System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.EDMIService", ConfigurationName:="EDMIServiceReference.IEDMIService")> _ + Public Interface IEDMIService - _ + _ Function Heartbeat() As Boolean - _ + _ Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) - _ + _ Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String - _ + _ Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) - _ + _ Sub CloseDatabaseRequest() - _ + _ Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task - _ - Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult + _ + Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult - _ - Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult) + _ + Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) - _ - Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult + _ + Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult - _ - Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult) + _ + Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) - _ - Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult + _ + Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult - _ - Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult) + _ + Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) - _ - Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult + _ + Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult - _ - Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + _ + Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - _ - Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult + _ + Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult - _ - Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + _ + Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - _ - Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult + _ + Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult - _ - Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + _ + Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - _ - Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean + _ + Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean - _ - Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) + _ + Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) - _ - Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2 + _ + Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult - _ - Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2) + _ + Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - _ - Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult + _ + Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult - _ - Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + _ + Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - _ - Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult + _ + Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As EDMIServiceReference.DocumentResult2 - _ - Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + _ + Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult2) - _ - Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult + _ + Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult - _ - Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult) + _ + Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) End Interface _ - Public Interface IIDBServiceChannel - Inherits IDBServiceReference.IIDBService, System.ServiceModel.IClientChannel + Public Interface IEDMIServiceChannel + Inherits EDMIServiceReference.IEDMIService, System.ServiceModel.IClientChannel End Interface _ - Partial Public Class IDBServiceClient - Inherits System.ServiceModel.ClientBase(Of IDBServiceReference.IIDBService) - Implements IDBServiceReference.IIDBService + Partial Public Class EDMIServiceClient + Inherits System.ServiceModel.ClientBase(Of EDMIServiceReference.IEDMIService) + Implements EDMIServiceReference.IEDMIService Public Sub New() MyBase.New @@ -527,115 +531,115 @@ Namespace IDBServiceReference MyBase.New(binding, remoteAddress) End Sub - Public Function Heartbeat() As Boolean Implements IDBServiceReference.IIDBService.Heartbeat + Public Function Heartbeat() As Boolean Implements EDMIServiceReference.IEDMIService.Heartbeat Return MyBase.Channel.Heartbeat End Function - Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.HeartbeatAsync + Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.HeartbeatAsync Return MyBase.Channel.HeartbeatAsync End Function - Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements IDBServiceReference.IIDBService.CreateDatabaseRequest + Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequest Return MyBase.Channel.CreateDatabaseRequest(Name, Debug) End Function - Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements IDBServiceReference.IIDBService.CreateDatabaseRequestAsync + Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequestAsync Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug) End Function - Public Sub CloseDatabaseRequest() Implements IDBServiceReference.IIDBService.CloseDatabaseRequest + Public Sub CloseDatabaseRequest() Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequest MyBase.Channel.CloseDatabaseRequest End Sub - Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements IDBServiceReference.IIDBService.CloseDatabaseRequestAsync + Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequestAsync Return MyBase.Channel.CloseDatabaseRequestAsync End Function - Public Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult Implements IDBServiceReference.IIDBService.ReturnDatatable + Public Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable Return MyBase.Channel.ReturnDatatable(SQL) End Function - Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult) Implements IDBServiceReference.IIDBService.ReturnDatatableAsync + Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatableAsync Return MyBase.Channel.ReturnDatatableAsync(SQL) End Function - Public Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult Implements IDBServiceReference.IIDBService.ReturnScalar + Public Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar Return MyBase.Channel.ReturnScalar(SQL) End Function - Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult) Implements IDBServiceReference.IIDBService.ReturnScalarAsync + Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalarAsync Return MyBase.Channel.ReturnScalarAsync(SQL) End Function - Public Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult Implements IDBServiceReference.IIDBService.ExecuteNonQuery + Public Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery Return MyBase.Channel.ExecuteNonQuery(SQL) End Function - Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult) Implements IDBServiceReference.IIDBService.ExecuteNonQueryAsync + Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQueryAsync Return MyBase.Channel.ExecuteNonQueryAsync(SQL) End Function - Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.NewFile + Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.NewFile Return MyBase.Channel.NewFile(FileName, Contents) End Function - Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.NewFileAsync + Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.NewFileAsync Return MyBase.Channel.NewFileAsync(FileName, Contents) End Function - Public Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.UpdateFile + Public Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.UpdateFile Return MyBase.Channel.UpdateFile(DocObject, Contents) End Function - Public Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.UpdateFileAsync + Public Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.UpdateFileAsync Return MyBase.Channel.UpdateFileAsync(DocObject, Contents) End Function - Public Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetFile + Public Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.GetFile Return MyBase.Channel.GetFile(DocObject) End Function - Public Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetFileAsync + Public Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetFileAsync Return MyBase.Channel.GetFileAsync(DocObject) End Function - Public Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean Implements IDBServiceReference.IIDBService.DeleteFile + Public Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean Implements EDMIServiceReference.IEDMIService.DeleteFile Return MyBase.Channel.DeleteFile(DocObject) End Function - Public Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.DeleteFileAsync + Public Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.DeleteFileAsync Return MyBase.Channel.DeleteFileAsync(DocObject) End Function - Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2 Implements IDBServiceReference.IIDBService.ImportFile - Return MyBase.Channel.ImportFile(FileInfo, Contents, [ReadOnly], RetentionTime) - End Function - - Public Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2) Implements IDBServiceReference.IIDBService.ImportFileAsync - Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime) - End Function - - Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByDocumentId + Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentId Return MyBase.Channel.GetDocumentByDocumentId(DocumentId) End Function - Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByDocumentIdAsync + Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentIdAsync Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId) End Function - Public Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByContainerId + Public Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerId Return MyBase.Channel.GetDocumentByContainerId(ContainerId) End Function - Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByContainerIdAsync + Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerIdAsync Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId) End Function - Public Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult Implements IDBServiceReference.IIDBService.NewFileIndex + Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As EDMIServiceReference.DocumentResult2 Implements EDMIServiceReference.IEDMIService.ImportFile + Return MyBase.Channel.ImportFile(FileInfo, Contents, [ReadOnly], RetentionTime) + End Function + + Public Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult2) Implements EDMIServiceReference.IEDMIService.ImportFileAsync + Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime) + End Function + + Public Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult Implements EDMIServiceReference.IEDMIService.NewFileIndex Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value) End Function - Public Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult) Implements IDBServiceReference.IIDBService.NewFileIndexAsync + Public Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) Implements EDMIServiceReference.IEDMIService.NewFileIndexAsync Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value) End Function End Class diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/System.Data.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/System.Data.xsd similarity index 100% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/System.Data.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/System.Data.xsd diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/System.IO.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/System.IO.xsd similarity index 100% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/System.IO.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/System.IO.xsd diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/System.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/System.xsd similarity index 100% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/System.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/System.xsd diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/configuration.svcinfo b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/configuration.svcinfo new file mode 100644 index 00000000..424ca5c2 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/configuration.svcinfo @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration91.svcinfo b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/configuration91.svcinfo similarity index 97% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration91.svcinfo rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/configuration91.svcinfo index df824480..f5be33e2 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration91.svcinfo +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/configuration91.svcinfo @@ -1,5 +1,5 @@ - + @@ -81,8 +81,8 @@ System.ServiceModel.Configuration.NetTcpSecurityElement - - Transport + + None System.ServiceModel.Configuration.TcpTransportSecurityElement @@ -121,7 +121,7 @@ - + net.tcp://localhost:9000/DigitalData/Services/Main @@ -136,7 +136,7 @@ tcpBinding - IDBServiceReference.IIDBService + EDMIServiceReference.IEDMIService System.ServiceModel.Configuration.AddressHeaderCollectionElement diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/service.wsdl b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl similarity index 69% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/service.wsdl rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl index cc11f8c7..5533cda6 100644 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/service.wsdl +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl @@ -1,46 +1,23 @@  - + - - - - - - EncryptAndSign - - - - - - - - - - - - - - - - - - + - + - + @@ -49,7 +26,7 @@ - + @@ -58,7 +35,7 @@ - + @@ -67,7 +44,7 @@ - + @@ -76,7 +53,7 @@ - + @@ -85,7 +62,7 @@ - + @@ -94,7 +71,7 @@ - + @@ -103,7 +80,7 @@ - + @@ -112,7 +89,7 @@ - + @@ -121,16 +98,7 @@ - - - - - - - - - - + @@ -139,7 +107,7 @@ - + @@ -148,7 +116,16 @@ - + + + + + + + + + + @@ -157,7 +134,7 @@ - + @@ -166,7 +143,7 @@ - + diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/service.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.xsd similarity index 100% rename from Modules.EDMIAPI/Connected Services/IDBServiceReference/service.xsd rename to Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.xsd diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl deleted file mode 100644 index e5ab9e5d..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration.svcinfo b/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration.svcinfo deleted file mode 100644 index d435b878..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Modules.EDMIAPI/Document.vb b/Modules.EDMIAPI/Document.vb index 0c1fce60..887bc9a8 100644 --- a/Modules.EDMIAPI/Document.vb +++ b/Modules.EDMIAPI/Document.vb @@ -1,13 +1,13 @@ Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMI.API.IDBServiceReference +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports System.ServiceModel Imports System.IO Public Class Document Private _logger As Logger Private _logConfig As LogConfig - Private _channelFactory As ChannelFactory(Of IIDBServiceChannel) - Private _channel As IIDBServiceChannel + Private _channelFactory As ChannelFactory(Of IEDMIServiceChannel) + Private _channel As IEDMIServiceChannel ''' ''' Creates a new EDMIAPI object @@ -21,7 +21,7 @@ Public Class Document Try Dim oBinding = Channel.GetBinding() Dim oAddress = New EndpointAddress(ServiceAdress) - Dim oFactory = New ChannelFactory(Of IIDBServiceChannel)(oBinding, oAddress) + Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress) _channelFactory = oFactory Catch ex As Exception @@ -167,7 +167,7 @@ Public Class Document ''' Creates a channel and adds a Faulted-Handler ''' ''' A channel object - Private Function GetChannel() As IIDBServiceChannel + Private Function GetChannel() As IEDMIServiceChannel Try _logger.Debug("Creating channel..") Dim oChannel = _channelFactory.CreateChannel() diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index 57fb97eb..c390ee95 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -73,7 +73,7 @@ - + True True Reference.svcmap @@ -106,45 +106,45 @@ - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Designer - - + + Designer - + Designer - - + + Designer - + Designer - + Designer - + Designer @@ -168,16 +168,16 @@ - + - + - + - + WCF Proxy Generator Reference.vb diff --git a/Modules.EDMIAPI/app.config b/Modules.EDMIAPI/app.config index 46aaf5fc..8af607c5 100644 --- a/Modules.EDMIAPI/app.config +++ b/Modules.EDMIAPI/app.config @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ + contract="EDMIServiceReference.IEDMIService" name="tcpBinding">