diff --git a/Elsa.sln b/Elsa.sln index 239e86f9b..6a5b15d52 100644 --- a/Elsa.sln +++ b/Elsa.sln @@ -62,7 +62,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bundles", "bundles", "{F06B EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Liquid", "src\modules\Elsa.Liquid\Elsa.Liquid.csproj", "{8E5BD3D9-3529-48BC-B741-CFB7A69DB233}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.ProtoActor", "src\modules\Elsa.ProtoActor\Elsa.ProtoActor.csproj", "{B2049499-D384-46DF-8837-F1180107DD54}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Workflows.Runtime.ProtoActor", "src\modules\Elsa.Workflows.Runtime.ProtoActor\Elsa.Workflows.Runtime.ProtoActor.csproj", "{B2049499-D384-46DF-8837-F1180107DD54}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Dsl", "src\modules\Elsa.Dsl\Elsa.Dsl.csproj", "{78DAB791-8595-4612-8E9E-2248AF5B1862}" EndProject @@ -916,7 +916,6 @@ Global {C9539BD8-D2AE-4A8D-8281-71A05B3FBF31} = {B08B4E00-C2AB-48F3-8389-449F42AEF179} {169E2C9B-6687-427F-A278-30BF849BFEDC} = {B08B4E00-C2AB-48F3-8389-449F42AEF179} {2DD5D66B-85E9-4AF9-911C-C9F963234159} = {B08B4E00-C2AB-48F3-8389-449F42AEF179} - {8A050229-DB79-4E0B-9AFF-7565E87F2954} = {B08B4E00-C2AB-48F3-8389-449F42AEF179} {C237BA1A-3A7D-4AB2-BE09-2696F3C082A4} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09} {80529478-A383-4FEA-B744-C71264969E9A} = {6EF07978-A6D2-40EB-891D-7D70C5F37E76} {39CD855E-83B1-4A96-93F7-01608211EBE3} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09} @@ -1029,7 +1028,6 @@ Global {CBB515F3-A0EF-43B5-A907-FD4E652DD66E} = {90031D64-CA0F-46D0-9AF4-8DC023A5FFCD} {90CD37A9-C866-4D90-A3B1-8C87F53B845E} = {CBB515F3-A0EF-43B5-A907-FD4E652DD66E} {56CAA9F2-1882-4EFA-BAC0-9C3D804553F1} = {18453B51-25EB-4317-A4B3-B10518252E92} - {0D4A88A1-8AEE-49ED-BC2E-ED68C96F60AD} = {B08B4E00-C2AB-48F3-8389-449F42AEF179} {5CBCBEA4-6038-48CA-B45D-C1D0F6B4ACA4} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09} {94A61AD7-2A2B-40DB-81F3-C59D596958A8} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09} {4B598AF7-BD7D-4544-A274-2CDDD98F4167} = {C6658DE0-2B2F-47F0-BB61-2CA66D435C09} @@ -1046,6 +1044,8 @@ Global {060FD0BA-BD78-48E1-A8A7-4906A5AD5E39} = {D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1} {169A82A5-2DB3-40EA-801E-14C08D743DF7} = {D92BEAB2-60D6-4BB4-885A-6BA681C6CCF1} {2CDF3E1C-267D-4198-B1C7-7E1F548FC120} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79} + {8A050229-DB79-4E0B-9AFF-7565E87F2954} = {58C59255-281C-4595-8732-808158F1DC6E} + {0D4A88A1-8AEE-49ED-BC2E-ED68C96F60AD} = {58C59255-281C-4595-8732-808158F1DC6E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4B5CEAA-7D70-4FCB-A68E-B03FBE5E0E5E} diff --git a/samples/aspnet/Elsa.Samples.AspNet.DocumentApproval/Elsa.Samples.AspNet.DocumentApproval.csproj b/samples/aspnet/Elsa.Samples.AspNet.DocumentApproval/Elsa.Samples.AspNet.DocumentApproval.csproj index fd40331b1..743401f5a 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.DocumentApproval/Elsa.Samples.AspNet.DocumentApproval.csproj +++ b/samples/aspnet/Elsa.Samples.AspNet.DocumentApproval/Elsa.Samples.AspNet.DocumentApproval.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps.csproj b/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps.csproj index 3c143843c..ea96d3b37 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps.csproj +++ b/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Program.cs b/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Program.cs index 1bf4a41f5..75cd27d25 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Program.cs +++ b/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Program.cs @@ -3,7 +3,7 @@ using Elsa.EntityFrameworkCore.Modules.Labels; using Elsa.EntityFrameworkCore.Modules.Management; using Elsa.EntityFrameworkCore.Modules.Runtime; using Elsa.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Google.Protobuf.WellKnownTypes; using Microsoft.Data.Sqlite; using Proto.Cluster.AzureContainerApps; diff --git a/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime/Elsa.Samples.AspNet.ProtoActorRuntime.csproj b/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime/Elsa.Samples.AspNet.ProtoActorRuntime.csproj index 8b29c3296..ab72186e6 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime/Elsa.Samples.AspNet.ProtoActorRuntime.csproj +++ b/samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime/Elsa.Samples.AspNet.ProtoActorRuntime.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/aspnet/Elsa.Samples.AspNet.TelnyxIntegration/Elsa.Samples.AspNet.TelnyxIntegration.csproj b/samples/aspnet/Elsa.Samples.AspNet.TelnyxIntegration/Elsa.Samples.AspNet.TelnyxIntegration.csproj index 810872248..baa41ac24 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.TelnyxIntegration/Elsa.Samples.AspNet.TelnyxIntegration.csproj +++ b/samples/aspnet/Elsa.Samples.AspNet.TelnyxIntegration/Elsa.Samples.AspNet.TelnyxIntegration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj index 1e3e878f0..e956af634 100644 --- a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj +++ b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj index 82ae19ecf..da92e4dec 100644 --- a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj +++ b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/modules/Elsa.Http/Elsa.Http.csproj b/src/modules/Elsa.Http/Elsa.Http.csproj index 95f066cc2..443c49132 100644 --- a/src/modules/Elsa.Http/Elsa.Http.csproj +++ b/src/modules/Elsa.Http/Elsa.Http.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/modules/Elsa.ProtoActor/Actors/WorkflowInstanceImpl.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Actors/WorkflowInstanceImpl.cs similarity index 98% rename from src/modules/Elsa.ProtoActor/Actors/WorkflowInstanceImpl.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Actors/WorkflowInstanceImpl.cs index 0e4a85e93..6b37bd907 100644 --- a/src/modules/Elsa.ProtoActor/Actors/WorkflowInstanceImpl.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Actors/WorkflowInstanceImpl.cs @@ -1,18 +1,17 @@ -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; using Elsa.Workflows.Contracts; using Elsa.Workflows.Management; using Elsa.Workflows.Management.Entities; using Elsa.Workflows.Management.Options; using Elsa.Workflows.Models; using Elsa.Workflows.Options; -using Elsa.Workflows.Runtime; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.State; using Microsoft.Extensions.DependencyInjection; using Proto; using Proto.Cluster; -namespace Elsa.ProtoActor.Actors; +namespace Elsa.Workflows.Runtime.ProtoActor.Actors; internal class WorkflowInstanceImpl( IContext context, diff --git a/src/modules/Elsa.ProtoActor/Elsa.ProtoActor.csproj b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Elsa.Workflows.Runtime.ProtoActor.csproj similarity index 100% rename from src/modules/Elsa.ProtoActor/Elsa.ProtoActor.csproj rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Elsa.Workflows.Runtime.ProtoActor.csproj diff --git a/src/modules/Elsa.ProtoActor/Extensions/ClusterExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ClusterExtensions.cs similarity index 88% rename from src/modules/Elsa.ProtoActor/Extensions/ClusterExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ClusterExtensions.cs index 2f46c7a2a..7dcea5728 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/ClusterExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ClusterExtensions.cs @@ -1,4 +1,4 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Proto.Cluster; // ReSharper disable once CheckNamespace diff --git a/src/modules/Elsa.ProtoActor/Extensions/PersistenceExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/PersistenceExtensions.cs similarity index 96% rename from src/modules/Elsa.ProtoActor/Extensions/PersistenceExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/PersistenceExtensions.cs index 1330f8b0b..33b876f5d 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/PersistenceExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/PersistenceExtensions.cs @@ -1,6 +1,6 @@ using Proto.Persistence; -namespace Elsa.ProtoActor.Extensions; +namespace Elsa.Workflows.Runtime.ProtoActor.Extensions; internal static class PersistenceExtensions { diff --git a/src/modules/Elsa.ProtoActor/Extensions/ProtoInputExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoInputExtensions.cs similarity index 77% rename from src/modules/Elsa.ProtoActor/Extensions/ProtoInputExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoInputExtensions.cs index 882cc8502..40fb20748 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/ProtoInputExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoInputExtensions.cs @@ -1,6 +1,6 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; -namespace Elsa.ProtoActor.Extensions; +namespace Elsa.Workflows.Runtime.ProtoActor.Extensions; internal static class ProtoInputExtensions { diff --git a/src/modules/Elsa.ProtoActor/Extensions/ProtoJsonMapExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoJsonMapExtensions.cs similarity index 88% rename from src/modules/Elsa.ProtoActor/Extensions/ProtoJsonMapExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoJsonMapExtensions.cs index 48f4ebcba..86bbefe46 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/ProtoJsonMapExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoJsonMapExtensions.cs @@ -1,9 +1,9 @@ using System.Text.Json; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Serialization.Converters; using Google.Protobuf.Collections; -namespace Elsa.ProtoActor.Extensions; +namespace Elsa.Workflows.Runtime.ProtoActor.Extensions; internal static class ProtoJsonMapExtensions { diff --git a/src/modules/Elsa.ProtoActor/Extensions/ProtoPropertiesExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoPropertiesExtensions.cs similarity index 79% rename from src/modules/Elsa.ProtoActor/Extensions/ProtoPropertiesExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoPropertiesExtensions.cs index abf03ef98..21e61d10f 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/ProtoPropertiesExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoPropertiesExtensions.cs @@ -1,6 +1,6 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; -namespace Elsa.ProtoActor.Extensions; +namespace Elsa.Workflows.Runtime.ProtoActor.Extensions; internal static class ProtoPropertiesExtensions { diff --git a/src/modules/Elsa.ProtoActor/Extensions/ProtoStringExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoStringExtensions.cs similarity index 79% rename from src/modules/Elsa.ProtoActor/Extensions/ProtoStringExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoStringExtensions.cs index 75feccca5..f7efd8abd 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/ProtoStringExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/ProtoStringExtensions.cs @@ -1,4 +1,4 @@ -namespace Elsa.ProtoActor.Extensions; +namespace Elsa.Workflows.Runtime.ProtoActor.Extensions; internal static class ProtoStringExtensions { diff --git a/src/modules/Elsa.ProtoActor/Extensions/WorkflowRuntimeFeatureExtensions.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/WorkflowRuntimeFeatureExtensions.cs similarity index 92% rename from src/modules/Elsa.ProtoActor/Extensions/WorkflowRuntimeFeatureExtensions.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/WorkflowRuntimeFeatureExtensions.cs index fec61080b..1767535e0 100644 --- a/src/modules/Elsa.ProtoActor/Extensions/WorkflowRuntimeFeatureExtensions.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Extensions/WorkflowRuntimeFeatureExtensions.cs @@ -1,4 +1,4 @@ -using Elsa.ProtoActor.Features; +using Elsa.Workflows.Runtime.ProtoActor.Features; using Elsa.Workflows.Runtime.Features; using JetBrains.Annotations; diff --git a/src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Features/ProtoActorFeature.cs similarity index 95% rename from src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Features/ProtoActorFeature.cs index 738993f03..b7551f762 100644 --- a/src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Features/ProtoActorFeature.cs @@ -1,13 +1,13 @@ using Elsa.Features.Abstractions; using Elsa.Features.Attributes; using Elsa.Features.Services; -using Elsa.ProtoActor.Actors; -using Elsa.ProtoActor.HostedServices; -using Elsa.ProtoActor.Mappers; -using Elsa.ProtoActor.ProtoBuf; -using Elsa.ProtoActor.Services; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Features; using Elsa.Workflows.Runtime.Features; +using Elsa.Workflows.Runtime.ProtoActor.Actors; +using Elsa.Workflows.Runtime.ProtoActor.HostedServices; +using Elsa.Workflows.Runtime.ProtoActor.Mappers; +using Elsa.Workflows.Runtime.ProtoActor.Services; using Google.Protobuf.WellKnownTypes; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -21,7 +21,7 @@ using Proto.Persistence; using Proto.Remote; using Proto.Remote.GrpcNet; -namespace Elsa.ProtoActor.Features; +namespace Elsa.Workflows.Runtime.ProtoActor.Features; /// Installs the Proto Actor feature to host & execute workflow instances. [DependsOn(typeof(WorkflowsFeature))] diff --git a/src/modules/Elsa.ProtoActor/FodyWeavers.xml b/src/modules/Elsa.Workflows.Runtime.ProtoActor/FodyWeavers.xml similarity index 100% rename from src/modules/Elsa.ProtoActor/FodyWeavers.xml rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/FodyWeavers.xml diff --git a/src/modules/Elsa.ProtoActor/HostedServices/WorkflowSystemHost.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/HostedServices/WorkflowSystemHost.cs similarity index 94% rename from src/modules/Elsa.ProtoActor/HostedServices/WorkflowSystemHost.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/HostedServices/WorkflowSystemHost.cs index dd4ba771e..a2ece1529 100644 --- a/src/modules/Elsa.ProtoActor/HostedServices/WorkflowSystemHost.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/HostedServices/WorkflowSystemHost.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Hosting; using Proto; using Proto.Cluster; -namespace Elsa.ProtoActor.HostedServices; +namespace Elsa.Workflows.Runtime.ProtoActor.HostedServices; /// /// Starts the current member in the cluster. diff --git a/src/modules/Elsa.ProtoActor/Mappers/ActivityHandleMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityHandleMapper.cs similarity index 90% rename from src/modules/Elsa.ProtoActor/Mappers/ActivityHandleMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityHandleMapper.cs index 685b89a4b..6376a3a10 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/ActivityHandleMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityHandleMapper.cs @@ -1,8 +1,8 @@ -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; using Elsa.Workflows.Models; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to . diff --git a/src/modules/Elsa.ProtoActor/Mappers/ActivityIncidentMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityIncidentMapper.cs similarity index 94% rename from src/modules/Elsa.ProtoActor/Mappers/ActivityIncidentMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityIncidentMapper.cs index 2a3fa73e9..d6d5e634b 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/ActivityIncidentMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityIncidentMapper.cs @@ -1,7 +1,7 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Models; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to . diff --git a/src/modules/Elsa.ProtoActor/Mappers/ActivityIncidentStateMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityIncidentStateMapper.cs similarity index 95% rename from src/modules/Elsa.ProtoActor/Mappers/ActivityIncidentStateMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityIncidentStateMapper.cs index c5e4dcdee..4ff0f7250 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/ActivityIncidentStateMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ActivityIncidentStateMapper.cs @@ -1,7 +1,7 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Models; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps between and . diff --git a/src/modules/Elsa.ProtoActor/Mappers/CreateAndRunWorkflowInstanceRequestMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateAndRunWorkflowInstanceRequestMapper.cs similarity index 93% rename from src/modules/Elsa.ProtoActor/Mappers/CreateAndRunWorkflowInstanceRequestMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateAndRunWorkflowInstanceRequestMapper.cs index 02c2fe7a5..70bb78dfc 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/CreateAndRunWorkflowInstanceRequestMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateAndRunWorkflowInstanceRequestMapper.cs @@ -1,8 +1,8 @@ -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Runtime.Messages; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to and vice versa. diff --git a/src/modules/Elsa.ProtoActor/Mappers/CreateWorkflowInstanceRequestMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateWorkflowInstanceRequestMapper.cs similarity index 92% rename from src/modules/Elsa.ProtoActor/Mappers/CreateWorkflowInstanceRequestMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateWorkflowInstanceRequestMapper.cs index 66c6c70ad..fd34cca26 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/CreateWorkflowInstanceRequestMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateWorkflowInstanceRequestMapper.cs @@ -1,8 +1,8 @@ -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Runtime.Messages; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to and vice versa. diff --git a/src/modules/Elsa.ProtoActor/Mappers/CreateWorkflowInstanceResponseMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateWorkflowInstanceResponseMapper.cs similarity index 90% rename from src/modules/Elsa.ProtoActor/Mappers/CreateWorkflowInstanceResponseMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateWorkflowInstanceResponseMapper.cs index 070919196..166439769 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/CreateWorkflowInstanceResponseMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/CreateWorkflowInstanceResponseMapper.cs @@ -1,7 +1,7 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Runtime.Messages; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to and vice versa. diff --git a/src/modules/Elsa.ProtoActor/Mappers/ExceptionMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ExceptionMapper.cs similarity index 88% rename from src/modules/Elsa.ProtoActor/Mappers/ExceptionMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ExceptionMapper.cs index 39a1b3d21..b79cc594c 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/ExceptionMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/ExceptionMapper.cs @@ -1,7 +1,7 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.State; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; public class ExceptionMapper { diff --git a/src/modules/Elsa.ProtoActor/Mappers/Mappers.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/Mappers.cs similarity index 97% rename from src/modules/Elsa.ProtoActor/Mappers/Mappers.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/Mappers.cs index af9a20f06..cd690a881 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/Mappers.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/Mappers.cs @@ -1,10 +1,9 @@ -using Elsa.ProtoActor.ProtoBuf; -using Elsa.Workflows; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Models; using Elsa.Workflows.Runtime.Messages; using Elsa.Workflows.State; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Contains all mappers used by the ProtoActor implementation. diff --git a/src/modules/Elsa.ProtoActor/Mappers/RunWorkflowInstanceRequestMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowInstanceRequestMapper.cs similarity index 90% rename from src/modules/Elsa.ProtoActor/Mappers/RunWorkflowInstanceRequestMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowInstanceRequestMapper.cs index e0f9eab18..0376e2792 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/RunWorkflowInstanceRequestMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowInstanceRequestMapper.cs @@ -1,8 +1,8 @@ -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Runtime.Messages; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to and vice versa. diff --git a/src/modules/Elsa.ProtoActor/Mappers/RunWorkflowInstanceResponseMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowInstanceResponseMapper.cs similarity index 94% rename from src/modules/Elsa.ProtoActor/Mappers/RunWorkflowInstanceResponseMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowInstanceResponseMapper.cs index 0bc2de5e8..692b6d706 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/RunWorkflowInstanceResponseMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowInstanceResponseMapper.cs @@ -1,9 +1,9 @@ using Elsa.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Models; using Elsa.Workflows.Runtime.Messages; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to and vice versa. diff --git a/src/modules/Elsa.ProtoActor/Mappers/RunWorkflowParamsMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowParamsMapper.cs similarity index 76% rename from src/modules/Elsa.ProtoActor/Mappers/RunWorkflowParamsMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowParamsMapper.cs index d63b0544c..cbd16441c 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/RunWorkflowParamsMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/RunWorkflowParamsMapper.cs @@ -1,19 +1,13 @@ -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; using Elsa.Workflows.Options; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; -/// /// Maps to . -/// public class RunWorkflowParamsMapper(ActivityHandleMapper activityHandleMapper) { - /// /// Maps to . - /// - /// - /// public RunWorkflowOptions Map(ProtoRunWorkflowInstanceRequest source) { return new() diff --git a/src/modules/Elsa.ProtoActor/Mappers/WorkflowDefinitionHandleMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowDefinitionHandleMapper.cs similarity index 89% rename from src/modules/Elsa.ProtoActor/Mappers/WorkflowDefinitionHandleMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowDefinitionHandleMapper.cs index 71088bd66..176c96db5 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/WorkflowDefinitionHandleMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowDefinitionHandleMapper.cs @@ -1,9 +1,9 @@ using Elsa.Common.Models; -using Elsa.ProtoActor.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.Extensions; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Models; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps to and vice versa. diff --git a/src/modules/Elsa.ProtoActor/Mappers/WorkflowStateJsonMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowStateJsonMapper.cs similarity index 89% rename from src/modules/Elsa.ProtoActor/Mappers/WorkflowStateJsonMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowStateJsonMapper.cs index 3dd7b1442..0b102800e 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/WorkflowStateJsonMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowStateJsonMapper.cs @@ -1,8 +1,8 @@ -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Contracts; using Elsa.Workflows.State; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; /// /// Maps between and . diff --git a/src/modules/Elsa.ProtoActor/Mappers/WorkflowStatusMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowStatusMapper.cs similarity index 88% rename from src/modules/Elsa.ProtoActor/Mappers/WorkflowStatusMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowStatusMapper.cs index 81fc51e68..4df44bf82 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/WorkflowStatusMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowStatusMapper.cs @@ -1,7 +1,6 @@ -using Elsa.ProtoActor.ProtoBuf; -using Elsa.Workflows; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; public class WorkflowStatusMapper { diff --git a/src/modules/Elsa.ProtoActor/Mappers/WorkflowSubStatusMapper.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowSubStatusMapper.cs similarity index 93% rename from src/modules/Elsa.ProtoActor/Mappers/WorkflowSubStatusMapper.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowSubStatusMapper.cs index aedcac3a8..cc3759b76 100644 --- a/src/modules/Elsa.ProtoActor/Mappers/WorkflowSubStatusMapper.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Mappers/WorkflowSubStatusMapper.cs @@ -1,7 +1,6 @@ -using Elsa.ProtoActor.ProtoBuf; -using Elsa.Workflows; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; -namespace Elsa.ProtoActor.Mappers; +namespace Elsa.Workflows.Runtime.ProtoActor.Mappers; public class WorkflowSubStatusMapper { diff --git a/src/modules/Elsa.ProtoActor/Proto/Shared.proto b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/Shared.proto similarity index 91% rename from src/modules/Elsa.ProtoActor/Proto/Shared.proto rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/Shared.proto index 289bd79e7..3bbd428e5 100644 --- a/src/modules/Elsa.ProtoActor/Proto/Shared.proto +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/Shared.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "Elsa.ProtoActor.ProtoBuf"; -package Elsa.ProtoActor.ProtoBuf; +option csharp_namespace = "Elsa.Workflows.Runtime.ProtoActor.ProtoBuf"; +package Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; import "google/protobuf/empty.proto"; import "google/protobuf/wrappers.proto"; diff --git a/src/modules/Elsa.ProtoActor/Proto/WorkflowInstance.Messages.proto b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/WorkflowInstance.Messages.proto similarity index 92% rename from src/modules/Elsa.ProtoActor/Proto/WorkflowInstance.Messages.proto rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/WorkflowInstance.Messages.proto index 919c41d62..46fc1ebde 100644 --- a/src/modules/Elsa.ProtoActor/Proto/WorkflowInstance.Messages.proto +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/WorkflowInstance.Messages.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "Elsa.ProtoActor.ProtoBuf"; -package Elsa.ProtoActor.ProtoBuf; +option csharp_namespace = "Elsa.Workflows.Runtime.ProtoActor.ProtoBuf"; +package Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; import "google/protobuf/empty.proto"; import "google/protobuf/wrappers.proto"; diff --git a/src/modules/Elsa.ProtoActor/Proto/WorkflowInstance.proto b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/WorkflowInstance.proto similarity index 84% rename from src/modules/Elsa.ProtoActor/Proto/WorkflowInstance.proto rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/WorkflowInstance.proto index 8651c2abd..4afb1848b 100644 --- a/src/modules/Elsa.ProtoActor/Proto/WorkflowInstance.proto +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Proto/WorkflowInstance.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "Elsa.ProtoActor.ProtoBuf"; -package Elsa.ProtoActor.ProtoBuf; +option csharp_namespace = "Elsa.Workflows.Runtime.ProtoActor.ProtoBuf"; +package Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; import "google/protobuf/empty.proto"; import "google/protobuf/wrappers.proto"; diff --git a/src/modules/Elsa.ProtoActor/Services/InMemoryProvider.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/InMemoryProvider.cs similarity index 98% rename from src/modules/Elsa.ProtoActor/Services/InMemoryProvider.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/InMemoryProvider.cs index be057841c..51718519b 100644 --- a/src/modules/Elsa.ProtoActor/Services/InMemoryProvider.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/InMemoryProvider.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Text.Json; using Proto.Persistence; -namespace Elsa.ProtoActor.Services; +namespace Elsa.Workflows.Runtime.ProtoActor.Services; /// /// An in-memory provider for Proto.Persistence. diff --git a/src/modules/Elsa.ProtoActor/Services/ProtoActorRuntime.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/ProtoActorRuntime.cs similarity index 94% rename from src/modules/Elsa.ProtoActor/Services/ProtoActorRuntime.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/ProtoActorRuntime.cs index 1f52bd6e3..13f74755f 100644 --- a/src/modules/Elsa.ProtoActor/Services/ProtoActorRuntime.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/ProtoActorRuntime.cs @@ -2,7 +2,7 @@ using Elsa.Workflows.Contracts; using Elsa.Workflows.Runtime; using Microsoft.Extensions.DependencyInjection; -namespace Elsa.ProtoActor.Services; +namespace Elsa.Workflows.Runtime.ProtoActor.Services; /// /// Represents a Proto.Actor implementation of the workflows runtime. diff --git a/src/modules/Elsa.ProtoActor/Services/ProtoActorWorkflowClient.cs b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/ProtoActorWorkflowClient.cs similarity index 96% rename from src/modules/Elsa.ProtoActor/Services/ProtoActorWorkflowClient.cs rename to src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/ProtoActorWorkflowClient.cs index 2482953ad..13332049d 100644 --- a/src/modules/Elsa.ProtoActor/Services/ProtoActorWorkflowClient.cs +++ b/src/modules/Elsa.Workflows.Runtime.ProtoActor/Services/ProtoActorWorkflowClient.cs @@ -1,12 +1,12 @@ using Elsa.Extensions; -using Elsa.ProtoActor.ProtoBuf; +using Elsa.Workflows.Runtime.ProtoActor.ProtoBuf; using Elsa.Workflows.Runtime; using Elsa.Workflows.Runtime.Messages; using Elsa.Workflows.State; using JetBrains.Annotations; using Proto.Cluster; -namespace Elsa.ProtoActor.Services; +namespace Elsa.Workflows.Runtime.ProtoActor.Services; /// /// A workflow client that uses Proto.Actor to communicate with the workflow running in the cluster. diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj b/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj index 980befdd1..74bf453d5 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj +++ b/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj @@ -12,7 +12,7 @@ - +