diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs index a458d74e..bf672418 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs @@ -1,6 +1,6 @@ using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs index 3427f4de..de751549 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs @@ -3,7 +3,7 @@ using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs.EnvelopeHistory; using EnvelopeGenerator.Application.DTOs.Receiver; using EnvelopeGenerator.Domain.Entities; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeMailService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeMailService.cs index ee35c235..3544e3f9 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeMailService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeMailService.cs @@ -2,7 +2,7 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; namespace EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs index ececcbd9..2f566ea9 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs @@ -1,7 +1,7 @@ using DigitalData.Core.Abstractions; using DigitalData.UserManager.Application.DTOs.User; using EnvelopeGenerator.Application.DTOs.Receiver; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory; diff --git a/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs b/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs index 1c8fb830..298cd11c 100644 --- a/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs +++ b/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using MediatR; namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset; diff --git a/EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs b/EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs index 00f390a3..6d0289ae 100644 --- a/EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs +++ b/EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQuery.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; namespace EnvelopeGenerator.Application.EmailTemplates; diff --git a/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs b/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs index 6059ec33..1ab779f5 100644 --- a/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs +++ b/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs @@ -1,7 +1,7 @@ using AutoMapper; using EnvelopeGenerator.Application.Contracts.Repositories; using EnvelopeGenerator.Application.DTOs; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using MediatR; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj index b5776750..f92b52d7 100644 --- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj +++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj @@ -28,7 +28,7 @@ - + diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs b/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs index 5644d251..de6609b3 100644 --- a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs +++ b/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeResponse.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; namespace EnvelopeGenerator.Application.Envelopes.Queries.Read; diff --git a/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQuery.cs b/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQuery.cs index 7737edef..ddef527d 100644 --- a/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQuery.cs +++ b/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQuery.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using MediatR; using System.ComponentModel.DataAnnotations; diff --git a/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs b/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs index a0ff24ae..cb810a05 100644 --- a/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs +++ b/EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; namespace EnvelopeGenerator.Application.Histories.Queries.Read; diff --git a/EnvelopeGenerator.Application/Services/EmailTemplateService.cs b/EnvelopeGenerator.Application/Services/EmailTemplateService.cs index e8600544..932b43c7 100644 --- a/EnvelopeGenerator.Application/Services/EmailTemplateService.cs +++ b/EnvelopeGenerator.Application/Services/EmailTemplateService.cs @@ -3,7 +3,7 @@ using DigitalData.Core.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Contracts.Repositories; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using DigitalData.Core.DTO; using Microsoft.Extensions.Logging; using EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs index dc479812..7e64289a 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs @@ -2,7 +2,7 @@ using DigitalData.Core.Application; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Contracts.Repositories; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs.EnvelopeHistory; using EnvelopeGenerator.Application.DTOs.Receiver; diff --git a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs index d5e623bb..903ef094 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs @@ -4,10 +4,10 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts; using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut; using DigitalData.EmailProfilerDispatcher.Abstraction.Services; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using EnvelopeGenerator.Extensions; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly; using EnvelopeGenerator.Application.Configurations; diff --git a/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj b/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj index 4ae50c41..32c8d06b 100644 --- a/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj +++ b/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj @@ -100,8 +100,8 @@ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - ..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll + + ..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll @@ -350,9 +350,9 @@ - + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} - EnvelopeGenerator.Common + EnvelopeGenerator.CommonServices diff --git a/EnvelopeGenerator.BBTests/frmFinalizePDF.vb b/EnvelopeGenerator.BBTests/frmFinalizePDF.vb index d531f4e5..0c0a2d7e 100644 --- a/EnvelopeGenerator.BBTests/frmFinalizePDF.vb +++ b/EnvelopeGenerator.BBTests/frmFinalizePDF.vb @@ -2,9 +2,9 @@ Imports DigitalData.Modules.Logging Imports GdPicture14 Imports Newtonsoft.Json.Linq -Imports EnvelopeGenerator.Common.Jobs +Imports EnvelopeGenerator.CommonServices.Jobs Imports System.IO -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument Public Class frmFinalizePDF Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" diff --git a/EnvelopeGenerator.BBTests/frmReportViewer.vb b/EnvelopeGenerator.BBTests/frmReportViewer.vb index 183e5faf..b4898368 100644 --- a/EnvelopeGenerator.BBTests/frmReportViewer.vb +++ b/EnvelopeGenerator.BBTests/frmReportViewer.vb @@ -2,7 +2,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Config Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Public Class frmReportViewer Private LogConfig As LogConfig diff --git a/EnvelopeGenerator.Common/Config.vb b/EnvelopeGenerator.CommonServices/Config.vb similarity index 100% rename from EnvelopeGenerator.Common/Config.vb rename to EnvelopeGenerator.CommonServices/Config.vb diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj similarity index 99% rename from EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj rename to EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj index d663e47b..43fe29fd 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj @@ -7,8 +7,8 @@ AnyCPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} Library - EnvelopeGenerator.Common - EnvelopeGenerator.Common + EnvelopeGenerator.CommonServices + EnvelopeGenerator.CommonServices 512 Windows v4.6.2 @@ -23,7 +23,7 @@ true true bin\Debug\ - EnvelopeGenerator.Common.xml + EnvelopeGenerator.CommonServices.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -32,7 +32,7 @@ true true bin\Release\ - EnvelopeGenerator.Common.xml + EnvelopeGenerator.CommonServices.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 diff --git a/EnvelopeGenerator.Common/Helpers.vb b/EnvelopeGenerator.CommonServices/Helpers.vb similarity index 100% rename from EnvelopeGenerator.Common/Helpers.vb rename to EnvelopeGenerator.CommonServices/Helpers.vb diff --git a/EnvelopeGenerator.Common/Images/circle.svg b/EnvelopeGenerator.CommonServices/Images/circle.svg similarity index 100% rename from EnvelopeGenerator.Common/Images/circle.svg rename to EnvelopeGenerator.CommonServices/Images/circle.svg diff --git a/EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb b/EnvelopeGenerator.CommonServices/Jobs/APIBackendJobs/APIEnvelopeJob.vb similarity index 100% rename from EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb rename to EnvelopeGenerator.CommonServices/Jobs/APIBackendJobs/APIEnvelopeJob.vb diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentExceptions.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentExceptions.vb similarity index 100% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentExceptions.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentExceptions.vb diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb similarity index 99% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 978ebd12..37125c5f 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -5,8 +5,8 @@ Imports GdPicture14 Imports Quartz Imports System.Security.Cryptography Imports System.IO -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument Imports EnvelopeGenerator.Domain.Constants Imports DevExpress.DataProcessing Imports System.Data.SqlClient diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb similarity index 99% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb index b69d2b12..99cd34f1 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb @@ -4,7 +4,7 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports GdPicture14 Imports Newtonsoft.Json -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions Namespace Jobs.FinalizeDocument Public Class PDFBurner diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurnerParams.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurnerParams.vb similarity index 100% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurnerParams.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurnerParams.vb diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFMerger.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb similarity index 97% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFMerger.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb index b672bee3..207a916c 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFMerger.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb @@ -1,6 +1,6 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions Imports GdPicture14 Imports System.IO diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportCreator.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportCreator.vb similarity index 97% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportCreator.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportCreator.vb index aa0b8b8d..c8234188 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportCreator.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportCreator.vb @@ -1,7 +1,7 @@ Imports System.IO Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions Imports EnvelopeGenerator.Domain.Entities Public Class ReportCreator diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb similarity index 100% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportSource.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportSource.vb similarity index 100% rename from EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportSource.vb rename to EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportSource.vb diff --git a/EnvelopeGenerator.Common/Models/BaseModel.vb b/EnvelopeGenerator.CommonServices/Models/BaseModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/BaseModel.vb rename to EnvelopeGenerator.CommonServices/Models/BaseModel.vb diff --git a/EnvelopeGenerator.Common/Models/CertificateModel.vb b/EnvelopeGenerator.CommonServices/Models/CertificateModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/CertificateModel.vb rename to EnvelopeGenerator.CommonServices/Models/CertificateModel.vb diff --git a/EnvelopeGenerator.Common/Models/ChartModel.vb b/EnvelopeGenerator.CommonServices/Models/ChartModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ChartModel.vb rename to EnvelopeGenerator.CommonServices/Models/ChartModel.vb diff --git a/EnvelopeGenerator.Common/Models/ConfigModel.vb b/EnvelopeGenerator.CommonServices/Models/ConfigModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ConfigModel.vb rename to EnvelopeGenerator.CommonServices/Models/ConfigModel.vb diff --git a/EnvelopeGenerator.Common/Models/DbConfig.vb b/EnvelopeGenerator.CommonServices/Models/DbConfig.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/DbConfig.vb rename to EnvelopeGenerator.CommonServices/Models/DbConfig.vb diff --git a/EnvelopeGenerator.Common/Models/DocumentModel.vb b/EnvelopeGenerator.CommonServices/Models/DocumentModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/DocumentModel.vb rename to EnvelopeGenerator.CommonServices/Models/DocumentModel.vb diff --git a/EnvelopeGenerator.Common/Models/DocumentStatusModel.vb b/EnvelopeGenerator.CommonServices/Models/DocumentStatusModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/DocumentStatusModel.vb rename to EnvelopeGenerator.CommonServices/Models/DocumentStatusModel.vb diff --git a/EnvelopeGenerator.Common/Models/ElementModel.vb b/EnvelopeGenerator.CommonServices/Models/ElementModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ElementModel.vb rename to EnvelopeGenerator.CommonServices/Models/ElementModel.vb diff --git a/EnvelopeGenerator.Common/Models/ElementStatus.vb b/EnvelopeGenerator.CommonServices/Models/ElementStatus.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ElementStatus.vb rename to EnvelopeGenerator.CommonServices/Models/ElementStatus.vb diff --git a/EnvelopeGenerator.Common/Models/ElementStatusModel.vb b/EnvelopeGenerator.CommonServices/Models/ElementStatusModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ElementStatusModel.vb rename to EnvelopeGenerator.CommonServices/Models/ElementStatusModel.vb diff --git a/EnvelopeGenerator.Common/Models/EmailData.vb b/EnvelopeGenerator.CommonServices/Models/EmailData.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/EmailData.vb rename to EnvelopeGenerator.CommonServices/Models/EmailData.vb diff --git a/EnvelopeGenerator.Common/Models/EmailModel.vb b/EnvelopeGenerator.CommonServices/Models/EmailModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/EmailModel.vb rename to EnvelopeGenerator.CommonServices/Models/EmailModel.vb diff --git a/EnvelopeGenerator.Common/Models/EmailTemplateModel.vb b/EnvelopeGenerator.CommonServices/Models/EmailTemplateModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/EmailTemplateModel.vb rename to EnvelopeGenerator.CommonServices/Models/EmailTemplateModel.vb diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/EnvelopeModel.vb rename to EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb diff --git a/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb rename to EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.CommonServices/Models/HistoryModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/HistoryModel.vb rename to EnvelopeGenerator.CommonServices/Models/HistoryModel.vb diff --git a/EnvelopeGenerator.Common/Models/ReceiverModel.vb b/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ReceiverModel.vb rename to EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb diff --git a/EnvelopeGenerator.Common/Models/ReportModel.vb b/EnvelopeGenerator.CommonServices/Models/ReportModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/ReportModel.vb rename to EnvelopeGenerator.CommonServices/Models/ReportModel.vb diff --git a/EnvelopeGenerator.Common/Models/State.vb b/EnvelopeGenerator.CommonServices/Models/State.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/State.vb rename to EnvelopeGenerator.CommonServices/Models/State.vb diff --git a/EnvelopeGenerator.Common/Models/UserModel.vb b/EnvelopeGenerator.CommonServices/Models/UserModel.vb similarity index 100% rename from EnvelopeGenerator.Common/Models/UserModel.vb rename to EnvelopeGenerator.CommonServices/Models/UserModel.vb diff --git a/EnvelopeGenerator.Common/My Project/Application.Designer.vb b/EnvelopeGenerator.CommonServices/My Project/Application.Designer.vb similarity index 100% rename from EnvelopeGenerator.Common/My Project/Application.Designer.vb rename to EnvelopeGenerator.CommonServices/My Project/Application.Designer.vb diff --git a/EnvelopeGenerator.Common/My Project/Application.myapp b/EnvelopeGenerator.CommonServices/My Project/Application.myapp similarity index 100% rename from EnvelopeGenerator.Common/My Project/Application.myapp rename to EnvelopeGenerator.CommonServices/My Project/Application.myapp diff --git a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb b/EnvelopeGenerator.CommonServices/My Project/AssemblyInfo.vb similarity index 90% rename from EnvelopeGenerator.Common/My Project/AssemblyInfo.vb rename to EnvelopeGenerator.CommonServices/My Project/AssemblyInfo.vb index 36f52719..ba9d14ba 100644 --- a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb +++ b/EnvelopeGenerator.CommonServices/My Project/AssemblyInfo.vb @@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - + diff --git a/EnvelopeGenerator.Common/My Project/Resources.Designer.vb b/EnvelopeGenerator.CommonServices/My Project/Resources.Designer.vb similarity index 98% rename from EnvelopeGenerator.Common/My Project/Resources.Designer.vb rename to EnvelopeGenerator.CommonServices/My Project/Resources.Designer.vb index ce73cc42..50c0164f 100644 --- a/EnvelopeGenerator.Common/My Project/Resources.Designer.vb +++ b/EnvelopeGenerator.CommonServices/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/EnvelopeGenerator.Common/My Project/Resources.resx b/EnvelopeGenerator.CommonServices/My Project/Resources.resx similarity index 100% rename from EnvelopeGenerator.Common/My Project/Resources.resx rename to EnvelopeGenerator.CommonServices/My Project/Resources.resx diff --git a/EnvelopeGenerator.Common/My Project/Settings.Designer.vb b/EnvelopeGenerator.CommonServices/My Project/Settings.Designer.vb similarity index 95% rename from EnvelopeGenerator.Common/My Project/Settings.Designer.vb rename to EnvelopeGenerator.CommonServices/My Project/Settings.Designer.vb index 55633f64..f31c1d17 100644 --- a/EnvelopeGenerator.Common/My Project/Settings.Designer.vb +++ b/EnvelopeGenerator.CommonServices/My Project/Settings.Designer.vb @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.EnvelopeGenerator.Common.My.MySettings + Friend ReadOnly Property Settings() As Global.EnvelopeGenerator.CommonServices.My.MySettings Get - Return Global.EnvelopeGenerator.Common.My.MySettings.Default + Return Global.EnvelopeGenerator.CommonServices.My.MySettings.Default End Get End Property End Module diff --git a/EnvelopeGenerator.Common/My Project/Settings.settings b/EnvelopeGenerator.CommonServices/My Project/Settings.settings similarity index 100% rename from EnvelopeGenerator.Common/My Project/Settings.settings rename to EnvelopeGenerator.CommonServices/My Project/Settings.settings diff --git a/EnvelopeGenerator.Common/My Project/licenses.licx b/EnvelopeGenerator.CommonServices/My Project/licenses.licx similarity index 100% rename from EnvelopeGenerator.Common/My Project/licenses.licx rename to EnvelopeGenerator.CommonServices/My Project/licenses.licx diff --git a/EnvelopeGenerator.Common/README.txt b/EnvelopeGenerator.CommonServices/README.txt similarity index 100% rename from EnvelopeGenerator.Common/README.txt rename to EnvelopeGenerator.CommonServices/README.txt diff --git a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb b/EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.Designer.vb similarity index 99% rename from EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb rename to EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.Designer.vb index 8dcb555d..198fa860 100644 --- a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb +++ b/EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.Designer.vb @@ -653,7 +653,7 @@ Partial Public Class rptEnvelopeHistory 'ObjectDataSource1 ' Me.ObjectDataSource1.DataMember = "Items" - Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.Common.ReportSource) + Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.CommonServices.ReportSource) Me.ObjectDataSource1.Name = "ObjectDataSource1" ' 'rptEnvelopeHistory diff --git a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx b/EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.resx similarity index 100% rename from EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx rename to EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.resx diff --git a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.vb b/EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.vb similarity index 100% rename from EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.vb rename to EnvelopeGenerator.CommonServices/Reports/rptEnvelopeHistory.vb diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.CommonServices/Services/ActionService.vb similarity index 99% rename from EnvelopeGenerator.Common/Services/ActionService.vb rename to EnvelopeGenerator.CommonServices/Services/ActionService.vb index 6499b882..bab60075 100644 --- a/EnvelopeGenerator.Common/Services/ActionService.vb +++ b/EnvelopeGenerator.CommonServices/Services/ActionService.vb @@ -1,6 +1,6 @@ Imports EnvelopeGenerator.Domain.Entities Imports EnvelopeGenerator.Domain.Constants -Imports EnvelopeGenerator.Common.My.Resources +Imports EnvelopeGenerator.CommonServices.My.Resources Imports DigitalData.Modules.Database Public Class ActionService diff --git a/EnvelopeGenerator.Common/Services/BaseService.vb b/EnvelopeGenerator.CommonServices/Services/BaseService.vb similarity index 100% rename from EnvelopeGenerator.Common/Services/BaseService.vb rename to EnvelopeGenerator.CommonServices/Services/BaseService.vb diff --git a/EnvelopeGenerator.Common/Services/EmailService.vb b/EnvelopeGenerator.CommonServices/Services/EmailService.vb similarity index 100% rename from EnvelopeGenerator.Common/Services/EmailService.vb rename to EnvelopeGenerator.CommonServices/Services/EmailService.vb diff --git a/EnvelopeGenerator.Common/Services/HistoryService.vb b/EnvelopeGenerator.CommonServices/Services/HistoryService.vb similarity index 100% rename from EnvelopeGenerator.Common/Services/HistoryService.vb rename to EnvelopeGenerator.CommonServices/Services/HistoryService.vb diff --git a/EnvelopeGenerator.Common/Services/TemplateService.vb b/EnvelopeGenerator.CommonServices/Services/TemplateService.vb similarity index 100% rename from EnvelopeGenerator.Common/Services/TemplateService.vb rename to EnvelopeGenerator.CommonServices/Services/TemplateService.vb diff --git a/EnvelopeGenerator.Common/Strings/Email.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Email.Designer.vb similarity index 98% rename from EnvelopeGenerator.Common/Strings/Email.Designer.vb rename to EnvelopeGenerator.CommonServices/Strings/Email.Designer.vb index d7b93214..c01c19bc 100644 --- a/EnvelopeGenerator.Common/Strings/Email.Designer.vb +++ b/EnvelopeGenerator.CommonServices/Strings/Email.Designer.vb @@ -43,7 +43,7 @@ Namespace My.Resources Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.EmailAddress", GetType(Email).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.EmailAddress", GetType(Email).Assembly) resourceMan = temp End If Return resourceMan diff --git a/EnvelopeGenerator.Common/Strings/Email.en.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Email.en.Designer.vb similarity index 100% rename from EnvelopeGenerator.Common/Strings/Email.en.Designer.vb rename to EnvelopeGenerator.CommonServices/Strings/Email.en.Designer.vb diff --git a/EnvelopeGenerator.Common/Strings/Email.en.resx b/EnvelopeGenerator.CommonServices/Strings/Email.en.resx similarity index 100% rename from EnvelopeGenerator.Common/Strings/Email.en.resx rename to EnvelopeGenerator.CommonServices/Strings/Email.en.resx diff --git a/EnvelopeGenerator.Common/Strings/Email.resx b/EnvelopeGenerator.CommonServices/Strings/Email.resx similarity index 100% rename from EnvelopeGenerator.Common/Strings/Email.resx rename to EnvelopeGenerator.CommonServices/Strings/Email.resx diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Envelope.en.Designer.vb similarity index 100% rename from EnvelopeGenerator.Common/Strings/Envelope.en.Designer.vb rename to EnvelopeGenerator.CommonServices/Strings/Envelope.en.Designer.vb diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.CommonServices/Strings/Envelope.en.resx similarity index 100% rename from EnvelopeGenerator.Common/Strings/Envelope.en.resx rename to EnvelopeGenerator.CommonServices/Strings/Envelope.en.resx diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.CommonServices/Strings/Envelope.resx similarity index 100% rename from EnvelopeGenerator.Common/Strings/Envelope.resx rename to EnvelopeGenerator.CommonServices/Strings/Envelope.resx diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb similarity index 99% rename from EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb rename to EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb index ff1aa87e..a1b63a9a 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb @@ -43,7 +43,7 @@ Namespace My.Resources Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.Envelope", GetType(Envelope).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.Envelope", GetType(Envelope).Assembly) resourceMan = temp End If Return resourceMan diff --git a/EnvelopeGenerator.Common/Strings/Model.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb similarity index 99% rename from EnvelopeGenerator.Common/Strings/Model.Designer.vb rename to EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb index 1e008899..b121b4ef 100644 --- a/EnvelopeGenerator.Common/Strings/Model.Designer.vb +++ b/EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb @@ -43,7 +43,7 @@ Namespace My.Resources Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.Common.Model", GetType(Model).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EnvelopeGenerator.CommonServices.Model", GetType(Model).Assembly) resourceMan = temp End If Return resourceMan diff --git a/EnvelopeGenerator.Common/Strings/Model.en.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Model.en.Designer.vb similarity index 100% rename from EnvelopeGenerator.Common/Strings/Model.en.Designer.vb rename to EnvelopeGenerator.CommonServices/Strings/Model.en.Designer.vb diff --git a/EnvelopeGenerator.Common/Strings/Model.en.resx b/EnvelopeGenerator.CommonServices/Strings/Model.en.resx similarity index 100% rename from EnvelopeGenerator.Common/Strings/Model.en.resx rename to EnvelopeGenerator.CommonServices/Strings/Model.en.resx diff --git a/EnvelopeGenerator.Common/Strings/Model.resx b/EnvelopeGenerator.CommonServices/Strings/Model.resx similarity index 100% rename from EnvelopeGenerator.Common/Strings/Model.resx rename to EnvelopeGenerator.CommonServices/Strings/Model.resx diff --git a/EnvelopeGenerator.Common/Strings/Model.vb b/EnvelopeGenerator.CommonServices/Strings/Model.vb similarity index 100% rename from EnvelopeGenerator.Common/Strings/Model.vb rename to EnvelopeGenerator.CommonServices/Strings/Model.vb diff --git a/EnvelopeGenerator.Common/TempFiles.vb b/EnvelopeGenerator.CommonServices/TempFiles.vb similarity index 100% rename from EnvelopeGenerator.Common/TempFiles.vb rename to EnvelopeGenerator.CommonServices/TempFiles.vb diff --git a/EnvelopeGenerator.Common/Templates/document_access_code_de.html b/EnvelopeGenerator.CommonServices/Templates/document_access_code_de.html similarity index 100% rename from EnvelopeGenerator.Common/Templates/document_access_code_de.html rename to EnvelopeGenerator.CommonServices/Templates/document_access_code_de.html diff --git a/EnvelopeGenerator.Common/Templates/email_de.html b/EnvelopeGenerator.CommonServices/Templates/email_de.html similarity index 100% rename from EnvelopeGenerator.Common/Templates/email_de.html rename to EnvelopeGenerator.CommonServices/Templates/email_de.html diff --git a/EnvelopeGenerator.Common/app.config b/EnvelopeGenerator.CommonServices/app.config similarity index 100% rename from EnvelopeGenerator.Common/app.config rename to EnvelopeGenerator.CommonServices/app.config diff --git a/EnvelopeGenerator.Common/packages.config b/EnvelopeGenerator.CommonServices/packages.config similarity index 100% rename from EnvelopeGenerator.Common/packages.config rename to EnvelopeGenerator.CommonServices/packages.config diff --git a/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj b/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj index dbaad97c..8b155049 100644 --- a/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj +++ b/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj @@ -20,7 +20,7 @@ - + diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb index 99d18052..c3de3e35 100644 --- a/EnvelopeGenerator.Form/Controllers/BaseController.vb +++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb @@ -1,6 +1,6 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Imports System.Data.SqlClient Imports EnvelopeGenerator.Domain.Entities diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb index 28afe044..67b3d21e 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb @@ -2,8 +2,8 @@ Imports System.IO Imports DevExpress.XtraBars.Docking Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices +Imports EnvelopeGenerator.CommonServices.My Imports EnvelopeGenerator.Domain.Constants Imports EnvelopeGenerator.Domain.Entities diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb index a25fd5ec..721e399f 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb @@ -1,5 +1,5 @@ Imports DevExpress.XtraCharts -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Imports EnvelopeGenerator.Domain Public Class EnvelopeListController diff --git a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb index 467972bd..9a4009c9 100644 --- a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb @@ -1,5 +1,5 @@ Imports DevExpress.XtraPrinting.Native -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Imports GdPicture14.Annotations Imports EnvelopeGenerator.Domain Imports EnvelopeGenerator.Domain.Entities diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 9bd4516c..822e276e 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -498,13 +498,13 @@ - + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} - EnvelopeGenerator.Common + EnvelopeGenerator.CommonServices - + {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} - EnvelopeGenerator.Common + EnvelopeGenerator.CommonServices {4f32a98d-e6f0-4a09-bd97-1cf26107e837} diff --git a/EnvelopeGenerator.Form/ModuleSettings.vb b/EnvelopeGenerator.Form/ModuleSettings.vb index 28ddc37d..0075c7ff 100644 --- a/EnvelopeGenerator.Form/ModuleSettings.vb +++ b/EnvelopeGenerator.Form/ModuleSettings.vb @@ -1,6 +1,6 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Imports EnvelopeGenerator.Domain.Entities Module ModuleSettings diff --git a/EnvelopeGenerator.Form/frm2Factor_Properties.vb b/EnvelopeGenerator.Form/frm2Factor_Properties.vb index 87ed0463..0921ca46 100644 --- a/EnvelopeGenerator.Form/frm2Factor_Properties.vb +++ b/EnvelopeGenerator.Form/frm2Factor_Properties.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Database -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices.My Public Class frm2Factor_Properties Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click If MsgBox(Resources.Model.ResetTOTPUser, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index a3f5f703..aef10cf9 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -8,9 +8,9 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Imports EnvelopeGenerator.Domain -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices.My Imports GdPicture14 Imports EnvelopeGenerator.Domain.Constants Imports EnvelopeGenerator.Domain.Entities @@ -307,7 +307,7 @@ Partial Public Class frmEnvelopeEditor End If For Each Receiver In Receivers - If Common.Helpers.IsValidEmailAddress(Receiver.EmailAddress) = False Then + If CommonServices.Helpers.IsValidEmailAddress(Receiver.EmailAddress) = False Then oErrors.Add(String.Format(Resources.Envelope.Invalid_Email_Address, Receiver.Name)) End If Next @@ -596,7 +596,7 @@ Partial Public Class frmEnvelopeEditor End Sub Private Function CheckAccesscode(pRowHandle As Integer, pAccessCode As String) As Boolean If pAccessCode = "" Then - pAccessCode = Common.Helpers.GetAccessCode() + pAccessCode = CommonServices.Helpers.GetAccessCode() ViewReceivers.SetRowCellValue(pRowHandle, ViewReceivers.Columns.Item(COL_CODE), pAccessCode) End If End Function diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index 1233eac7..2c891414 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -1,5 +1,5 @@ -Imports EnvelopeGenerator.Common -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices +Imports EnvelopeGenerator.CommonServices.My Imports EnvelopeGenerator.Domain Imports System.ComponentModel Imports EnvelopeGenerator.Domain.Constants diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index 3dadc24b..92f0474a 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -2,8 +2,8 @@ Imports DevExpress.Utils.Svg Imports DevExpress.XtraBars Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices +Imports EnvelopeGenerator.CommonServices.My Imports EnvelopeGenerator.Domain.Constants Imports EnvelopeGenerator.Domain.Entities Imports GdPicture14 diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index fb2562e1..c1a152e4 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -8,8 +8,8 @@ Imports DevExpress.XtraSplashScreen Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices +Imports EnvelopeGenerator.CommonServices.My Imports System.ComponentModel Imports DevExpress.XtraPrinting Imports EnvelopeGenerator.Domain.Entities diff --git a/EnvelopeGenerator.Form/frmRueckruf.vb b/EnvelopeGenerator.Form/frmRueckruf.vb index 1690fb4f..834fa7ee 100644 --- a/EnvelopeGenerator.Form/frmRueckruf.vb +++ b/EnvelopeGenerator.Form/frmRueckruf.vb @@ -1,4 +1,4 @@ -Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.CommonServices.My Public Class frmRueckruf diff --git a/EnvelopeGenerator.Form/frmSplashScreen.vb b/EnvelopeGenerator.Form/frmSplashScreen.vb index 64e3827a..12ccbe54 100644 --- a/EnvelopeGenerator.Form/frmSplashScreen.vb +++ b/EnvelopeGenerator.Form/frmSplashScreen.vb @@ -5,7 +5,7 @@ Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.CommonServices Imports System.ComponentModel Public Class frmSplashScreen diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs index b6051a9b..28245c90 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs @@ -5,7 +5,7 @@ using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Memory; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.GeneratorAPI.Controllers; diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/LocalizationController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/LocalizationController.cs index b0919211..e37d1f68 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/LocalizationController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/LocalizationController.cs @@ -1,6 +1,6 @@ using DigitalData.Core.API; using EnvelopeGenerator.Application.Resources; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Memory; diff --git a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj index 772914e5..088c954e 100644 --- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj +++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj @@ -56,7 +56,7 @@ - + diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs index 1417fa39..836b7d98 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs @@ -3,7 +3,7 @@ using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Contracts.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.Infrastructure.Repositories; diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs index 85d29c88..3993ce3f 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs @@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Contracts.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Http.HttpResults; using EnvelopeGenerator.Application.Exceptions; -using EnvelopeGenerator.Common.My.Resources; +using EnvelopeGenerator.CommonServices.My.Resources; namespace EnvelopeGenerator.Infrastructure.Repositories; diff --git a/EnvelopeGenerator.Service/Config.vb b/EnvelopeGenerator.Service/Config.vb index fd572b5e..98fc49f8 100644 --- a/EnvelopeGenerator.Service/Config.vb +++ b/EnvelopeGenerator.Service/Config.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Config.ConfigAttributes -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument Public Class Config diff --git a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj index 1c195651..a63270df 100644 --- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj +++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj @@ -321,9 +321,9 @@ - + {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} - EnvelopeGenerator.Common + EnvelopeGenerator.CommonServices diff --git a/EnvelopeGenerator.Service/Scheduler_Envelopetask_API.vb b/EnvelopeGenerator.Service/Scheduler_Envelopetask_API.vb index d5cd3428..4616fa82 100644 --- a/EnvelopeGenerator.Service/Scheduler_Envelopetask_API.vb +++ b/EnvelopeGenerator.Service/Scheduler_Envelopetask_API.vb @@ -2,8 +2,8 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common.Jobs -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument +Imports EnvelopeGenerator.CommonServices.Jobs +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument Imports Quartz Public Class Scheduler_Envelopetask_API Inherits BaseClass diff --git a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb index 9bd10a06..7293dd07 100644 --- a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb +++ b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb @@ -2,8 +2,8 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common.Jobs -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument +Imports EnvelopeGenerator.CommonServices.Jobs +Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument Imports Quartz Public Class Scheduler_FinishEnvelope diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs index c343ddc9..0670c5af 100644 --- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs +++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using EnvelopeGenerator.Web.Services; using Microsoft.AspNetCore.Authorization; using EnvelopeGenerator.Extensions; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using EnvelopeGenerator.Application.Contracts.Services; namespace EnvelopeGenerator.Web.Controllers diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs index ce2da2bc..16a37dc2 100644 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs @@ -1,10 +1,10 @@ using DigitalData.Core.DTO; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using EnvelopeGenerator.Web.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Text.Encodings.Web; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using EnvelopeGenerator.Extensions; using EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index f9e1843e..d2a6531b 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using EnvelopeGenerator.Web.Services; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication; @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Localization; using EnvelopeGenerator.Web.Models; using EnvelopeGenerator.Application.Resources; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using Ganss.Xss; using Newtonsoft.Json; using EnvelopeGenerator.Application.DTOs; diff --git a/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs b/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs index 420af20c..fd79de28 100644 --- a/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs +++ b/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs @@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.Web.Controllers { diff --git a/EnvelopeGenerator.Web/Controllers/TFARegController.cs b/EnvelopeGenerator.Web/Controllers/TFARegController.cs index 97132f76..a0f87ce3 100644 --- a/EnvelopeGenerator.Web/Controllers/TFARegController.cs +++ b/EnvelopeGenerator.Web/Controllers/TFARegController.cs @@ -8,7 +8,7 @@ using DigitalData.Core.DTO; using EnvelopeGenerator.Application.Extensions; using Microsoft.Extensions.Options; using Microsoft.AspNetCore.Authorization; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication; using EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs index 47a943f1..c08c0714 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs @@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Contracts.Services; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using Microsoft.AspNetCore.Mvc; -using static EnvelopeGenerator.Common.Constants; +using static EnvelopeGenerator.CommonServices.Constants; namespace EnvelopeGenerator.Web.Controllers.Test { diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs index 6c534d6f..a71dfb64 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using EnvelopeGenerator.Web.Services; using Microsoft.AspNetCore.Mvc; diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj index 7ec3de22..0eafa530 100644 --- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj +++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj @@ -2136,7 +2136,7 @@ - + diff --git a/EnvelopeGenerator.Web/Services/DatabaseService.cs b/EnvelopeGenerator.Web/Services/DatabaseService.cs index d27a4101..98674029 100644 --- a/EnvelopeGenerator.Web/Services/DatabaseService.cs +++ b/EnvelopeGenerator.Web/Services/DatabaseService.cs @@ -1,7 +1,7 @@ using DigitalData.Modules.Database; using DigitalData.Modules.Logging; using EnvelopeGenerator.Application; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; namespace EnvelopeGenerator.Web.Services { diff --git a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs index d576bbb1..8a1cc26d 100644 --- a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs +++ b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs @@ -1,5 +1,5 @@ using EnvelopeGenerator.Application.Contracts.Services; -using EnvelopeGenerator.Common; +using EnvelopeGenerator.CommonServices; using System.Text; namespace EnvelopeGenerator.Web.Services diff --git a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml index ba6773b8..cedcd8cd 100644 --- a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml +++ b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml @@ -1,5 +1,5 @@ -@using EnvelopeGenerator.Common; -@using static EnvelopeGenerator.Common.Constants; +@using EnvelopeGenerator.CommonServices; +@using static EnvelopeGenerator.CommonServices.Constants; @{ ViewData["Title"] = "Debug"; } diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln index 4c8aa8c9..3d36de3a 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -7,7 +7,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.BBTests", EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.Form", "EnvelopeGenerator.Form\EnvelopeGenerator.Form.vbproj", "{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.Common", "EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj", "{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.CommonServices", "EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj", "{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.Web", "EnvelopeGenerator.Web\EnvelopeGenerator.Web.csproj", "{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}" EndProject