diff --git a/Source/ImportWrapper.sln b/Source/ImportWrapper.sln index dea4dba..9a87689 100644 --- a/Source/ImportWrapper.sln +++ b/Source/ImportWrapper.sln @@ -1,24 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29306.81 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33502.453 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImportWrapperConsole", "ImportWrapperConsole\ImportWrapperConsole.csproj", "{79BCA10B-9A9D-4129-B9F9-A3C99E5240E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelativityServerImportWrapperConsole", "ImportWrapperConsole\RelativityServerImportWrapperConsole.csproj", "{79BCA10B-9A9D-4129-B9F9-A3C99E5240E8}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Relativity.DataExchange.Wrapper.Shared", "Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.shproj", "{FA954652-1E2D-42E7-A7CC-3E28093C6E94}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Relativity.Server.DataExchange.Wrapper.Shared", "Relativity.DataExchange.Wrapper.Shared\Relativity.Server.DataExchange.Wrapper.Shared.shproj", "{FA954652-1E2D-42E7-A7CC-3E28093C6E94}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Relativity.DataExchange.Wrapper.Sdk", "Relativity.DataExchange.Wrapper.Sdk\Relativity.DataExchange.Wrapper.Sdk.csproj", "{3677DE28-21FA-40F1-A875-E409709C1910}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Relativity.Server.DataExchange.Wrapper.Sdk", "Relativity.DataExchange.Wrapper.Sdk\Relativity.Server.DataExchange.Wrapper.Sdk.csproj", "{3677DE28-21FA-40F1-A875-E409709C1910}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Relativity.DataExchange.Wrapper.Legacy", "Relativity.DataExchange.Wrapper.Legacy\Relativity.DataExchange.Wrapper.Legacy.csproj", "{24E68688-A6FE-4CE5-A9BB-8337450B3CF2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Relativity.Server.DataExchange.Wrapper.Legacy", "Relativity.DataExchange.Wrapper.Legacy\Relativity.Server.DataExchange.Wrapper.Legacy.csproj", "{24E68688-A6FE-4CE5-A9BB-8337450B3CF2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Relativity.DataExchange.Wrapper.Core", "Relativity.DataExchange.Wrapper.Core\Relativity.DataExchange.Wrapper.Core.csproj", "{830B3FE2-1EF4-4ABA-8A02-A15A0FADAE51}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Relativity.Server.DataExchange.Wrapper.Core", "Relativity.DataExchange.Wrapper.Core\Relativity.Server.DataExchange.Wrapper.Core.csproj", "{830B3FE2-1EF4-4ABA-8A02-A15A0FADAE51}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.projitems*{24e68688-a6fe-4ce5-a9bb-8337450b3cf2}*SharedItemsImports = 4 - Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.projitems*{3677de28-21fa-40f1-a875-e409709c1910}*SharedItemsImports = 4 - Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.projitems*{fa954652-1e2d-42e7-a7cc-3e28093c6e94}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -47,4 +42,9 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {43F9C538-2537-4142-9593-D89CE6F8301F} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.projitems*{24e68688-a6fe-4ce5-a9bb-8337450b3cf2}*SharedItemsImports = 4 + Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.projitems*{3677de28-21fa-40f1-a875-e409709c1910}*SharedItemsImports = 4 + Relativity.DataExchange.Wrapper.Shared\Relativity.DataExchange.Wrapper.Shared.projitems*{fa954652-1e2d-42e7-a7cc-3e28093c6e94}*SharedItemsImports = 13 + EndGlobalSection EndGlobal diff --git a/Source/ImportWrapperConsole/Program.cs b/Source/ImportWrapperConsole/Program.cs index 70ac6e7..3ef9947 100644 --- a/Source/ImportWrapperConsole/Program.cs +++ b/Source/ImportWrapperConsole/Program.cs @@ -1,6 +1,6 @@ -namespace ImportPluginConsole +namespace RelativityServerImportPluginConsole { - using Relativity.DataExchange.Wrapper; + using Relativity.Server.DataExchange.Wrapper; using System; using System.Collections.Generic; using System.Data; @@ -40,11 +40,11 @@ private static void ExecuteDemo() // Note: the legacy API does NOT support bearer token auth! ImportConnectionInfo connectionInfo = new ImportConnectionInfo { - Password = "PASSWORD", - UserName = "USERNAME", + Password = "Test1234!", + UserName = "relativity.admin@kcura.com", UseRsaBearerToken = false, - WebServiceUrl = "https://HOSTNAME/RelativityWebApi/", - WorkspaceId = 1234567 + WebServiceUrl = "https://P-DV-VM-SEW1TIE/RelativityWebApi/", + WorkspaceId = 1018580 }; // Note: specify the full path where each plugin directory is located. diff --git a/Source/ImportWrapperConsole/ImportWrapperConsole.csproj b/Source/ImportWrapperConsole/RelativityServerImportWrapperConsole.csproj similarity index 83% rename from Source/ImportWrapperConsole/ImportWrapperConsole.csproj rename to Source/ImportWrapperConsole/RelativityServerImportWrapperConsole.csproj index 4fe4c30..d16b06c 100644 --- a/Source/ImportWrapperConsole/ImportWrapperConsole.csproj +++ b/Source/ImportWrapperConsole/RelativityServerImportWrapperConsole.csproj @@ -6,8 +6,8 @@ AnyCPU {79BCA10B-9A9D-4129-B9F9-A3C99E5240E8} Exe - ImportPluginConsole - ImportPluginConsole + RelativityServerImportPluginConsole + RelativityServerImportPluginConsole v4.6.2 512 true @@ -32,6 +32,9 @@ prompt 4 + + RelativityServerImportPluginConsole.Program + @@ -47,9 +50,9 @@ - + {830b3fe2-1ef4-4aba-8a02-a15a0fadae51} - Relativity.DataExchange.Wrapper.Core + Relativity.Server.DataExchange.Wrapper.Core diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportJob.cs b/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportJob.cs index 85d98fe..a9de19e 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportJob.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportJob.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System.Data; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportSettings.cs b/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportSettings.cs index d2ca867..41439b4 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportSettings.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IBulkArtifactImportSettings.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { /// /// Represents document and object import settings. diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportJob.cs b/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportJob.cs index 5676582..7e26cb5 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportJob.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportJob.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System.Data; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportSettings.cs b/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportSettings.cs index 40f13a1..d2818bf 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportSettings.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IImageBulkArtifactImportSettings.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { /// /// Represents image or production-based import settings. diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IImportClient.cs b/Source/Relativity.DataExchange.Wrapper.Core/IImportClient.cs index 2d7943b..dc1e050 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IImportClient.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IImportClient.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { /// /// Represents an abstract client to create supported bulk artifact import jobs. diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IImportJob.cs b/Source/Relativity.DataExchange.Wrapper.Core/IImportJob.cs index 92c6f15..59a3be0 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IImportJob.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IImportJob.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { /// /// Represents an abstract import job. diff --git a/Source/Relativity.DataExchange.Wrapper.Core/IImportSettings.cs b/Source/Relativity.DataExchange.Wrapper.Core/IImportSettings.cs index e8a5653..a723eed 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/IImportSettings.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/IImportSettings.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System.Collections.Generic; using System.Text; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginFactory.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginFactory.cs index 189cd35..acede61 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginFactory.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginFactory.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginSearch.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginSearch.cs index 2a74d11..497d36f 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginSearch.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportClientPluginSearch.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections.Generic; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportCompleteEventArgs.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportCompleteEventArgs.cs index d0df93b..dd6fe8f 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportCompleteEventArgs.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportCompleteEventArgs.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportConnectionInfo.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportConnectionInfo.cs index 74a31a3..42c03b6 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportConnectionInfo.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportConnectionInfo.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportContext.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportContext.cs index cc223c4..1d7a0d6 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportContext.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportContext.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportErrorEventArgs.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportErrorEventArgs.cs index d4000a3..6153930 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportErrorEventArgs.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportErrorEventArgs.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportFatalExceptionEventArgs.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportFatalExceptionEventArgs.cs index a22296b..9bdea07 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportFatalExceptionEventArgs.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportFatalExceptionEventArgs.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportMessageEventArgs.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportMessageEventArgs.cs index 0f137a6..84a2210 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportMessageEventArgs.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportMessageEventArgs.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportProcessProgressEventArgs.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportProcessProgressEventArgs.cs index 42f7c65..95ae850 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportProcessProgressEventArgs.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportProcessProgressEventArgs.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportProgressEventArgs.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportProgressEventArgs.cs index 38da524..8da17c7 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportProgressEventArgs.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportProgressEventArgs.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/ImportSettingsBase.cs b/Source/Relativity.DataExchange.Wrapper.Core/ImportSettingsBase.cs index 972fefd..f079cc0 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/ImportSettingsBase.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/ImportSettingsBase.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections.Generic; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/PluginConfiguration.cs b/Source/Relativity.DataExchange.Wrapper.Core/PluginConfiguration.cs index 3e41489..01e1f67 100644 --- a/Source/Relativity.DataExchange.Wrapper.Core/PluginConfiguration.cs +++ b/Source/Relativity.DataExchange.Wrapper.Core/PluginConfiguration.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; diff --git a/Source/Relativity.DataExchange.Wrapper.Core/Relativity.DataExchange.Wrapper.Core.csproj b/Source/Relativity.DataExchange.Wrapper.Core/Relativity.Server.DataExchange.Wrapper.Core.csproj similarity index 100% rename from Source/Relativity.DataExchange.Wrapper.Core/Relativity.DataExchange.Wrapper.Core.csproj rename to Source/Relativity.DataExchange.Wrapper.Core/Relativity.Server.DataExchange.Wrapper.Core.csproj diff --git a/Source/Relativity.DataExchange.Wrapper.Legacy/Relativity.DataExchange.Wrapper.Legacy.csproj b/Source/Relativity.DataExchange.Wrapper.Legacy/Relativity.Server.DataExchange.Wrapper.Legacy.csproj similarity index 87% rename from Source/Relativity.DataExchange.Wrapper.Legacy/Relativity.DataExchange.Wrapper.Legacy.csproj rename to Source/Relativity.DataExchange.Wrapper.Legacy/Relativity.Server.DataExchange.Wrapper.Legacy.csproj index 22d7ba2..e1a3dfc 100644 --- a/Source/Relativity.DataExchange.Wrapper.Legacy/Relativity.DataExchange.Wrapper.Legacy.csproj +++ b/Source/Relativity.DataExchange.Wrapper.Legacy/Relativity.Server.DataExchange.Wrapper.Legacy.csproj @@ -101,16 +101,12 @@ ..\packages\Relativity.Import.Client.9.7.229.5\lib\net462\Relativity.DataTransfer.MessageService.dll - - ..\packages\Relativity.ObjectManager.9.7.229.5\lib\net462\Relativity.Kepler.dll + + ..\packages\Relativity.Server.Logging.SDK.3000.4.4\lib\net462\Relativity.Logging.dll True - - ..\packages\Relativity.Logging.9.4.317\lib\net462\Relativity.Logging.dll - True - - - ..\packages\Relativity.Logging.9.4.317\lib\net462\Relativity.Logging.Interfaces.dll + + ..\packages\Relativity.Server.Logging.Interfaces.SDK.3000.4.4\lib\net462\Relativity.Logging.Interfaces.dll True @@ -133,33 +129,17 @@ ..\packages\Relativity.OAuth2.Client.1.0.27\lib\net462\Relativity.OAuth2Client.Interfaces.dll True - - ..\packages\Relativity.ObjectManager.9.7.229.5\lib\net462\Relativity.Services.DataContracts.dll - True - - - ..\packages\Relativity.ObjectManager.9.7.229.5\lib\net462\Relativity.Services.Interfaces.dll - True - - - ..\packages\Relativity.ObjectManager.9.7.229.5\lib\net462\Relativity.Services.ServiceProxy.dll - True - ..\packages\Relativity.Telemetry.Client.9.4.164\lib\net462\Relativity.Telemetry.APM.dll - True ..\packages\Relativity.Telemetry.Client.9.4.164\lib\net462\Relativity.Telemetry.DataContracts.Shared.dll - True ..\packages\Relativity.Telemetry.Client.9.4.164\lib\net462\Relativity.Telemetry.MetricsCollection.dll - True ..\packages\Relativity.Telemetry.Client.9.4.164\lib\net462\Relativity.Telemetry.MetricsCollection.Interface.dll - True ..\packages\relativity.transfer.client.5.0.2\lib\net462\Relativity.Transfer.Client.dll @@ -220,9 +200,9 @@ - + {830b3fe2-1ef4-4aba-8a02-a15a0fadae51} - Relativity.DataExchange.Wrapper.Core + Relativity.Server.DataExchange.Wrapper.Core diff --git a/Source/Relativity.DataExchange.Wrapper.Legacy/packages.config b/Source/Relativity.DataExchange.Wrapper.Legacy/packages.config index 7df1001..7d5f37a 100644 --- a/Source/Relativity.DataExchange.Wrapper.Legacy/packages.config +++ b/Source/Relativity.DataExchange.Wrapper.Legacy/packages.config @@ -4,13 +4,13 @@ - - - + + + + - \ No newline at end of file diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/Relativity.DataExchange.Wrapper.Sdk.csproj b/Source/Relativity.DataExchange.Wrapper.Sdk/Relativity.Server.DataExchange.Wrapper.Sdk.csproj similarity index 62% rename from Source/Relativity.DataExchange.Wrapper.Sdk/Relativity.DataExchange.Wrapper.Sdk.csproj rename to Source/Relativity.DataExchange.Wrapper.Sdk/Relativity.Server.DataExchange.Wrapper.Sdk.csproj index 29dfc35..c19f2d0 100644 --- a/Source/Relativity.DataExchange.Wrapper.Sdk/Relativity.DataExchange.Wrapper.Sdk.csproj +++ b/Source/Relativity.DataExchange.Wrapper.Sdk/Relativity.Server.DataExchange.Wrapper.Sdk.csproj @@ -35,56 +35,57 @@ x64 + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\FaspManager.dll + ..\packages\Relativity.DataExchange.Client.SDK.1.5.0\lib\net462\FreeImageNET.dll - - ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Relativity.OutsideIn.2019.3.0\lib\net40\oi.dll + + ..\packages\Relativity.Server.OutsideIn.FI.Win32.SDK.2023.4.0\lib\net40\oi.dll ..\packages\Polly.5.3.1\lib\net45\Polly.dll - - ..\packages\Relativity.DataExchange.Client.SDK.1.5.0\lib\net462\Relativity.DataExchange.Client.SDK.dll + + ..\packages\Relativity.Server.Import.SDK.2.9.2\lib\net462\Relativity.DataExchange.Client.SDK.dll + + + ..\packages\Relativity.Server.DataTransfer.SDK.0.9.0\lib\net462\Relativity.DataTransfer.Legacy.SDK.dll ..\packages\Relativity.DataExchange.Client.SDK.1.5.0\lib\net462\Relativity.DataTransfer.MessageService.dll - - ..\packages\Relativity.ObjectManager.10.3.170.1\lib\net462\Relativity.Kepler.dll + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\Relativity.DataTransfer.Nodes.dll - - ..\packages\Relativity.Logging.2019.5.1\lib\net462\Relativity.Logging.dll + + ..\packages\Relativity.Server.Kepler.SDK.2.15.6\lib\net462\Relativity.Kepler.dll - - ..\packages\Relativity.Logging.2019.5.1\lib\net462\Relativity.Logging.Interfaces.dll + + ..\packages\Relativity.Server.Logging.Interfaces.SDK.3000.4.4\lib\net462\Relativity.Logging.Interfaces.dll + True - - ..\packages\Relativity.OAuth2.Client.1.0.27\lib\net462\Relativity.OAuth2Client.dll + + ..\packages\Relativity.Server.OAuth2.SDK.1.5.5\lib\net462\Relativity.OAuth2Client.dll - - ..\packages\Relativity.OAuth2.Client.1.0.27\lib\net462\Relativity.OAuth2Client.IdentityModel.dll + + ..\packages\Relativity.Server.OAuth2.SDK.1.5.5\lib\net462\Relativity.OAuth2Client.IdentityModel.dll - - ..\packages\Relativity.OAuth2.Client.1.0.27\lib\net462\Relativity.OAuth2Client.IdentityModel.Interfaces.dll + + ..\packages\Relativity.Server.OAuth2.Interfaces.SDK.1.5.5\lib\net462\Relativity.OAuth2Client.IdentityModel.Interfaces.dll ..\packages\Relativity.OAuth2.Client.1.0.27\lib\net462\Relativity.OAuth2Client.Implicit.dll - - ..\packages\Relativity.OAuth2.Client.1.0.27\lib\net462\Relativity.OAuth2Client.Interfaces.dll + + ..\packages\Relativity.Server.OAuth2.Interfaces.SDK.1.5.5\lib\net462\Relativity.OAuth2Client.Interfaces.dll - - ..\packages\Relativity.ObjectManager.10.3.170.1\lib\net462\Relativity.Services.DataContracts.dll + + ..\packages\Relativity.Server.Services.DataContracts.SDK.13.6.1\lib\net462\Relativity.Services.DataContracts.dll - - ..\packages\Relativity.ObjectManager.10.3.170.1\lib\net462\Relativity.Services.Interfaces.dll - - - ..\packages\Relativity.ObjectManager.10.3.170.1\lib\net462\Relativity.Services.ServiceProxy.dll + + ..\packages\Relativity.Server.Kepler.Client.SDK.2.15.6\lib\net462\Relativity.Services.ServiceProxy.dll ..\packages\Relativity.Telemetry.Client.9.4.164\lib\net462\Relativity.Telemetry.APM.dll @@ -98,20 +99,23 @@ ..\packages\Relativity.Telemetry.Client.9.4.164\lib\net462\Relativity.Telemetry.MetricsCollection.Interface.dll - - ..\packages\relativity.transfer.client.6.2.1\lib\net462\Relativity.Transfer.Client.dll + + ..\packages\Relativity.Server.Telemetry.Services.Interfaces.SDK.3003.0.2\lib\net462\Relativity.Telemetry.Services.Interface.dll + + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\Relativity.Transfer.Client.dll - - ..\packages\relativity.transfer.client.6.2.1\lib\net462\Relativity.Transfer.Client.Aspera.dll + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\Relativity.Transfer.Client.Aspera.dll - - ..\packages\relativity.transfer.client.6.2.1\lib\net462\Relativity.Transfer.Client.Core.dll + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\Relativity.Transfer.Client.Core.dll - - ..\packages\relativity.transfer.client.6.2.1\lib\net462\Relativity.Transfer.Client.FileShare.dll + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\Relativity.Transfer.Client.FileShare.dll - - ..\packages\relativity.transfer.client.6.2.1\lib\net462\Relativity.Transfer.Client.Http.dll + + ..\packages\Relativity.Server.Transfer.SDK.7.7.0\lib\net462\Relativity.Transfer.Client.Http.dll ..\packages\SSH.NET.2016.0.0\lib\net40\Renci.SshNet.dll @@ -132,12 +136,13 @@ - + {830b3fe2-1ef4-4aba-8a02-a15a0fadae51} - Relativity.DataExchange.Wrapper.Core + Relativity.Server.DataExchange.Wrapper.Core + @@ -163,9 +168,11 @@ + XCOPY "$(TargetDir)*" "$(SolutionDir)Plugins\Sdk\" /SY + \ No newline at end of file diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/app.config b/Source/Relativity.DataExchange.Wrapper.Sdk/app.config index f4e9bdb..7738ee5 100644 --- a/Source/Relativity.DataExchange.Wrapper.Sdk/app.config +++ b/Source/Relativity.DataExchange.Wrapper.Sdk/app.config @@ -1,4 +1,4 @@ - + @@ -14,6 +14,10 @@ + + + + \ No newline at end of file diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/cmmap000.bin b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/cmmap000.bin index 51bf7f5..763cae3 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/cmmap000.bin and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/cmmap000.bin differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/libchardet.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/libchardet.dll new file mode 100644 index 0000000..852bd65 Binary files /dev/null and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/libchardet.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.exe b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.exe index d62de29..171be24 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.exe and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.exe differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.jar b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.jar index daef413..4b5ef29 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.jar and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/oilink.jar differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccca-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccca-R1.dll index f33e26e..e29899b 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccca-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccca-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccch-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccch-R1.dll index 8ffec03..589fce9 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccch-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccch-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccda-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccda-R1.dll index c895725..46f9ff7 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccda-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccda-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccex-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccex-R1.dll index ece0c97..26cc555 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccex-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccex-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfa-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfa-R1.dll index 96f9972..0de2eea 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfa-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfa-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfi-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfi-R1.dll index d928adc..094890c 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfi-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfi-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfmt-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfmt-R1.dll index f0e3f64..9213096 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfmt-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfmt-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfnt-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfnt-R1.dll index 74be331..e3442bb 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfnt-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfnt-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfut-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfut-R1.dll index 7016874..9b92983 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfut-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccfut-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccind-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccind-R1.dll index 789e79e..5426dc6 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccind-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccind-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/scclo-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/scclo-R1.dll index 1787acb..a86fbb2 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/scclo-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/scclo-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccut-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccut-R1.dll index 071941e..acd224b 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccut-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/sccut-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/wvcore-R1.dll b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/wvcore-R1.dll index 11754f9..87863e7 100644 Binary files a/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/wvcore-R1.dll and b/Source/Relativity.DataExchange.Wrapper.Sdk/oi/unmanaged/wvcore-R1.dll differ diff --git a/Source/Relativity.DataExchange.Wrapper.Sdk/packages.config b/Source/Relativity.DataExchange.Wrapper.Sdk/packages.config index 03b4615..70414ee 100644 --- a/Source/Relativity.DataExchange.Wrapper.Sdk/packages.config +++ b/Source/Relativity.DataExchange.Wrapper.Sdk/packages.config @@ -1,14 +1,21 @@  - - - + + + + + + + + + + + - \ No newline at end of file diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportJob.cs b/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportJob.cs index b3ad605..2febaa3 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportJob.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportJob.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Data; diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportSettings.cs b/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportSettings.cs index 83598e9..027c2e7 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportSettings.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/BulkArtifactImportSettings.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { internal class BulkArtifactImportSettings : ImportSettings, IBulkArtifactImportSettings { diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportJob.cs b/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportJob.cs index 27c51a4..80cca62 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportJob.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportJob.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Data; diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportSettings.cs b/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportSettings.cs index 34f696d..cd05d29 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportSettings.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/ImageBulkArtifactImportSettings.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using kCura.Relativity.DataReaderClient; diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/ImportClient.cs b/Source/Relativity.DataExchange.Wrapper.Shared/ImportClient.cs index bfae240..6255ea1 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/ImportClient.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/ImportClient.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.ComponentModel.Composition; diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/ImportJobBase.cs b/Source/Relativity.DataExchange.Wrapper.Shared/ImportJobBase.cs index 55abf37..65e4448 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/ImportJobBase.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/ImportJobBase.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections; diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/ImportSettings.cs b/Source/Relativity.DataExchange.Wrapper.Shared/ImportSettings.cs index 2f94498..a36480d 100644 --- a/Source/Relativity.DataExchange.Wrapper.Shared/ImportSettings.cs +++ b/Source/Relativity.DataExchange.Wrapper.Shared/ImportSettings.cs @@ -1,4 +1,4 @@ -namespace Relativity.DataExchange.Wrapper +namespace Relativity.Server.DataExchange.Wrapper { using System; using System.Collections.Generic; diff --git a/Source/Relativity.DataExchange.Wrapper.Shared/Relativity.DataExchange.Wrapper.Shared.shproj b/Source/Relativity.DataExchange.Wrapper.Shared/Relativity.Server.DataExchange.Wrapper.Shared.shproj similarity index 100% rename from Source/Relativity.DataExchange.Wrapper.Shared/Relativity.DataExchange.Wrapper.Shared.shproj rename to Source/Relativity.DataExchange.Wrapper.Shared/Relativity.Server.DataExchange.Wrapper.Shared.shproj