diff --git a/Flowsharp.sln b/Elsa.sln similarity index 71% rename from Flowsharp.sln rename to Elsa.sln index 778aa9aa4..e744927f3 100644 --- a/Flowsharp.sln +++ b/Elsa.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28010.2036 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Core", "src\core\Flowsharp.Core\Flowsharp.Core.csproj", "{300EE2D5-54C5-46F2-AD03-BB43589EA074}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Core", "src\core\Elsa.Core\Elsa.Core.csproj", "{300EE2D5-54C5-46F2-AD03-BB43589EA074}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925}" EndProject @@ -17,59 +17,59 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{7165BB9E package.json = package.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Abstractions", "src\core\Flowsharp.Abstractions\Flowsharp.Abstractions.csproj", "{3130C574-557C-4DA2-933E-AED7A9EBE48A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Abstractions", "src\core\Elsa.Abstractions\Elsa.Abstractions.csproj", "{3130C574-557C-4DA2-933E-AED7A9EBE48A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Persistence.Abstractions", "src\core\Flowsharp.Persistence.Abstractions\Flowsharp.Persistence.Abstractions.csproj", "{A5829896-89C5-4C4E-ADC7-C806C8077316}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Persistence.Abstractions", "src\core\Elsa.Persistence.Abstractions\Elsa.Persistence.Abstractions.csproj", "{A5829896-89C5-4C4E-ADC7-C806C8077316}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Persistence.InMemory", "src\core\Flowsharp.Persistence.InMemory\Flowsharp.Persistence.InMemory.csproj", "{E93A1A6B-708F-4DCC-A399-1B8EC7682F92}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esla.Persistence.InMemory", "src\core\Esla.Persistence.InMemory\Esla.Persistence.InMemory.csproj", "{E93A1A6B-708F-4DCC-A399-1B8EC7682F92}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Runtime", "src\core\Flowsharp.Runtime\Flowsharp.Runtime.csproj", "{3C1DCAA2-D77E-4F96-9899-DA8E0E0C757F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esla.Runtime", "src\core\Esla.Runtime\Esla.Runtime.csproj", "{3C1DCAA2-D77E-4F96-9899-DA8E0E0C757F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Runtime.Abstractions", "src\core\Flowsharp.Runtime.Abstractions\Flowsharp.Runtime.Abstractions.csproj", "{792362BF-D26D-46E9-8970-E5668941AA75}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esla.Runtime.Abstractions", "src\core\Esla.Runtime.Abstractions\Esla.Runtime.Abstractions.csproj", "{792362BF-D26D-46E9-8970-E5668941AA75}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{35F44BE9-13D0-417C-A01A-F0787BEE6DC3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{B33F1927-FF0A-4826-80C6-F480E9C43892}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Management", "src\web\modules\Flowsharp.Web.Management\Flowsharp.Web.Management.csproj", "{A00D0A17-CD30-49DF-908E-85744FA55A1A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Management", "src\web\modules\Elsa.Web.Management\Elsa.Web.Management.csproj", "{A00D0A17-CD30-49DF-908E-85744FA55A1A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{DE9B2BDA-F1C3-44EB-9B13-9A59A14F2018}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{38C559D5-F121-482B-BBD7-8FAFDB63B2F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.ViewComponents", "src\web\modules\Flowsharp.Web.ViewComponents\Flowsharp.Web.ViewComponents.csproj", "{71687B0E-37D1-4AEB-A620-1F884CAC4C8E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Components", "src\web\modules\Elsa.Web.Components\Elsa.Web.Components.csproj", "{71687B0E-37D1-4AEB-A620-1F884CAC4C8E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Persistence.FileSystem", "src\web\modules\Flowsharp.Web.Persistence.FileSystem\Flowsharp.Web.Persistence.FileSystem.csproj", "{7A30960A-1B95-4564-B2C8-2DFDDB06C594}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Persistence.FileSystem", "src\web\modules\Elsa.Web.Persistence.FileSystem\Elsa.Web.Persistence.FileSystem.csproj", "{7A30960A-1B95-4564-B2C8-2DFDDB06C594}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Persistence.FileSystem", "src\core\Flowsharp.Persistence.FileSystem\Flowsharp.Persistence.FileSystem.csproj", "{1579117E-229F-4E48-812B-7A235A4DB7E5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Persistence.FileSystem", "src\core\Elsa.Persistence.FileSystem\Elsa.Persistence.FileSystem.csproj", "{1579117E-229F-4E48-812B-7A235A4DB7E5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Abstractions", "src\web\modules\Flowsharp.Web.Abstractions\Flowsharp.Web.Abstractions.csproj", "{E04F98D6-F6B3-475F-BCAA-F0D586EE3965}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Abstractions", "src\web\modules\Elsa.Web.Abstractions\Elsa.Web.Abstractions.csproj", "{E04F98D6-F6B3-475F-BCAA-F0D586EE3965}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Activities.Primitives", "src\activities\Flowsharp.Activities.Primitives\Flowsharp.Activities.Primitives.csproj", "{E7DE9E53-2CF0-4F45-BF82-C470A19F0CF7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Activities.Primitives", "src\activities\Elsa.Activities.Primitives\Elsa.Activities.Primitives.csproj", "{E7DE9E53-2CF0-4F45-BF82-C470A19F0CF7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Activities.Console", "src\activities\Flowsharp.Activities.Console\Flowsharp.Activities.Console.csproj", "{B98B80CB-D3A3-437C-A61C-ED82C8C77B2F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Activities.Console", "src\activities\Elsa.Activities.Console\Elsa.Activities.Console.csproj", "{B98B80CB-D3A3-437C-A61C-ED82C8C77B2F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Activities.Console", "src\web\modules\Flowsharp.Web.Activities.Console\Flowsharp.Web.Activities.Console.csproj", "{444A7B77-ECB1-4D3B-A0F2-B9A41C6E8ACD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Activities.Console", "src\web\modules\Elsa.Web.Activities.Console\Elsa.Web.Activities.Console.csproj", "{444A7B77-ECB1-4D3B-A0F2-B9A41C6E8ACD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Activities.Primitives", "src\web\modules\Flowsharp.Web.Activities.Primitives\Flowsharp.Web.Activities.Primitives.csproj", "{B588D068-1ADE-4DB3-84BB-D8BA95897FAC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Activities.Primitives", "src\web\modules\Elsa.Web.Activities.Primitives\Elsa.Web.Activities.Primitives.csproj", "{B588D068-1ADE-4DB3-84BB-D8BA95897FAC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dashboard", "Dashboard", "{DA45AD45-2F4F-48E0-AF88-8F71082DF866}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Dashboard", "src\web\dashboard\Flowsharp.Web.Dashboard.csproj", "{8A271AB7-2B1A-486A-8DC6-521B8645DFB3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Themes.Bootstrap", "src\web\themes\Flowsharp.Themes.Bootstrap\Flowsharp.Themes.Bootstrap.csproj", "{CEB772E3-0C19-475E-B517-2295C1EF173A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa", "src\web\themes\Elsa\Elsa.csproj", "{CEB772E3-0C19-475E-B517-2295C1EF173A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{DF7D6DFE-319E-497E-9DBF-AB41C0CF0123}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{C55090FE-8506-4FDA-928F-5ACBB9CBE019}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Activities.Http", "src\activities\Flowsharp.Activities.Http\Flowsharp.Activities.Http.csproj", "{1D63E1B4-2386-4BEC-9090-C3F3CBF25703}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Activities.Http", "src\activities\Elsa.Activities.Http\Elsa.Activities.Http.csproj", "{1D63E1B4-2386-4BEC-9090-C3F3CBF25703}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Activities", "Activities", "{B43B546E-23F3-46E8-ACB7-D04F05CDA180}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Riven.Web", "src\samples\Riven.Web\Riven.Web.csproj", "{05D06E92-E52D-4186-9382-C27D293AE4D1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleHost.Web", "src\samples\SampleHost.Web\SampleHost.Web.csproj", "{05D06E92-E52D-4186-9382-C27D293AE4D1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Activities.Http", "src\web\modules\Flowsharp.Web.Activities.Http\Flowsharp.Web.Activities.Http.csproj", "{F4EC0B11-8E24-43C8-983B-38B7321FC4F9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Activities.Http", "src\web\modules\Elsa.Web.Activities.Http\Elsa.Web.Activities.Http.csproj", "{F4EC0B11-8E24-43C8-983B-38B7321FC4F9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Dashboard", "src\web\dashboard\Elsa.Web.Dashboard\Elsa.Web.Dashboard.csproj", "{35DD61F1-878A-4198-97F3-0F19E8E5D22F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -137,10 +137,6 @@ Global {B588D068-1ADE-4DB3-84BB-D8BA95897FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {B588D068-1ADE-4DB3-84BB-D8BA95897FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU {B588D068-1ADE-4DB3-84BB-D8BA95897FAC}.Release|Any CPU.Build.0 = Release|Any CPU - {8A271AB7-2B1A-486A-8DC6-521B8645DFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A271AB7-2B1A-486A-8DC6-521B8645DFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A271AB7-2B1A-486A-8DC6-521B8645DFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A271AB7-2B1A-486A-8DC6-521B8645DFB3}.Release|Any CPU.Build.0 = Release|Any CPU {CEB772E3-0C19-475E-B517-2295C1EF173A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CEB772E3-0C19-475E-B517-2295C1EF173A}.Debug|Any CPU.Build.0 = Debug|Any CPU {CEB772E3-0C19-475E-B517-2295C1EF173A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -157,6 +153,10 @@ Global {F4EC0B11-8E24-43C8-983B-38B7321FC4F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4EC0B11-8E24-43C8-983B-38B7321FC4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {F4EC0B11-8E24-43C8-983B-38B7321FC4F9}.Release|Any CPU.Build.0 = Release|Any CPU + {35DD61F1-878A-4198-97F3-0F19E8E5D22F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35DD61F1-878A-4198-97F3-0F19E8E5D22F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35DD61F1-878A-4198-97F3-0F19E8E5D22F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35DD61F1-878A-4198-97F3-0F19E8E5D22F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -179,7 +179,6 @@ Global {444A7B77-ECB1-4D3B-A0F2-B9A41C6E8ACD} = {DE9B2BDA-F1C3-44EB-9B13-9A59A14F2018} {B588D068-1ADE-4DB3-84BB-D8BA95897FAC} = {DE9B2BDA-F1C3-44EB-9B13-9A59A14F2018} {DA45AD45-2F4F-48E0-AF88-8F71082DF866} = {B33F1927-FF0A-4826-80C6-F480E9C43892} - {8A271AB7-2B1A-486A-8DC6-521B8645DFB3} = {DA45AD45-2F4F-48E0-AF88-8F71082DF866} {CEB772E3-0C19-475E-B517-2295C1EF173A} = {38C559D5-F121-482B-BBD7-8FAFDB63B2F1} {DF7D6DFE-319E-497E-9DBF-AB41C0CF0123} = {B33F1927-FF0A-4826-80C6-F480E9C43892} {E04F98D6-F6B3-475F-BCAA-F0D586EE3965} = {DF7D6DFE-319E-497E-9DBF-AB41C0CF0123} @@ -190,6 +189,7 @@ Global {E7DE9E53-2CF0-4F45-BF82-C470A19F0CF7} = {B43B546E-23F3-46E8-ACB7-D04F05CDA180} {05D06E92-E52D-4186-9382-C27D293AE4D1} = {C55090FE-8506-4FDA-928F-5ACBB9CBE019} {F4EC0B11-8E24-43C8-983B-38B7321FC4F9} = {DE9B2BDA-F1C3-44EB-9B13-9A59A14F2018} + {35DD61F1-878A-4198-97F3-0F19E8E5D22F} = {DA45AD45-2F4F-48E0-AF88-8F71082DF866} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8B0975FD-7050-48B0-88C5-48C33378E158} diff --git a/Flowsharp.sln.DotSettings b/Elsa.sln.DotSettings similarity index 100% rename from Flowsharp.sln.DotSettings rename to Elsa.sln.DotSettings diff --git a/package-lock.json b/package-lock.json index 02e4d6cbf..7ca1f91d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1910,12 +1910,6 @@ } } }, - "babelify": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", - "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==", - "dev": true - }, "babylon": { "version": "7.0.0-beta.27", "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.27.tgz", @@ -2334,9 +2328,9 @@ } }, "cached-path-relative": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz", - "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz", + "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==", "dev": true }, "camelcase": { diff --git a/src/activities/Flowsharp.Activities.Console/Activities/ReadLine.cs b/src/activities/Elsa.Activities.Console/Activities/ReadLine.cs similarity index 56% rename from src/activities/Flowsharp.Activities.Console/Activities/ReadLine.cs rename to src/activities/Elsa.Activities.Console/Activities/ReadLine.cs index 82f2cf1d2..90c09f7a3 100644 --- a/src/activities/Flowsharp.Activities.Console/Activities/ReadLine.cs +++ b/src/activities/Elsa.Activities.Console/Activities/ReadLine.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Activities.Console.Activities +namespace Elsa.Activities.Console.Activities { public class ReadLine : Activity { diff --git a/src/activities/Flowsharp.Activities.Console/Activities/WriteLine.cs b/src/activities/Elsa.Activities.Console/Activities/WriteLine.cs similarity index 80% rename from src/activities/Flowsharp.Activities.Console/Activities/WriteLine.cs rename to src/activities/Elsa.Activities.Console/Activities/WriteLine.cs index d1264565f..000058aec 100644 --- a/src/activities/Flowsharp.Activities.Console/Activities/WriteLine.cs +++ b/src/activities/Elsa.Activities.Console/Activities/WriteLine.cs @@ -1,7 +1,7 @@ -using Flowsharp.Expressions; -using Flowsharp.Models; +using Elsa.Expressions; +using Elsa.Models; -namespace Flowsharp.Activities.Console.Activities +namespace Elsa.Activities.Console.Activities { /// /// Writes a text string to the specified stream. diff --git a/src/activities/Flowsharp.Activities.Primitives/Flowsharp.Activities.Primitives.csproj b/src/activities/Elsa.Activities.Console/Elsa.Activities.Console.csproj similarity index 68% rename from src/activities/Flowsharp.Activities.Primitives/Flowsharp.Activities.Primitives.csproj rename to src/activities/Elsa.Activities.Console/Elsa.Activities.Console.csproj index c2117c0e5..295c03a0b 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Flowsharp.Activities.Primitives.csproj +++ b/src/activities/Elsa.Activities.Console/Elsa.Activities.Console.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/activities/Flowsharp.Activities.Console/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Console/Extensions/ServiceCollectionExtensions.cs similarity index 80% rename from src/activities/Flowsharp.Activities.Console/Extensions/ServiceCollectionExtensions.cs rename to src/activities/Elsa.Activities.Console/Extensions/ServiceCollectionExtensions.cs index b24656881..080845d84 100644 --- a/src/activities/Flowsharp.Activities.Console/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Console/Extensions/ServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ -using Flowsharp.Activities.Console.Handlers; +using Elsa.Activities.Console.Handlers; using Microsoft.Extensions.DependencyInjection; -namespace Flowsharp.Activities.Console.Extensions +namespace Elsa.Activities.Console.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/activities/Flowsharp.Activities.Console/Handlers/ReadLineHandler.cs b/src/activities/Elsa.Activities.Console/Handlers/ReadLineHandler.cs similarity index 90% rename from src/activities/Flowsharp.Activities.Console/Handlers/ReadLineHandler.cs rename to src/activities/Elsa.Activities.Console/Handlers/ReadLineHandler.cs index 2826d2ee9..ec384414d 100644 --- a/src/activities/Flowsharp.Activities.Console/Handlers/ReadLineHandler.cs +++ b/src/activities/Elsa.Activities.Console/Handlers/ReadLineHandler.cs @@ -1,13 +1,13 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities.Console.Activities; -using Flowsharp.Handlers; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities.Console.Activities; +using Elsa.Handlers; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Activities.Console.Handlers +namespace Elsa.Activities.Console.Handlers { public class ReadLineHandler : ActivityHandler { diff --git a/src/activities/Flowsharp.Activities.Console/Handlers/WriteLineHandler.cs b/src/activities/Elsa.Activities.Console/Handlers/WriteLineHandler.cs similarity index 90% rename from src/activities/Flowsharp.Activities.Console/Handlers/WriteLineHandler.cs rename to src/activities/Elsa.Activities.Console/Handlers/WriteLineHandler.cs index 13e994a72..7a806e6af 100644 --- a/src/activities/Flowsharp.Activities.Console/Handlers/WriteLineHandler.cs +++ b/src/activities/Elsa.Activities.Console/Handlers/WriteLineHandler.cs @@ -1,13 +1,13 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities.Console.Activities; -using Flowsharp.Handlers; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities.Console.Activities; +using Elsa.Handlers; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Activities.Console.Handlers +namespace Elsa.Activities.Console.Handlers { /// /// Writes a text string to the specified stream. diff --git a/src/activities/Flowsharp.Activities.Http/Activities/HttpRequestTrigger.cs b/src/activities/Elsa.Activities.Http/Activities/HttpRequestTrigger.cs similarity index 83% rename from src/activities/Flowsharp.Activities.Http/Activities/HttpRequestTrigger.cs rename to src/activities/Elsa.Activities.Http/Activities/HttpRequestTrigger.cs index 8399e6d2f..f8e706cb3 100644 --- a/src/activities/Flowsharp.Activities.Http/Activities/HttpRequestTrigger.cs +++ b/src/activities/Elsa.Activities.Http/Activities/HttpRequestTrigger.cs @@ -1,7 +1,7 @@ using System; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Activities.Http.Activities +namespace Elsa.Activities.Http.Activities { public class HttpRequestTrigger : Activity { diff --git a/src/activities/Flowsharp.Activities.Http/Flowsharp.Activities.Http.csproj b/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj similarity index 63% rename from src/activities/Flowsharp.Activities.Http/Flowsharp.Activities.Http.csproj rename to src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj index ec3222ef2..7c1eca840 100644 --- a/src/activities/Flowsharp.Activities.Http/Flowsharp.Activities.Http.csproj +++ b/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/activities/Flowsharp.Activities.Http/Extensions/ApplicationBuilderExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/ApplicationBuilderExtensions.cs similarity index 75% rename from src/activities/Flowsharp.Activities.Http/Extensions/ApplicationBuilderExtensions.cs rename to src/activities/Elsa.Activities.Http/Extensions/ApplicationBuilderExtensions.cs index 2203bbc9a..88183aecf 100644 --- a/src/activities/Flowsharp.Activities.Http/Extensions/ApplicationBuilderExtensions.cs +++ b/src/activities/Elsa.Activities.Http/Extensions/ApplicationBuilderExtensions.cs @@ -1,7 +1,7 @@ -using Flowsharp.Activities.Http.Middleware; +using Elsa.Activities.Http.Middleware; using Microsoft.AspNetCore.Builder; -namespace Flowsharp.Activities.Http.Extensions +namespace Elsa.Activities.Http.Extensions { public static class ApplicationBuilderExtensions { diff --git a/src/activities/Flowsharp.Activities.Http/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs similarity index 74% rename from src/activities/Flowsharp.Activities.Http/Extensions/ServiceCollectionExtensions.cs rename to src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs index b4a5583c0..df59eeef8 100644 --- a/src/activities/Flowsharp.Activities.Http/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs @@ -1,12 +1,12 @@ -using Flowsharp.Activities.Http.Handlers; -using Flowsharp.Activities.Http.Initialization; -using Flowsharp.Activities.Http.Services; -using Flowsharp.Activities.Http.Services.Implementations; +using Elsa.Activities.Http.Handlers; +using Elsa.Activities.Http.Initialization; +using Elsa.Activities.Http.Services; +using Elsa.Activities.Http.Services.Implementations; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Flowsharp.Activities.Http.Extensions +namespace Elsa.Activities.Http.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/activities/Flowsharp.Activities.Http/Handlers/HttpRequestTriggerHandler.cs b/src/activities/Elsa.Activities.Http/Handlers/HttpRequestTriggerHandler.cs similarity index 87% rename from src/activities/Flowsharp.Activities.Http/Handlers/HttpRequestTriggerHandler.cs rename to src/activities/Elsa.Activities.Http/Handlers/HttpRequestTriggerHandler.cs index e93852ef1..5111d40db 100644 --- a/src/activities/Flowsharp.Activities.Http/Handlers/HttpRequestTriggerHandler.cs +++ b/src/activities/Elsa.Activities.Http/Handlers/HttpRequestTriggerHandler.cs @@ -1,13 +1,11 @@ -using System.Threading; -using System.Threading.Tasks; -using Flowsharp.Activities.Http.Activities; -using Flowsharp.Handlers; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities.Http.Activities; +using Elsa.Handlers; +using Elsa.Models; +using Elsa.Results; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Localization; -namespace Flowsharp.Activities.Http.Handlers +namespace Elsa.Activities.Http.Handlers { public class HttpRequestTriggerHandler : ActivityHandler { diff --git a/src/activities/Flowsharp.Activities.Http/Initialization/HttpWorkflowCacheInitializer.cs b/src/activities/Elsa.Activities.Http/Initialization/HttpWorkflowCacheInitializer.cs similarity index 86% rename from src/activities/Flowsharp.Activities.Http/Initialization/HttpWorkflowCacheInitializer.cs rename to src/activities/Elsa.Activities.Http/Initialization/HttpWorkflowCacheInitializer.cs index 0b8e46ea6..458e9a80f 100644 --- a/src/activities/Flowsharp.Activities.Http/Initialization/HttpWorkflowCacheInitializer.cs +++ b/src/activities/Elsa.Activities.Http/Initialization/HttpWorkflowCacheInitializer.cs @@ -3,14 +3,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using AspNetCore.AsyncInitialization; -using Flowsharp.Activities.Http.Activities; -using Flowsharp.Activities.Http.Services; -using Flowsharp.Extensions; -using Flowsharp.Persistence; -using Flowsharp.Persistence.Extensions; -using Flowsharp.Persistence.Specifications; +using Elsa.Activities.Http.Activities; +using Elsa.Activities.Http.Services; +using Elsa.Extensions; +using Elsa.Persistence; +using Elsa.Persistence.Extensions; +using Elsa.Persistence.Specifications; -namespace Flowsharp.Activities.Http.Initialization +namespace Elsa.Activities.Http.Initialization { public class HttpWorkflowCacheInitializer : IAsyncInitializer { diff --git a/src/activities/Flowsharp.Activities.Http/Middleware/HttpRequestTriggerMiddleware.cs b/src/activities/Elsa.Activities.Http/Middleware/HttpRequestTriggerMiddleware.cs similarity index 93% rename from src/activities/Flowsharp.Activities.Http/Middleware/HttpRequestTriggerMiddleware.cs rename to src/activities/Elsa.Activities.Http/Middleware/HttpRequestTriggerMiddleware.cs index c159ad300..064d1ff46 100644 --- a/src/activities/Flowsharp.Activities.Http/Middleware/HttpRequestTriggerMiddleware.cs +++ b/src/activities/Elsa.Activities.Http/Middleware/HttpRequestTriggerMiddleware.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities.Http.Activities; -using Flowsharp.Activities.Http.Services; -using Flowsharp.Extensions; -using Flowsharp.Models; -using Flowsharp.Runtime.Abstractions; +using Elsa.Activities.Http.Activities; +using Elsa.Activities.Http.Services; +using Elsa.Extensions; +using Elsa.Models; +using Elsa.Runtime; using Microsoft.AspNetCore.Http; -namespace Flowsharp.Activities.Http.Middleware +namespace Elsa.Activities.Http.Middleware { public class HttpRequestTriggerMiddleware { diff --git a/src/activities/Flowsharp.Activities.Http/Services/IHttpWorkflowCache.cs b/src/activities/Elsa.Activities.Http/Services/IHttpWorkflowCache.cs similarity index 88% rename from src/activities/Flowsharp.Activities.Http/Services/IHttpWorkflowCache.cs rename to src/activities/Elsa.Activities.Http/Services/IHttpWorkflowCache.cs index 5d05c3ce7..ef8b82b3d 100644 --- a/src/activities/Flowsharp.Activities.Http/Services/IHttpWorkflowCache.cs +++ b/src/activities/Elsa.Activities.Http/Services/IHttpWorkflowCache.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Activities.Http.Services +namespace Elsa.Activities.Http.Services { public interface IHttpWorkflowCache { diff --git a/src/activities/Flowsharp.Activities.Http/Services/Implementations/DefaultHttpWorkflowCache.cs b/src/activities/Elsa.Activities.Http/Services/Implementations/DefaultHttpWorkflowCache.cs similarity index 95% rename from src/activities/Flowsharp.Activities.Http/Services/Implementations/DefaultHttpWorkflowCache.cs rename to src/activities/Elsa.Activities.Http/Services/Implementations/DefaultHttpWorkflowCache.cs index 0ebe877a2..5ac736c66 100644 --- a/src/activities/Flowsharp.Activities.Http/Services/Implementations/DefaultHttpWorkflowCache.cs +++ b/src/activities/Elsa.Activities.Http/Services/Implementations/DefaultHttpWorkflowCache.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Activities.Http.Services.Implementations +namespace Elsa.Activities.Http.Services.Implementations { public class DefaultHttpWorkflowCache : IHttpWorkflowCache { diff --git a/src/activities/Elsa.Activities.Primitives/Activities/ForEach.cs b/src/activities/Elsa.Activities.Primitives/Activities/ForEach.cs new file mode 100644 index 000000000..675e90ed9 --- /dev/null +++ b/src/activities/Elsa.Activities.Primitives/Activities/ForEach.cs @@ -0,0 +1,9 @@ +using Elsa.Models; + +namespace Elsa.Activities.Primitives.Activities +{ + public class ForEach : Activity + { + + } +} \ No newline at end of file diff --git a/src/activities/Flowsharp.Activities.Primitives/Activities/IfElse.cs b/src/activities/Elsa.Activities.Primitives/Activities/IfElse.cs similarity index 53% rename from src/activities/Flowsharp.Activities.Primitives/Activities/IfElse.cs rename to src/activities/Elsa.Activities.Primitives/Activities/IfElse.cs index efe051302..20431f4a4 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Activities/IfElse.cs +++ b/src/activities/Elsa.Activities.Primitives/Activities/IfElse.cs @@ -1,7 +1,7 @@ -using Flowsharp.Expressions; -using Flowsharp.Models; +using Elsa.Expressions; +using Elsa.Models; -namespace Flowsharp.Activities.Primitives.Activities +namespace Elsa.Activities.Primitives.Activities { public class IfElse : Activity { diff --git a/src/activities/Flowsharp.Activities.Primitives/Activities/SetVariable.cs b/src/activities/Elsa.Activities.Primitives/Activities/SetVariable.cs similarity index 61% rename from src/activities/Flowsharp.Activities.Primitives/Activities/SetVariable.cs rename to src/activities/Elsa.Activities.Primitives/Activities/SetVariable.cs index 49610f892..2009c5ecc 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Activities/SetVariable.cs +++ b/src/activities/Elsa.Activities.Primitives/Activities/SetVariable.cs @@ -1,7 +1,7 @@ -using Flowsharp.Expressions; -using Flowsharp.Models; +using Elsa.Expressions; +using Elsa.Models; -namespace Flowsharp.Activities.Primitives.Activities +namespace Elsa.Activities.Primitives.Activities { public class SetVariable : Activity { diff --git a/src/activities/Flowsharp.Activities.Console/Flowsharp.Activities.Console.csproj b/src/activities/Elsa.Activities.Primitives/Elsa.Activities.Primitives.csproj similarity index 68% rename from src/activities/Flowsharp.Activities.Console/Flowsharp.Activities.Console.csproj rename to src/activities/Elsa.Activities.Primitives/Elsa.Activities.Primitives.csproj index c2117c0e5..295c03a0b 100644 --- a/src/activities/Flowsharp.Activities.Console/Flowsharp.Activities.Console.csproj +++ b/src/activities/Elsa.Activities.Primitives/Elsa.Activities.Primitives.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/activities/Flowsharp.Activities.Primitives/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Primitives/Extensions/ServiceCollectionExtensions.cs similarity index 82% rename from src/activities/Flowsharp.Activities.Primitives/Extensions/ServiceCollectionExtensions.cs rename to src/activities/Elsa.Activities.Primitives/Extensions/ServiceCollectionExtensions.cs index db0bddf94..8ceefacb8 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Primitives/Extensions/ServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ -using Flowsharp.Activities.Primitives.Handlers; +using Elsa.Activities.Primitives.Handlers; using Microsoft.Extensions.DependencyInjection; -namespace Flowsharp.Activities.Primitives.Extensions +namespace Elsa.Activities.Primitives.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/activities/Flowsharp.Activities.Primitives/Handlers/ForEachHandler.cs b/src/activities/Elsa.Activities.Primitives/Handlers/ForEachHandler.cs similarity index 86% rename from src/activities/Flowsharp.Activities.Primitives/Handlers/ForEachHandler.cs rename to src/activities/Elsa.Activities.Primitives/Handlers/ForEachHandler.cs index a506a10b4..5bc1845ae 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Handlers/ForEachHandler.cs +++ b/src/activities/Elsa.Activities.Primitives/Handlers/ForEachHandler.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities.Primitives.Activities; -using Flowsharp.Handlers; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities.Primitives.Activities; +using Elsa.Handlers; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Activities.Primitives.Handlers +namespace Elsa.Activities.Primitives.Handlers { public class ForEachHandler : ActivityHandler { diff --git a/src/activities/Flowsharp.Activities.Primitives/Handlers/IfElseHandler.cs b/src/activities/Elsa.Activities.Primitives/Handlers/IfElseHandler.cs similarity index 88% rename from src/activities/Flowsharp.Activities.Primitives/Handlers/IfElseHandler.cs rename to src/activities/Elsa.Activities.Primitives/Handlers/IfElseHandler.cs index a495277bd..8e3bb89b2 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Handlers/IfElseHandler.cs +++ b/src/activities/Elsa.Activities.Primitives/Handlers/IfElseHandler.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities.Primitives.Activities; -using Flowsharp.Handlers; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities.Primitives.Activities; +using Elsa.Handlers; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Activities.Primitives.Handlers +namespace Elsa.Activities.Primitives.Handlers { public class IfElseHandler : ActivityHandler { diff --git a/src/activities/Flowsharp.Activities.Primitives/Handlers/SetVariableHandler.cs b/src/activities/Elsa.Activities.Primitives/Handlers/SetVariableHandler.cs similarity index 88% rename from src/activities/Flowsharp.Activities.Primitives/Handlers/SetVariableHandler.cs rename to src/activities/Elsa.Activities.Primitives/Handlers/SetVariableHandler.cs index 3f350d070..893441dc2 100644 --- a/src/activities/Flowsharp.Activities.Primitives/Handlers/SetVariableHandler.cs +++ b/src/activities/Elsa.Activities.Primitives/Handlers/SetVariableHandler.cs @@ -1,12 +1,12 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities.Primitives.Activities; -using Flowsharp.Handlers; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities.Primitives.Activities; +using Elsa.Handlers; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Activities.Primitives.Handlers +namespace Elsa.Activities.Primitives.Handlers { public class SetVariableHandler : ActivityHandler { diff --git a/src/activities/Flowsharp.Activities.Primitives/Activities/ForEach.cs b/src/activities/Flowsharp.Activities.Primitives/Activities/ForEach.cs deleted file mode 100644 index 92487c100..000000000 --- a/src/activities/Flowsharp.Activities.Primitives/Activities/ForEach.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Flowsharp.Models; - -namespace Flowsharp.Activities.Primitives.Activities -{ - public class ForEach : Activity - { - - } -} \ No newline at end of file diff --git a/src/core/Flowsharp.Abstractions/Comparers/LocalizedStringEqualityComparer.cs b/src/core/Elsa.Abstractions/Comparers/LocalizedStringEqualityComparer.cs similarity index 93% rename from src/core/Flowsharp.Abstractions/Comparers/LocalizedStringEqualityComparer.cs rename to src/core/Elsa.Abstractions/Comparers/LocalizedStringEqualityComparer.cs index e49dc88e2..5a31a3631 100644 --- a/src/core/Flowsharp.Abstractions/Comparers/LocalizedStringEqualityComparer.cs +++ b/src/core/Elsa.Abstractions/Comparers/LocalizedStringEqualityComparer.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Microsoft.Extensions.Localization; -namespace Flowsharp.Comparers +namespace Elsa.Comparers { public class LocalizedStringEqualityComparer : IEqualityComparer { diff --git a/src/core/Flowsharp.Abstractions/Flowsharp.Abstractions.csproj b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj similarity index 88% rename from src/core/Flowsharp.Abstractions/Flowsharp.Abstractions.csproj rename to src/core/Elsa.Abstractions/Elsa.Abstractions.csproj index 508d41d66..60c6ef9c4 100644 --- a/src/core/Flowsharp.Abstractions/Flowsharp.Abstractions.csproj +++ b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj @@ -2,7 +2,7 @@ netstandard2.0 - Flowsharp + Elsa latest diff --git a/src/core/Flowsharp.Abstractions/Expressions/WorkflowExpression.cs b/src/core/Elsa.Abstractions/Expressions/WorkflowExpression.cs similarity index 92% rename from src/core/Flowsharp.Abstractions/Expressions/WorkflowExpression.cs rename to src/core/Elsa.Abstractions/Expressions/WorkflowExpression.cs index 4d9358697..5d0deeba7 100644 --- a/src/core/Flowsharp.Abstractions/Expressions/WorkflowExpression.cs +++ b/src/core/Elsa.Abstractions/Expressions/WorkflowExpression.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Expressions +namespace Elsa.Expressions { public class WorkflowExpression { diff --git a/src/core/Flowsharp.Abstractions/Extensions/ActivityDescriptorExtensions.cs b/src/core/Elsa.Abstractions/Extensions/ActivityDescriptorExtensions.cs similarity index 94% rename from src/core/Flowsharp.Abstractions/Extensions/ActivityDescriptorExtensions.cs rename to src/core/Elsa.Abstractions/Extensions/ActivityDescriptorExtensions.cs index d33d47396..7e3e60afe 100644 --- a/src/core/Flowsharp.Abstractions/Extensions/ActivityDescriptorExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/ActivityDescriptorExtensions.cs @@ -1,10 +1,10 @@ using System; -using Flowsharp.Models; +using Elsa.Models; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class ActivityDescriptorExtensions { diff --git a/src/core/Flowsharp.Abstractions/Extensions/ActivityLibraryExtensions.cs b/src/core/Elsa.Abstractions/Extensions/ActivityLibraryExtensions.cs similarity index 95% rename from src/core/Flowsharp.Abstractions/Extensions/ActivityLibraryExtensions.cs rename to src/core/Elsa.Abstractions/Extensions/ActivityLibraryExtensions.cs index f11b5bef4..9cfd3d35a 100644 --- a/src/core/Flowsharp.Abstractions/Extensions/ActivityLibraryExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/ActivityLibraryExtensions.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Comparers; -using Flowsharp.Models; +using Elsa.Comparers; +using Elsa.Models; using Microsoft.Extensions.Localization; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class ActivityLibraryExtensions { diff --git a/src/core/Flowsharp.Abstractions/Extensions/AsyncEnumerableExtensions.cs b/src/core/Elsa.Abstractions/Extensions/AsyncEnumerableExtensions.cs similarity index 97% rename from src/core/Flowsharp.Abstractions/Extensions/AsyncEnumerableExtensions.cs rename to src/core/Elsa.Abstractions/Extensions/AsyncEnumerableExtensions.cs index be3c0d61a..0469838d6 100644 --- a/src/core/Flowsharp.Abstractions/Extensions/AsyncEnumerableExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/AsyncEnumerableExtensions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class AsyncEnumerableExtensions { diff --git a/src/core/Flowsharp.Abstractions/Extensions/TokenFormatterProviderExtensions.cs b/src/core/Elsa.Abstractions/Extensions/TokenFormatterProviderExtensions.cs similarity index 90% rename from src/core/Flowsharp.Abstractions/Extensions/TokenFormatterProviderExtensions.cs rename to src/core/Elsa.Abstractions/Extensions/TokenFormatterProviderExtensions.cs index 3c30f7559..245a915b5 100644 --- a/src/core/Flowsharp.Abstractions/Extensions/TokenFormatterProviderExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/TokenFormatterProviderExtensions.cs @@ -1,7 +1,7 @@ -using Flowsharp.Serialization; +using Elsa.Serialization; using Newtonsoft.Json.Linq; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class TokenFormatterProviderExtensions { diff --git a/src/core/Flowsharp.Abstractions/Extensions/WorkflowExtensions.cs b/src/core/Elsa.Abstractions/Extensions/WorkflowExtensions.cs similarity index 92% rename from src/core/Flowsharp.Abstractions/Extensions/WorkflowExtensions.cs rename to src/core/Elsa.Abstractions/Extensions/WorkflowExtensions.cs index de2777366..34689540f 100644 --- a/src/core/Flowsharp.Abstractions/Extensions/WorkflowExtensions.cs +++ b/src/core/Elsa.Abstractions/Extensions/WorkflowExtensions.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class WorkflowExtensions { diff --git a/src/core/Flowsharp.Abstractions/Handlers/ActivityHandlerBase.cs b/src/core/Elsa.Abstractions/Handlers/ActivityHandlerBase.cs similarity index 98% rename from src/core/Flowsharp.Abstractions/Handlers/ActivityHandlerBase.cs rename to src/core/Elsa.Abstractions/Handlers/ActivityHandlerBase.cs index 6d4d2ea58..b8cc46eb5 100644 --- a/src/core/Flowsharp.Abstractions/Handlers/ActivityHandlerBase.cs +++ b/src/core/Elsa.Abstractions/Handlers/ActivityHandlerBase.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Handlers +namespace Elsa.Handlers { public abstract class ActivityHandlerBase : IActivityHandler where T : IActivity { diff --git a/src/core/Flowsharp.Abstractions/IActivity.cs b/src/core/Elsa.Abstractions/IActivity.cs similarity index 84% rename from src/core/Flowsharp.Abstractions/IActivity.cs rename to src/core/Elsa.Abstractions/IActivity.cs index c240e1e39..19d57ef28 100644 --- a/src/core/Flowsharp.Abstractions/IActivity.cs +++ b/src/core/Elsa.Abstractions/IActivity.cs @@ -1,7 +1,7 @@ -using Flowsharp.Models; +using Elsa.Models; using Newtonsoft.Json; -namespace Flowsharp +namespace Elsa { public interface IActivity { diff --git a/src/core/Flowsharp.Abstractions/IActivityExecutionResult.cs b/src/core/Elsa.Abstractions/IActivityExecutionResult.cs similarity index 85% rename from src/core/Flowsharp.Abstractions/IActivityExecutionResult.cs rename to src/core/Elsa.Abstractions/IActivityExecutionResult.cs index da2484bee..f8a8bf127 100644 --- a/src/core/Flowsharp.Abstractions/IActivityExecutionResult.cs +++ b/src/core/Elsa.Abstractions/IActivityExecutionResult.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public interface IActivityExecutionResult { diff --git a/src/core/Flowsharp.Abstractions/IActivityHandler.cs b/src/core/Elsa.Abstractions/IActivityHandler.cs similarity index 96% rename from src/core/Flowsharp.Abstractions/IActivityHandler.cs rename to src/core/Elsa.Abstractions/IActivityHandler.cs index 203a59c48..b10c9560a 100644 --- a/src/core/Flowsharp.Abstractions/IActivityHandler.cs +++ b/src/core/Elsa.Abstractions/IActivityHandler.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp +namespace Elsa { public interface IActivityHandler { diff --git a/src/core/Flowsharp.Abstractions/IActivityLibrary.cs b/src/core/Elsa.Abstractions/IActivityLibrary.cs similarity index 84% rename from src/core/Flowsharp.Abstractions/IActivityLibrary.cs rename to src/core/Elsa.Abstractions/IActivityLibrary.cs index bae475ed4..1d4764e34 100644 --- a/src/core/Flowsharp.Abstractions/IActivityLibrary.cs +++ b/src/core/Elsa.Abstractions/IActivityLibrary.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public interface IActivityLibrary { diff --git a/src/core/Flowsharp.Abstractions/IActivityProvider.cs b/src/core/Elsa.Abstractions/IActivityProvider.cs similarity index 84% rename from src/core/Flowsharp.Abstractions/IActivityProvider.cs rename to src/core/Elsa.Abstractions/IActivityProvider.cs index a25ed2744..9262585bb 100644 --- a/src/core/Flowsharp.Abstractions/IActivityProvider.cs +++ b/src/core/Elsa.Abstractions/IActivityProvider.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public interface IActivityProvider { diff --git a/src/core/Flowsharp.Abstractions/IExpressionEvaluator.cs b/src/core/Elsa.Abstractions/IExpressionEvaluator.cs similarity index 86% rename from src/core/Flowsharp.Abstractions/IExpressionEvaluator.cs rename to src/core/Elsa.Abstractions/IExpressionEvaluator.cs index f85e38846..4b92bf207 100644 --- a/src/core/Flowsharp.Abstractions/IExpressionEvaluator.cs +++ b/src/core/Elsa.Abstractions/IExpressionEvaluator.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public interface IExpressionEvaluator { diff --git a/src/core/Flowsharp.Abstractions/IIdGenerator.cs b/src/core/Elsa.Abstractions/IIdGenerator.cs similarity index 62% rename from src/core/Flowsharp.Abstractions/IIdGenerator.cs rename to src/core/Elsa.Abstractions/IIdGenerator.cs index 0cab74a58..0c28daef0 100644 --- a/src/core/Flowsharp.Abstractions/IIdGenerator.cs +++ b/src/core/Elsa.Abstractions/IIdGenerator.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.Abstractions.Services +namespace Elsa { public interface IIdGenerator { diff --git a/src/core/Flowsharp.Abstractions/IWorkflowExpressionEvaluator.cs b/src/core/Elsa.Abstractions/IWorkflowExpressionEvaluator.cs similarity index 79% rename from src/core/Flowsharp.Abstractions/IWorkflowExpressionEvaluator.cs rename to src/core/Elsa.Abstractions/IWorkflowExpressionEvaluator.cs index 069312414..2e6e87b96 100644 --- a/src/core/Flowsharp.Abstractions/IWorkflowExpressionEvaluator.cs +++ b/src/core/Elsa.Abstractions/IWorkflowExpressionEvaluator.cs @@ -1,9 +1,9 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Expressions; -using Flowsharp.Models; +using Elsa.Expressions; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public interface IWorkflowExpressionEvaluator { diff --git a/src/core/Flowsharp.Abstractions/IWorkflowInvoker.cs b/src/core/Elsa.Abstractions/IWorkflowInvoker.cs similarity index 91% rename from src/core/Flowsharp.Abstractions/IWorkflowInvoker.cs rename to src/core/Elsa.Abstractions/IWorkflowInvoker.cs index fe15b62b0..f01602016 100644 --- a/src/core/Flowsharp.Abstractions/IWorkflowInvoker.cs +++ b/src/core/Elsa.Abstractions/IWorkflowInvoker.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public interface IWorkflowInvoker { diff --git a/src/core/Flowsharp.Abstractions/Models/Activity.cs b/src/core/Elsa.Abstractions/Models/Activity.cs similarity index 90% rename from src/core/Flowsharp.Abstractions/Models/Activity.cs rename to src/core/Elsa.Abstractions/Models/Activity.cs index 37c76585d..51d910988 100644 --- a/src/core/Flowsharp.Abstractions/Models/Activity.cs +++ b/src/core/Elsa.Abstractions/Models/Activity.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public abstract class Activity : IActivity { diff --git a/src/core/Flowsharp.Abstractions/Models/ActivityDescriptor.cs b/src/core/Elsa.Abstractions/Models/ActivityDescriptor.cs similarity index 95% rename from src/core/Flowsharp.Abstractions/Models/ActivityDescriptor.cs rename to src/core/Elsa.Abstractions/Models/ActivityDescriptor.cs index 2179ef34a..12f1f4abb 100644 --- a/src/core/Flowsharp.Abstractions/Models/ActivityDescriptor.cs +++ b/src/core/Elsa.Abstractions/Models/ActivityDescriptor.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Results; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Models +namespace Elsa.Models { public class ActivityDescriptor { diff --git a/src/core/Flowsharp.Abstractions/Models/ActivityExecutionContext.cs b/src/core/Elsa.Abstractions/Models/ActivityExecutionContext.cs similarity index 91% rename from src/core/Flowsharp.Abstractions/Models/ActivityExecutionContext.cs rename to src/core/Elsa.Abstractions/Models/ActivityExecutionContext.cs index 7d7f07680..25768c7a2 100644 --- a/src/core/Flowsharp.Abstractions/Models/ActivityExecutionContext.cs +++ b/src/core/Elsa.Abstractions/Models/ActivityExecutionContext.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public class ActivityExecutionContext { diff --git a/src/core/Flowsharp.Abstractions/Models/ActivityMetadata.cs b/src/core/Elsa.Abstractions/Models/ActivityMetadata.cs similarity index 87% rename from src/core/Flowsharp.Abstractions/Models/ActivityMetadata.cs rename to src/core/Elsa.Abstractions/Models/ActivityMetadata.cs index 3b399643c..92adfb159 100644 --- a/src/core/Flowsharp.Abstractions/Models/ActivityMetadata.cs +++ b/src/core/Elsa.Abstractions/Models/ActivityMetadata.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Models +namespace Elsa.Models { public class ActivityMetadata { diff --git a/src/core/Flowsharp.Abstractions/Models/Connection.cs b/src/core/Elsa.Abstractions/Models/Connection.cs similarity index 96% rename from src/core/Flowsharp.Abstractions/Models/Connection.cs rename to src/core/Elsa.Abstractions/Models/Connection.cs index 4a7913ad5..d2fcac0eb 100644 --- a/src/core/Flowsharp.Abstractions/Models/Connection.cs +++ b/src/core/Elsa.Abstractions/Models/Connection.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public class Connection { diff --git a/src/core/Flowsharp.Abstractions/Models/CustomFieldDictionary.cs b/src/core/Elsa.Abstractions/Models/CustomFieldDictionary.cs similarity index 85% rename from src/core/Flowsharp.Abstractions/Models/CustomFieldDictionary.cs rename to src/core/Elsa.Abstractions/Models/CustomFieldDictionary.cs index 572f33410..152290065 100644 --- a/src/core/Flowsharp.Abstractions/Models/CustomFieldDictionary.cs +++ b/src/core/Elsa.Abstractions/Models/CustomFieldDictionary.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json.Linq; -namespace Flowsharp.Models +namespace Elsa.Models { public class CustomFieldDictionary : Dictionary { diff --git a/src/core/Flowsharp.Abstractions/Models/Endpoint.cs b/src/core/Elsa.Abstractions/Models/Endpoint.cs similarity index 90% rename from src/core/Flowsharp.Abstractions/Models/Endpoint.cs rename to src/core/Elsa.Abstractions/Models/Endpoint.cs index addd2c34e..e6a349db7 100644 --- a/src/core/Flowsharp.Abstractions/Models/Endpoint.cs +++ b/src/core/Elsa.Abstractions/Models/Endpoint.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public abstract class Endpoint { diff --git a/src/core/Flowsharp.Abstractions/Models/SourceEndpoint.cs b/src/core/Elsa.Abstractions/Models/SourceEndpoint.cs similarity index 91% rename from src/core/Flowsharp.Abstractions/Models/SourceEndpoint.cs rename to src/core/Elsa.Abstractions/Models/SourceEndpoint.cs index 2befd5357..c070ca9d9 100644 --- a/src/core/Flowsharp.Abstractions/Models/SourceEndpoint.cs +++ b/src/core/Elsa.Abstractions/Models/SourceEndpoint.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public class SourceEndpoint : Endpoint { diff --git a/src/core/Flowsharp.Abstractions/Models/TargetEndpoint.cs b/src/core/Elsa.Abstractions/Models/TargetEndpoint.cs similarity index 88% rename from src/core/Flowsharp.Abstractions/Models/TargetEndpoint.cs rename to src/core/Elsa.Abstractions/Models/TargetEndpoint.cs index 9491d5cd6..e8f5e4e89 100644 --- a/src/core/Flowsharp.Abstractions/Models/TargetEndpoint.cs +++ b/src/core/Elsa.Abstractions/Models/TargetEndpoint.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public class TargetEndpoint : Endpoint { diff --git a/src/core/Flowsharp.Abstractions/Models/Variables.cs b/src/core/Elsa.Abstractions/Models/Variables.cs similarity index 94% rename from src/core/Flowsharp.Abstractions/Models/Variables.cs rename to src/core/Elsa.Abstractions/Models/Variables.cs index 5694dff73..dfdc4092e 100644 --- a/src/core/Flowsharp.Abstractions/Models/Variables.cs +++ b/src/core/Elsa.Abstractions/Models/Variables.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Flowsharp.Models +namespace Elsa.Models { public class Variables : Dictionary { diff --git a/src/core/Flowsharp.Abstractions/Models/Workflow.cs b/src/core/Elsa.Abstractions/Models/Workflow.cs similarity index 98% rename from src/core/Flowsharp.Abstractions/Models/Workflow.cs rename to src/core/Elsa.Abstractions/Models/Workflow.cs index 2672481a2..a744ada4e 100644 --- a/src/core/Flowsharp.Abstractions/Models/Workflow.cs +++ b/src/core/Elsa.Abstractions/Models/Workflow.cs @@ -3,7 +3,7 @@ using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace Flowsharp.Models +namespace Elsa.Models { public class Workflow { diff --git a/src/core/Flowsharp.Abstractions/Models/WorkflowExecutionContext.cs b/src/core/Elsa.Abstractions/Models/WorkflowExecutionContext.cs similarity index 99% rename from src/core/Flowsharp.Abstractions/Models/WorkflowExecutionContext.cs rename to src/core/Elsa.Abstractions/Models/WorkflowExecutionContext.cs index 6235e64c8..d73294275 100644 --- a/src/core/Flowsharp.Abstractions/Models/WorkflowExecutionContext.cs +++ b/src/core/Elsa.Abstractions/Models/WorkflowExecutionContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Flowsharp.Models +namespace Elsa.Models { public class WorkflowExecutionContext { diff --git a/src/core/Flowsharp.Abstractions/Models/WorkflowExecutionScope.cs b/src/core/Elsa.Abstractions/Models/WorkflowExecutionScope.cs similarity index 94% rename from src/core/Flowsharp.Abstractions/Models/WorkflowExecutionScope.cs rename to src/core/Elsa.Abstractions/Models/WorkflowExecutionScope.cs index a9e1ca1e4..5d3effa2f 100644 --- a/src/core/Flowsharp.Abstractions/Models/WorkflowExecutionScope.cs +++ b/src/core/Elsa.Abstractions/Models/WorkflowExecutionScope.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public class WorkflowExecutionScope { diff --git a/src/core/Flowsharp.Abstractions/Models/WorkflowFault.cs b/src/core/Elsa.Abstractions/Models/WorkflowFault.cs similarity index 82% rename from src/core/Flowsharp.Abstractions/Models/WorkflowFault.cs rename to src/core/Elsa.Abstractions/Models/WorkflowFault.cs index 0e1828350..cd7f0bab1 100644 --- a/src/core/Flowsharp.Abstractions/Models/WorkflowFault.cs +++ b/src/core/Elsa.Abstractions/Models/WorkflowFault.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public class WorkflowFault { diff --git a/src/core/Flowsharp.Abstractions/Models/WorkflowMetadata.cs b/src/core/Elsa.Abstractions/Models/WorkflowMetadata.cs similarity index 91% rename from src/core/Flowsharp.Abstractions/Models/WorkflowMetadata.cs rename to src/core/Elsa.Abstractions/Models/WorkflowMetadata.cs index e62250ce4..7218d0b61 100644 --- a/src/core/Flowsharp.Abstractions/Models/WorkflowMetadata.cs +++ b/src/core/Elsa.Abstractions/Models/WorkflowMetadata.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Models +namespace Elsa.Models { public class WorkflowMetadata { diff --git a/src/core/Flowsharp.Abstractions/Models/WorkflowStatus.cs b/src/core/Elsa.Abstractions/Models/WorkflowStatus.cs similarity index 85% rename from src/core/Flowsharp.Abstractions/Models/WorkflowStatus.cs rename to src/core/Elsa.Abstractions/Models/WorkflowStatus.cs index 658dd047f..23a3dc045 100644 --- a/src/core/Flowsharp.Abstractions/Models/WorkflowStatus.cs +++ b/src/core/Elsa.Abstractions/Models/WorkflowStatus.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Models +namespace Elsa.Models { public enum WorkflowStatus { diff --git a/src/core/Flowsharp.Abstractions/Results/ActivityExecutionResult.cs b/src/core/Elsa.Abstractions/Results/ActivityExecutionResult.cs similarity index 91% rename from src/core/Flowsharp.Abstractions/Results/ActivityExecutionResult.cs rename to src/core/Elsa.Abstractions/Results/ActivityExecutionResult.cs index 8636184a9..4d994bee3 100644 --- a/src/core/Flowsharp.Abstractions/Results/ActivityExecutionResult.cs +++ b/src/core/Elsa.Abstractions/Results/ActivityExecutionResult.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { public abstract class ActivityExecutionResult : IActivityExecutionResult { diff --git a/src/core/Flowsharp.Abstractions/Results/NoopResult.cs b/src/core/Elsa.Abstractions/Results/NoopResult.cs similarity index 84% rename from src/core/Flowsharp.Abstractions/Results/NoopResult.cs rename to src/core/Elsa.Abstractions/Results/NoopResult.cs index 0418d8070..c2e032944 100644 --- a/src/core/Flowsharp.Abstractions/Results/NoopResult.cs +++ b/src/core/Elsa.Abstractions/Results/NoopResult.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { /// /// A result that does nothing. diff --git a/src/core/Flowsharp.Abstractions/Serialization/Extensions/StringExtensions.cs b/src/core/Elsa.Abstractions/Serialization/Extensions/StringExtensions.cs similarity index 91% rename from src/core/Flowsharp.Abstractions/Serialization/Extensions/StringExtensions.cs rename to src/core/Elsa.Abstractions/Serialization/Extensions/StringExtensions.cs index bd8371da4..65e5fe289 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/Extensions/StringExtensions.cs +++ b/src/core/Elsa.Abstractions/Serialization/Extensions/StringExtensions.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; -namespace Flowsharp.Serialization.Extensions +namespace Elsa.Serialization.Extensions { public static class StringExtensions { diff --git a/src/core/Flowsharp.Abstractions/Serialization/Formatters/ITokenFormatter.cs b/src/core/Elsa.Abstractions/Serialization/Formatters/ITokenFormatter.cs similarity index 83% rename from src/core/Flowsharp.Abstractions/Serialization/Formatters/ITokenFormatter.cs rename to src/core/Elsa.Abstractions/Serialization/Formatters/ITokenFormatter.cs index 64e8f0190..ef34a994e 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/Formatters/ITokenFormatter.cs +++ b/src/core/Elsa.Abstractions/Serialization/Formatters/ITokenFormatter.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Formatters +namespace Elsa.Serialization.Formatters { public interface ITokenFormatter { diff --git a/src/core/Flowsharp.Abstractions/Serialization/ITokenFormatterProvider.cs b/src/core/Elsa.Abstractions/Serialization/ITokenFormatterProvider.cs similarity index 60% rename from src/core/Flowsharp.Abstractions/Serialization/ITokenFormatterProvider.cs rename to src/core/Elsa.Abstractions/Serialization/ITokenFormatterProvider.cs index 1175a7b76..626261d3a 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/ITokenFormatterProvider.cs +++ b/src/core/Elsa.Abstractions/Serialization/ITokenFormatterProvider.cs @@ -1,6 +1,6 @@ -using Flowsharp.Serialization.Formatters; +using Elsa.Serialization.Formatters; -namespace Flowsharp.Serialization +namespace Elsa.Serialization { public interface ITokenFormatterProvider { diff --git a/src/core/Flowsharp.Abstractions/Serialization/IWorkflowSerializer.cs b/src/core/Elsa.Abstractions/Serialization/IWorkflowSerializer.cs similarity index 92% rename from src/core/Flowsharp.Abstractions/Serialization/IWorkflowSerializer.cs rename to src/core/Elsa.Abstractions/Serialization/IWorkflowSerializer.cs index 9f8fb27d1..cdf253c66 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/IWorkflowSerializer.cs +++ b/src/core/Elsa.Abstractions/Serialization/IWorkflowSerializer.cs @@ -1,9 +1,9 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization +namespace Elsa.Serialization { public interface IWorkflowSerializer { diff --git a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/ITokenizer.cs b/src/core/Elsa.Abstractions/Serialization/Tokenizers/ITokenizer.cs similarity index 88% rename from src/core/Flowsharp.Abstractions/Serialization/Tokenizers/ITokenizer.cs rename to src/core/Elsa.Abstractions/Serialization/Tokenizers/ITokenizer.cs index 22c8d5dca..c3079b80a 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/ITokenizer.cs +++ b/src/core/Elsa.Abstractions/Serialization/Tokenizers/ITokenizer.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public interface ITokenizer { diff --git a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/ITokenizerInvoker.cs b/src/core/Elsa.Abstractions/Serialization/Tokenizers/ITokenizerInvoker.cs similarity index 84% rename from src/core/Flowsharp.Abstractions/Serialization/Tokenizers/ITokenizerInvoker.cs rename to src/core/Elsa.Abstractions/Serialization/Tokenizers/ITokenizerInvoker.cs index b2e5a5678..cf608e715 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/ITokenizerInvoker.cs +++ b/src/core/Elsa.Abstractions/Serialization/Tokenizers/ITokenizerInvoker.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public interface ITokenizerInvoker { diff --git a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/IWorkflowTokenizer.cs b/src/core/Elsa.Abstractions/Serialization/Tokenizers/IWorkflowTokenizer.cs similarity index 88% rename from src/core/Flowsharp.Abstractions/Serialization/Tokenizers/IWorkflowTokenizer.cs rename to src/core/Elsa.Abstractions/Serialization/Tokenizers/IWorkflowTokenizer.cs index 1696aaa6a..b34c0be9e 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/IWorkflowTokenizer.cs +++ b/src/core/Elsa.Abstractions/Serialization/Tokenizers/IWorkflowTokenizer.cs @@ -1,9 +1,9 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public interface IWorkflowTokenizer { diff --git a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/WorkflowTokenizationContext.cs b/src/core/Elsa.Abstractions/Serialization/Tokenizers/WorkflowTokenizationContext.cs similarity index 84% rename from src/core/Flowsharp.Abstractions/Serialization/Tokenizers/WorkflowTokenizationContext.cs rename to src/core/Elsa.Abstractions/Serialization/Tokenizers/WorkflowTokenizationContext.cs index 947bd19d6..9e23c8441 100644 --- a/src/core/Flowsharp.Abstractions/Serialization/Tokenizers/WorkflowTokenizationContext.cs +++ b/src/core/Elsa.Abstractions/Serialization/Tokenizers/WorkflowTokenizationContext.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public class WorkflowTokenizationContext { diff --git a/src/core/Flowsharp.Core/Activities/UnknownActivity.cs b/src/core/Elsa.Core/Activities/UnknownActivity.cs similarity index 67% rename from src/core/Flowsharp.Core/Activities/UnknownActivity.cs rename to src/core/Elsa.Core/Activities/UnknownActivity.cs index 91f5ed7d8..87b0275af 100644 --- a/src/core/Flowsharp.Core/Activities/UnknownActivity.cs +++ b/src/core/Elsa.Core/Activities/UnknownActivity.cs @@ -1,7 +1,7 @@ using System.ComponentModel; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Activities +namespace Elsa.Activities { [Browsable(false)] public class UnknownActivity : Activity diff --git a/src/core/Flowsharp.Core/ActivityLibrary.cs b/src/core/Elsa.Core/ActivityLibrary.cs similarity index 94% rename from src/core/Flowsharp.Core/ActivityLibrary.cs rename to src/core/Elsa.Core/ActivityLibrary.cs index fd8f05258..f6d967f16 100644 --- a/src/core/Flowsharp.Core/ActivityLibrary.cs +++ b/src/core/Elsa.Core/ActivityLibrary.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp +namespace Elsa { public class ActivityLibrary : IActivityLibrary { diff --git a/src/core/Flowsharp.Core/ActivityProviders/TypedActivityProvider.cs b/src/core/Elsa.Core/ActivityProviders/TypedActivityProvider.cs similarity index 95% rename from src/core/Flowsharp.Core/ActivityProviders/TypedActivityProvider.cs rename to src/core/Elsa.Core/ActivityProviders/TypedActivityProvider.cs index 1f4a51f05..0e18309ed 100644 --- a/src/core/Flowsharp.Core/ActivityProviders/TypedActivityProvider.cs +++ b/src/core/Elsa.Core/ActivityProviders/TypedActivityProvider.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.ActivityProviders +namespace Elsa.ActivityProviders { public class TypedActivityProvider : IActivityProvider { diff --git a/src/core/Flowsharp.Core/DefaultIdGenerator.cs b/src/core/Elsa.Core/DefaultIdGenerator.cs similarity index 62% rename from src/core/Flowsharp.Core/DefaultIdGenerator.cs rename to src/core/Elsa.Core/DefaultIdGenerator.cs index 7e4cf5755..3d665a0ea 100644 --- a/src/core/Flowsharp.Core/DefaultIdGenerator.cs +++ b/src/core/Elsa.Core/DefaultIdGenerator.cs @@ -1,7 +1,6 @@ using System; -using Flowsharp.Web.Abstractions.Services; -namespace Flowsharp.Web.Management.Services +namespace Elsa { public class DefaultIdGenerator : IIdGenerator { diff --git a/src/core/Flowsharp.Core/Flowsharp.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj similarity index 87% rename from src/core/Flowsharp.Core/Flowsharp.Core.csproj rename to src/core/Elsa.Core/Elsa.Core.csproj index b1288b12f..ec66b003c 100644 --- a/src/core/Flowsharp.Core/Flowsharp.Core.csproj +++ b/src/core/Elsa.Core/Elsa.Core.csproj @@ -2,7 +2,7 @@ netstandard2.0 - Flowsharp + Elsa 7.1 @@ -19,7 +19,7 @@ - + \ No newline at end of file diff --git a/src/core/Flowsharp.Core/Expressions/JavaScriptEvaluator.cs b/src/core/Elsa.Core/Expressions/JavaScriptEvaluator.cs similarity index 95% rename from src/core/Flowsharp.Core/Expressions/JavaScriptEvaluator.cs rename to src/core/Elsa.Core/Expressions/JavaScriptEvaluator.cs index 3b2e00016..8b1639e4f 100644 --- a/src/core/Flowsharp.Core/Expressions/JavaScriptEvaluator.cs +++ b/src/core/Elsa.Core/Expressions/JavaScriptEvaluator.cs @@ -1,10 +1,10 @@ using System; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; using Jint; -namespace Flowsharp.Expressions +namespace Elsa.Expressions { public class JavaScriptEvaluator : IExpressionEvaluator { diff --git a/src/core/Flowsharp.Core/Expressions/PlainTextEvaluator.cs b/src/core/Elsa.Core/Expressions/PlainTextEvaluator.cs similarity index 89% rename from src/core/Flowsharp.Core/Expressions/PlainTextEvaluator.cs rename to src/core/Elsa.Core/Expressions/PlainTextEvaluator.cs index b784825a3..29ad7d4fa 100644 --- a/src/core/Flowsharp.Core/Expressions/PlainTextEvaluator.cs +++ b/src/core/Elsa.Core/Expressions/PlainTextEvaluator.cs @@ -1,9 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Expressions +namespace Elsa.Expressions { public class PlainTextEvaluator : IExpressionEvaluator { diff --git a/src/core/Flowsharp.Core/Expressions/WorkflowExpressionEvaluator.cs b/src/core/Elsa.Core/Expressions/WorkflowExpressionEvaluator.cs similarity index 93% rename from src/core/Flowsharp.Core/Expressions/WorkflowExpressionEvaluator.cs rename to src/core/Elsa.Core/Expressions/WorkflowExpressionEvaluator.cs index 7e3de955c..93db791be 100644 --- a/src/core/Flowsharp.Core/Expressions/WorkflowExpressionEvaluator.cs +++ b/src/core/Elsa.Core/Expressions/WorkflowExpressionEvaluator.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Expressions +namespace Elsa.Expressions { public class WorkflowExpressionEvaluator : IWorkflowExpressionEvaluator { diff --git a/src/core/Flowsharp.Core/Extensions/ExceptionExtensions.cs b/src/core/Elsa.Core/Extensions/ExceptionExtensions.cs similarity index 92% rename from src/core/Flowsharp.Core/Extensions/ExceptionExtensions.cs rename to src/core/Elsa.Core/Extensions/ExceptionExtensions.cs index bd48db0cb..069d3b936 100644 --- a/src/core/Flowsharp.Core/Extensions/ExceptionExtensions.cs +++ b/src/core/Elsa.Core/Extensions/ExceptionExtensions.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Security; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class ExceptionExtensions { diff --git a/src/core/Flowsharp.Core/Extensions/InvokeExtensions.cs b/src/core/Elsa.Core/Extensions/InvokeExtensions.cs similarity index 98% rename from src/core/Flowsharp.Core/Extensions/InvokeExtensions.cs rename to src/core/Elsa.Core/Extensions/InvokeExtensions.cs index 24e9c1c08..5b9648395 100644 --- a/src/core/Flowsharp.Core/Extensions/InvokeExtensions.cs +++ b/src/core/Elsa.Core/Extensions/InvokeExtensions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class InvokeExtensions { diff --git a/src/core/Flowsharp.Core/Extensions/ServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ServiceCollectionExtensions.cs similarity index 82% rename from src/core/Flowsharp.Core/Extensions/ServiceCollectionExtensions.cs rename to src/core/Elsa.Core/Extensions/ServiceCollectionExtensions.cs index e52a0457e..bf08b5d11 100644 --- a/src/core/Flowsharp.Core/Extensions/ServiceCollectionExtensions.cs +++ b/src/core/Elsa.Core/Extensions/ServiceCollectionExtensions.cs @@ -1,13 +1,11 @@ -using Flowsharp.ActivityProviders; -using Flowsharp.Expressions; -using Flowsharp.Serialization; -using Flowsharp.Serialization.Formatters; -using Flowsharp.Serialization.Tokenizers; -using Flowsharp.Web.Abstractions.Services; -using Flowsharp.Web.Management.Services; +using Elsa.ActivityProviders; +using Elsa.Expressions; +using Elsa.Serialization; +using Elsa.Serialization.Formatters; +using Elsa.Serialization.Tokenizers; using Microsoft.Extensions.DependencyInjection; -namespace Flowsharp.Extensions +namespace Elsa.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/core/Flowsharp.Core/Handlers/ActivityHandler.cs b/src/core/Elsa.Core/Handlers/ActivityHandler.cs similarity index 93% rename from src/core/Flowsharp.Core/Handlers/ActivityHandler.cs rename to src/core/Elsa.Core/Handlers/ActivityHandler.cs index a07d5ecb9..6fdaf51bc 100644 --- a/src/core/Flowsharp.Core/Handlers/ActivityHandler.cs +++ b/src/core/Elsa.Core/Handlers/ActivityHandler.cs @@ -1,7 +1,7 @@ using System; -using Flowsharp.Results; +using Elsa.Results; -namespace Flowsharp.Handlers +namespace Elsa.Handlers { public abstract class ActivityHandler : ActivityHandlerBase where T : IActivity { diff --git a/src/core/Flowsharp.Core/Handlers/UnknownActivityHandler.cs b/src/core/Elsa.Core/Handlers/UnknownActivityHandler.cs similarity index 85% rename from src/core/Flowsharp.Core/Handlers/UnknownActivityHandler.cs rename to src/core/Elsa.Core/Handlers/UnknownActivityHandler.cs index 964e7af34..3f7a1dc0d 100644 --- a/src/core/Flowsharp.Core/Handlers/UnknownActivityHandler.cs +++ b/src/core/Elsa.Core/Handlers/UnknownActivityHandler.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.ComponentModel; using System.Linq; -using Flowsharp.Activities; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Activities; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Localization; -namespace Flowsharp.Handlers +namespace Elsa.Handlers { public class UnknownActivityHandler : ActivityHandler { diff --git a/src/core/Flowsharp.Core/Results/FaultWorkflowResult.cs b/src/core/Elsa.Core/Results/FaultWorkflowResult.cs similarity index 92% rename from src/core/Flowsharp.Core/Results/FaultWorkflowResult.cs rename to src/core/Elsa.Core/Results/FaultWorkflowResult.cs index b341dc724..d2a35f9b0 100644 --- a/src/core/Flowsharp.Core/Results/FaultWorkflowResult.cs +++ b/src/core/Elsa.Core/Results/FaultWorkflowResult.cs @@ -1,7 +1,7 @@ using System; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { public class FaultWorkflowResult : ActivityExecutionResult { diff --git a/src/core/Flowsharp.Core/Results/FinishWorkflowResult.cs b/src/core/Elsa.Core/Results/FinishWorkflowResult.cs similarity index 81% rename from src/core/Flowsharp.Core/Results/FinishWorkflowResult.cs rename to src/core/Elsa.Core/Results/FinishWorkflowResult.cs index 67efadf5e..1ac242724 100644 --- a/src/core/Flowsharp.Core/Results/FinishWorkflowResult.cs +++ b/src/core/Elsa.Core/Results/FinishWorkflowResult.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { public class FinishWorkflowResult : ActivityExecutionResult { diff --git a/src/core/Flowsharp.Core/Results/HaltResult.cs b/src/core/Elsa.Core/Results/HaltResult.cs similarity index 94% rename from src/core/Flowsharp.Core/Results/HaltResult.cs rename to src/core/Elsa.Core/Results/HaltResult.cs index 73fa9ad7e..a3384700e 100644 --- a/src/core/Flowsharp.Core/Results/HaltResult.cs +++ b/src/core/Elsa.Core/Results/HaltResult.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { /// /// Halts workflow execution. diff --git a/src/core/Flowsharp.Core/Results/ReturnValueResult.cs b/src/core/Elsa.Core/Results/ReturnValueResult.cs similarity index 87% rename from src/core/Flowsharp.Core/Results/ReturnValueResult.cs rename to src/core/Elsa.Core/Results/ReturnValueResult.cs index e4a2e265d..93fe4d4fb 100644 --- a/src/core/Flowsharp.Core/Results/ReturnValueResult.cs +++ b/src/core/Elsa.Core/Results/ReturnValueResult.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { public class ReturnValueResult : ActivityExecutionResult { diff --git a/src/core/Flowsharp.Core/Results/ScheduleActivityResult.cs b/src/core/Elsa.Core/Results/ScheduleActivityResult.cs similarity index 88% rename from src/core/Flowsharp.Core/Results/ScheduleActivityResult.cs rename to src/core/Elsa.Core/Results/ScheduleActivityResult.cs index 7d028538c..c9c10f25e 100644 --- a/src/core/Flowsharp.Core/Results/ScheduleActivityResult.cs +++ b/src/core/Elsa.Core/Results/ScheduleActivityResult.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { public class ScheduleActivityResult : ActivityExecutionResult { diff --git a/src/core/Flowsharp.Core/Results/TriggerEndpointResult.cs b/src/core/Elsa.Core/Results/TriggerEndpointResult.cs similarity index 92% rename from src/core/Flowsharp.Core/Results/TriggerEndpointResult.cs rename to src/core/Elsa.Core/Results/TriggerEndpointResult.cs index f82df099c..82fdb20cb 100644 --- a/src/core/Flowsharp.Core/Results/TriggerEndpointResult.cs +++ b/src/core/Elsa.Core/Results/TriggerEndpointResult.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Results +namespace Elsa.Results { /// /// A result that carries information about the next activity to execute. diff --git a/src/core/Flowsharp.Core/Serialization/Formatters/JsonTokenFormatter.cs b/src/core/Elsa.Core/Serialization/Formatters/JsonTokenFormatter.cs similarity index 90% rename from src/core/Flowsharp.Core/Serialization/Formatters/JsonTokenFormatter.cs rename to src/core/Elsa.Core/Serialization/Formatters/JsonTokenFormatter.cs index 06957bd3a..11f3cc887 100644 --- a/src/core/Flowsharp.Core/Serialization/Formatters/JsonTokenFormatter.cs +++ b/src/core/Elsa.Core/Serialization/Formatters/JsonTokenFormatter.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Formatters +namespace Elsa.Serialization.Formatters { public class JsonTokenFormatter : ITokenFormatter { diff --git a/src/core/Flowsharp.Core/Serialization/Formatters/XmlTokenFormatter.cs b/src/core/Elsa.Core/Serialization/Formatters/XmlTokenFormatter.cs similarity index 94% rename from src/core/Flowsharp.Core/Serialization/Formatters/XmlTokenFormatter.cs rename to src/core/Elsa.Core/Serialization/Formatters/XmlTokenFormatter.cs index edc4f960a..06cf89c73 100644 --- a/src/core/Flowsharp.Core/Serialization/Formatters/XmlTokenFormatter.cs +++ b/src/core/Elsa.Core/Serialization/Formatters/XmlTokenFormatter.cs @@ -2,7 +2,7 @@ using System.Xml.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Formatters +namespace Elsa.Serialization.Formatters { public class XmlTokenFormatter : ITokenFormatter { diff --git a/src/core/Flowsharp.Core/Serialization/Formatters/YamlTokenFormatter.cs b/src/core/Elsa.Core/Serialization/Formatters/YamlTokenFormatter.cs similarity index 96% rename from src/core/Flowsharp.Core/Serialization/Formatters/YamlTokenFormatter.cs rename to src/core/Elsa.Core/Serialization/Formatters/YamlTokenFormatter.cs index 939c5bd8f..03a04550d 100644 --- a/src/core/Flowsharp.Core/Serialization/Formatters/YamlTokenFormatter.cs +++ b/src/core/Elsa.Core/Serialization/Formatters/YamlTokenFormatter.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using YamlDotNet.Serialization; -namespace Flowsharp.Serialization.Formatters +namespace Elsa.Serialization.Formatters { public class YamlTokenFormatter : ITokenFormatter { diff --git a/src/core/Flowsharp.Core/Serialization/Json/LocalizedStringConverter.cs b/src/core/Elsa.Core/Serialization/Json/LocalizedStringConverter.cs similarity index 95% rename from src/core/Flowsharp.Core/Serialization/Json/LocalizedStringConverter.cs rename to src/core/Elsa.Core/Serialization/Json/LocalizedStringConverter.cs index 406598fce..83886a9ed 100644 --- a/src/core/Flowsharp.Core/Serialization/Json/LocalizedStringConverter.cs +++ b/src/core/Elsa.Core/Serialization/Json/LocalizedStringConverter.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Localization; using Newtonsoft.Json; -namespace Flowsharp.Serialization.Json +namespace Elsa.Serialization.Json { /// /// Serializes the to a simple string using the translated text. diff --git a/src/core/Flowsharp.Core/Serialization/TokenFormatterProvider.cs b/src/core/Elsa.Core/Serialization/TokenFormatterProvider.cs similarity index 87% rename from src/core/Flowsharp.Core/Serialization/TokenFormatterProvider.cs rename to src/core/Elsa.Core/Serialization/TokenFormatterProvider.cs index 74a3004d7..3f3896b61 100644 --- a/src/core/Flowsharp.Core/Serialization/TokenFormatterProvider.cs +++ b/src/core/Elsa.Core/Serialization/TokenFormatterProvider.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Flowsharp.Serialization.Formatters; +using Elsa.Serialization.Formatters; -namespace Flowsharp.Serialization +namespace Elsa.Serialization { public class TokenFormatterProvider : ITokenFormatterProvider { diff --git a/src/core/Flowsharp.Core/Serialization/Tokenizers/ActivityTokenizer.cs b/src/core/Elsa.Core/Serialization/Tokenizers/ActivityTokenizer.cs similarity index 94% rename from src/core/Flowsharp.Core/Serialization/Tokenizers/ActivityTokenizer.cs rename to src/core/Elsa.Core/Serialization/Tokenizers/ActivityTokenizer.cs index 7dce9eab9..2c9f05119 100644 --- a/src/core/Flowsharp.Core/Serialization/Tokenizers/ActivityTokenizer.cs +++ b/src/core/Elsa.Core/Serialization/Tokenizers/ActivityTokenizer.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public class ActivityTokenizer : Tokenizer { diff --git a/src/core/Flowsharp.Core/Serialization/Tokenizers/DefaultTokenizer.cs b/src/core/Elsa.Core/Serialization/Tokenizers/DefaultTokenizer.cs similarity index 93% rename from src/core/Flowsharp.Core/Serialization/Tokenizers/DefaultTokenizer.cs rename to src/core/Elsa.Core/Serialization/Tokenizers/DefaultTokenizer.cs index c73deb5b2..2c81084f7 100644 --- a/src/core/Flowsharp.Core/Serialization/Tokenizers/DefaultTokenizer.cs +++ b/src/core/Elsa.Core/Serialization/Tokenizers/DefaultTokenizer.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public class DefaultTokenizer : Tokenizer { diff --git a/src/core/Flowsharp.Core/Serialization/Tokenizers/Tokenizer.cs b/src/core/Elsa.Core/Serialization/Tokenizers/Tokenizer.cs similarity index 94% rename from src/core/Flowsharp.Core/Serialization/Tokenizers/Tokenizer.cs rename to src/core/Elsa.Core/Serialization/Tokenizers/Tokenizer.cs index c7404c52f..148cbd8d1 100644 --- a/src/core/Flowsharp.Core/Serialization/Tokenizers/Tokenizer.cs +++ b/src/core/Elsa.Core/Serialization/Tokenizers/Tokenizer.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public abstract class Tokenizer : ITokenizer { diff --git a/src/core/Flowsharp.Core/Serialization/Tokenizers/TokenizerInvoker.cs b/src/core/Elsa.Core/Serialization/Tokenizers/TokenizerInvoker.cs similarity index 94% rename from src/core/Flowsharp.Core/Serialization/Tokenizers/TokenizerInvoker.cs rename to src/core/Elsa.Core/Serialization/Tokenizers/TokenizerInvoker.cs index 7ea42a81a..d3230dfa1 100644 --- a/src/core/Flowsharp.Core/Serialization/Tokenizers/TokenizerInvoker.cs +++ b/src/core/Elsa.Core/Serialization/Tokenizers/TokenizerInvoker.cs @@ -2,7 +2,7 @@ using System.Linq; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public class TokenizerInvoker : ITokenizerInvoker { diff --git a/src/core/Flowsharp.Core/Serialization/Tokenizers/WorkflowTokenizer.cs b/src/core/Elsa.Core/Serialization/Tokenizers/WorkflowTokenizer.cs similarity index 98% rename from src/core/Flowsharp.Core/Serialization/Tokenizers/WorkflowTokenizer.cs rename to src/core/Elsa.Core/Serialization/Tokenizers/WorkflowTokenizer.cs index 2c156bdfd..c87da5b52 100644 --- a/src/core/Flowsharp.Core/Serialization/Tokenizers/WorkflowTokenizer.cs +++ b/src/core/Elsa.Core/Serialization/Tokenizers/WorkflowTokenizer.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Activities; -using Flowsharp.Extensions; -using Flowsharp.Models; +using Elsa.Activities; +using Elsa.Extensions; +using Elsa.Models; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace Flowsharp.Serialization.Tokenizers +namespace Elsa.Serialization.Tokenizers { public class WorkflowTokenizer : IWorkflowTokenizer { diff --git a/src/core/Flowsharp.Core/Serialization/WorkflowSerializer.cs b/src/core/Elsa.Core/Serialization/WorkflowSerializer.cs similarity index 92% rename from src/core/Flowsharp.Core/Serialization/WorkflowSerializer.cs rename to src/core/Elsa.Core/Serialization/WorkflowSerializer.cs index 320e680d9..ffe05d824 100644 --- a/src/core/Flowsharp.Core/Serialization/WorkflowSerializer.cs +++ b/src/core/Elsa.Core/Serialization/WorkflowSerializer.cs @@ -1,14 +1,12 @@ -using System; -using System.Threading; +using System.Threading; using System.Threading.Tasks; -using Flowsharp.Extensions; -using Flowsharp.Models; -using Flowsharp.Serialization.Formatters; -using Flowsharp.Serialization.Tokenizers; -using Flowsharp.Web.Abstractions.Services; +using Elsa.Extensions; +using Elsa.Models; +using Elsa.Serialization.Formatters; +using Elsa.Serialization.Tokenizers; using Newtonsoft.Json.Linq; -namespace Flowsharp.Serialization +namespace Elsa.Serialization { public class WorkflowSerializer : IWorkflowSerializer { diff --git a/src/core/Flowsharp.Core/WorkflowInvoker.cs b/src/core/Elsa.Core/WorkflowInvoker.cs similarity index 98% rename from src/core/Flowsharp.Core/WorkflowInvoker.cs rename to src/core/Elsa.Core/WorkflowInvoker.cs index 3c3572a88..f251210f2 100644 --- a/src/core/Flowsharp.Core/WorkflowInvoker.cs +++ b/src/core/Elsa.Core/WorkflowInvoker.cs @@ -2,11 +2,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Results; +using Elsa.Models; +using Elsa.Results; using Microsoft.Extensions.Logging; -namespace Flowsharp +namespace Elsa { public class WorkflowInvoker : IWorkflowInvoker { diff --git a/src/core/Elsa.Persistence.Abstractions/Elsa.Persistence.Abstractions.csproj b/src/core/Elsa.Persistence.Abstractions/Elsa.Persistence.Abstractions.csproj new file mode 100644 index 000000000..5fc03d8ac --- /dev/null +++ b/src/core/Elsa.Persistence.Abstractions/Elsa.Persistence.Abstractions.csproj @@ -0,0 +1,12 @@ + + + + netstandard2.0 + Elsa.Persistence + + + + + + + diff --git a/src/core/Flowsharp.Persistence.Abstractions/Extensions/SpecificationExtensions.cs b/src/core/Elsa.Persistence.Abstractions/Extensions/SpecificationExtensions.cs similarity index 89% rename from src/core/Flowsharp.Persistence.Abstractions/Extensions/SpecificationExtensions.cs rename to src/core/Elsa.Persistence.Abstractions/Extensions/SpecificationExtensions.cs index e8a9107c1..4acb4d271 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Extensions/SpecificationExtensions.cs +++ b/src/core/Elsa.Persistence.Abstractions/Extensions/SpecificationExtensions.cs @@ -1,6 +1,6 @@ -using Flowsharp.Persistence.Specifications.Primitives; +using Elsa.Persistence.Specifications.Primitives; -namespace Flowsharp.Persistence.Extensions +namespace Elsa.Persistence.Extensions { public static class SpecificationExtensions { diff --git a/src/core/Flowsharp.Persistence.Abstractions/ISpecification.cs b/src/core/Elsa.Persistence.Abstractions/ISpecification.cs similarity index 88% rename from src/core/Flowsharp.Persistence.Abstractions/ISpecification.cs rename to src/core/Elsa.Persistence.Abstractions/ISpecification.cs index 6696dfdaf..62d78d9dc 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/ISpecification.cs +++ b/src/core/Elsa.Persistence.Abstractions/ISpecification.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Persistence +namespace Elsa.Persistence { public interface ISpecification { diff --git a/src/core/Flowsharp.Persistence.Abstractions/ISpecificationVisitor.cs b/src/core/Elsa.Persistence.Abstractions/ISpecificationVisitor.cs similarity index 79% rename from src/core/Flowsharp.Persistence.Abstractions/ISpecificationVisitor.cs rename to src/core/Elsa.Persistence.Abstractions/ISpecificationVisitor.cs index dd4a04f81..c64d151c3 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/ISpecificationVisitor.cs +++ b/src/core/Elsa.Persistence.Abstractions/ISpecificationVisitor.cs @@ -1,6 +1,6 @@ -using Flowsharp.Persistence.Specifications.Primitives; +using Elsa.Persistence.Specifications.Primitives; -namespace Flowsharp.Persistence +namespace Elsa.Persistence { public interface ISpecificationVisitor where TVisitor : ISpecificationVisitor { diff --git a/src/core/Flowsharp.Persistence.Abstractions/IWorkflowSpecificationVisitor.cs b/src/core/Elsa.Persistence.Abstractions/IWorkflowSpecificationVisitor.cs similarity index 80% rename from src/core/Flowsharp.Persistence.Abstractions/IWorkflowSpecificationVisitor.cs rename to src/core/Elsa.Persistence.Abstractions/IWorkflowSpecificationVisitor.cs index 129dcff7b..5a8bef046 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/IWorkflowSpecificationVisitor.cs +++ b/src/core/Elsa.Persistence.Abstractions/IWorkflowSpecificationVisitor.cs @@ -1,7 +1,7 @@ -using Flowsharp.Models; -using Flowsharp.Persistence.Specifications; +using Elsa.Models; +using Elsa.Persistence.Specifications; -namespace Flowsharp.Persistence +namespace Elsa.Persistence { public interface IWorkflowSpecificationVisitor : ISpecificationVisitor { diff --git a/src/core/Flowsharp.Persistence.Abstractions/IWorkflowStore.cs b/src/core/Elsa.Persistence.Abstractions/IWorkflowStore.cs similarity index 91% rename from src/core/Flowsharp.Persistence.Abstractions/IWorkflowStore.cs rename to src/core/Elsa.Persistence.Abstractions/IWorkflowStore.cs index a42ff6b02..b0449b5dd 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/IWorkflowStore.cs +++ b/src/core/Elsa.Persistence.Abstractions/IWorkflowStore.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Persistence.Specifications; +using Elsa.Models; +using Elsa.Persistence.Specifications; -namespace Flowsharp.Persistence +namespace Elsa.Persistence { public interface IWorkflowStore { diff --git a/src/core/Elsa.Persistence.Abstractions/Specifications/AllWorkflows.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/AllWorkflows.cs new file mode 100644 index 000000000..d31fd96aa --- /dev/null +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/AllWorkflows.cs @@ -0,0 +1,9 @@ +using Elsa.Models; +using Elsa.Persistence.Specifications.Primitives; + +namespace Elsa.Persistence.Specifications +{ + public class AllWorkflows : All + { + } +} \ No newline at end of file diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/All.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/All.cs similarity index 80% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/All.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/All.cs index 4dbf36e54..9ea695767 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/All.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/All.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Persistence.Specifications.Primitives +namespace Elsa.Persistence.Specifications.Primitives { public class All : ISpecification where TVisitor : ISpecificationVisitor { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/And.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/And.cs similarity index 90% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/And.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/And.cs index cef302245..6a1f2ca30 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/And.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/And.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Persistence.Specifications.Primitives +namespace Elsa.Persistence.Specifications.Primitives { public class And : ISpecification where TVisitor : ISpecificationVisitor { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/Not.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/Not.cs similarity index 88% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/Not.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/Not.cs index 06c0f8ea9..6d88fe656 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/Not.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/Not.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Persistence.Specifications.Primitives +namespace Elsa.Persistence.Specifications.Primitives { public class Not : ISpecification where TVisitor : ISpecificationVisitor { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/Or.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/Or.cs similarity index 90% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/Or.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/Or.cs index 1df94bb10..aef2afea7 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/Primitives/Or.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/Primitives/Or.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Persistence.Specifications.Primitives +namespace Elsa.Persistence.Specifications.Primitives { public class Or : ISpecification where TVisitor : ISpecificationVisitor { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowById.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowById.cs similarity index 85% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowById.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowById.cs index c78fac5df..67d42d67b 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowById.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowById.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Persistence.Specifications +namespace Elsa.Persistence.Specifications { public class WorkflowById : ISpecification { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsBlockedOnActivity.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsBlockedOnActivity.cs similarity index 90% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsBlockedOnActivity.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsBlockedOnActivity.cs index 67bb51b52..d9cbe2e2a 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsBlockedOnActivity.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsBlockedOnActivity.cs @@ -1,7 +1,7 @@ using System.Linq; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Persistence.Specifications +namespace Elsa.Persistence.Specifications { public class WorkflowIsBlockedOnActivity: ISpecification { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsDefinition.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsDefinition.cs similarity index 75% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsDefinition.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsDefinition.cs index 2c8743313..ffbcdfd9a 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsDefinition.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsDefinition.cs @@ -1,7 +1,7 @@ -using Flowsharp.Extensions; -using Flowsharp.Models; +using Elsa.Extensions; +using Elsa.Models; -namespace Flowsharp.Persistence.Specifications +namespace Elsa.Persistence.Specifications { public class WorkflowIsDefinition : ISpecification { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsInstance.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsInstance.cs similarity index 75% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsInstance.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsInstance.cs index 8649ff343..6f5c90bd9 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowIsInstance.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowIsInstance.cs @@ -1,7 +1,7 @@ -using Flowsharp.Extensions; -using Flowsharp.Models; +using Elsa.Extensions; +using Elsa.Models; -namespace Flowsharp.Persistence.Specifications +namespace Elsa.Persistence.Specifications { public class WorkflowIsInstance : ISpecification { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowStartsWithActivity.cs b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowStartsWithActivity.cs similarity index 91% rename from src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowStartsWithActivity.cs rename to src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowStartsWithActivity.cs index 47eace0db..f311c39e5 100644 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/WorkflowStartsWithActivity.cs +++ b/src/core/Elsa.Persistence.Abstractions/Specifications/WorkflowStartsWithActivity.cs @@ -1,7 +1,7 @@ using System.Linq; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Persistence.Specifications +namespace Elsa.Persistence.Specifications { public class WorkflowStartsWithActivity : ISpecification { diff --git a/src/core/Flowsharp.Persistence.FileSystem/Flowsharp.Persistence.FileSystem.csproj b/src/core/Elsa.Persistence.FileSystem/Elsa.Persistence.FileSystem.csproj similarity index 71% rename from src/core/Flowsharp.Persistence.FileSystem/Flowsharp.Persistence.FileSystem.csproj rename to src/core/Elsa.Persistence.FileSystem/Elsa.Persistence.FileSystem.csproj index 4c901fbca..c8e698475 100644 --- a/src/core/Flowsharp.Persistence.FileSystem/Flowsharp.Persistence.FileSystem.csproj +++ b/src/core/Elsa.Persistence.FileSystem/Elsa.Persistence.FileSystem.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/core/Flowsharp.Persistence.FileSystem/Extensions/FileInfoBaseExtensions.cs b/src/core/Elsa.Persistence.FileSystem/Extensions/FileInfoBaseExtensions.cs similarity index 89% rename from src/core/Flowsharp.Persistence.FileSystem/Extensions/FileInfoBaseExtensions.cs rename to src/core/Elsa.Persistence.FileSystem/Extensions/FileInfoBaseExtensions.cs index c02fc3867..0e5d05005 100644 --- a/src/core/Flowsharp.Persistence.FileSystem/Extensions/FileInfoBaseExtensions.cs +++ b/src/core/Elsa.Persistence.FileSystem/Extensions/FileInfoBaseExtensions.cs @@ -2,7 +2,7 @@ using System.IO; using System.IO.Abstractions; using System.Threading.Tasks; -namespace Flowsharp.Persistence.FileSystem.Extensions +namespace Elsa.Persistence.FileSystem.Extensions { public static class FileInfoBaseExtensions { diff --git a/src/core/Flowsharp.Persistence.FileSystem/Extensions/ServiceCollectionExtensions.cs b/src/core/Elsa.Persistence.FileSystem/Extensions/ServiceCollectionExtensions.cs similarity index 86% rename from src/core/Flowsharp.Persistence.FileSystem/Extensions/ServiceCollectionExtensions.cs rename to src/core/Elsa.Persistence.FileSystem/Extensions/ServiceCollectionExtensions.cs index e87d8ca17..119233105 100644 --- a/src/core/Flowsharp.Persistence.FileSystem/Extensions/ServiceCollectionExtensions.cs +++ b/src/core/Elsa.Persistence.FileSystem/Extensions/ServiceCollectionExtensions.cs @@ -1,10 +1,10 @@ using System.IO.Abstractions; -using Flowsharp.Persistence.FileSystem.Options; +using Elsa.Persistence.FileSystem.Options; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Flowsharp.Persistence.FileSystem.Extensions +namespace Elsa.Persistence.FileSystem.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/core/Flowsharp.Persistence.FileSystem/FileSystemWorkflowStore.cs b/src/core/Elsa.Persistence.FileSystem/FileSystemWorkflowStore.cs similarity index 93% rename from src/core/Flowsharp.Persistence.FileSystem/FileSystemWorkflowStore.cs rename to src/core/Elsa.Persistence.FileSystem/FileSystemWorkflowStore.cs index cb437b186..7612a12dd 100644 --- a/src/core/Flowsharp.Persistence.FileSystem/FileSystemWorkflowStore.cs +++ b/src/core/Elsa.Persistence.FileSystem/FileSystemWorkflowStore.cs @@ -3,14 +3,12 @@ using System.IO.Abstractions; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Persistence.FileSystem.Extensions; -using Flowsharp.Persistence.FileSystem.Options; -using Flowsharp.Serialization; -using Flowsharp.Web.Abstractions.Services; +using Elsa.Models; +using Elsa.Persistence.FileSystem.Options; +using Elsa.Serialization; using Microsoft.Extensions.Options; -namespace Flowsharp.Persistence.FileSystem +namespace Elsa.Persistence.FileSystem { public class FileSystemWorkflowStore : IWorkflowStore { diff --git a/src/core/Flowsharp.Persistence.FileSystem/Options/FileSystemStoreOptions.cs b/src/core/Elsa.Persistence.FileSystem/Options/FileSystemStoreOptions.cs similarity index 74% rename from src/core/Flowsharp.Persistence.FileSystem/Options/FileSystemStoreOptions.cs rename to src/core/Elsa.Persistence.FileSystem/Options/FileSystemStoreOptions.cs index 84845a749..fdbe879e7 100644 --- a/src/core/Flowsharp.Persistence.FileSystem/Options/FileSystemStoreOptions.cs +++ b/src/core/Elsa.Persistence.FileSystem/Options/FileSystemStoreOptions.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Persistence.FileSystem.Options +namespace Elsa.Persistence.FileSystem.Options { public class FileSystemStoreOptions { diff --git a/src/core/Esla.Persistence.InMemory/Esla.Persistence.InMemory.csproj b/src/core/Esla.Persistence.InMemory/Esla.Persistence.InMemory.csproj new file mode 100644 index 000000000..28a7020d9 --- /dev/null +++ b/src/core/Esla.Persistence.InMemory/Esla.Persistence.InMemory.csproj @@ -0,0 +1,12 @@ + + + + netstandard2.0 + Elsa.Persistence.InMemory + + + + + + + diff --git a/src/core/Flowsharp.Persistence.InMemory/InMemoryWorkflowStore.cs b/src/core/Esla.Persistence.InMemory/InMemoryWorkflowStore.cs similarity index 95% rename from src/core/Flowsharp.Persistence.InMemory/InMemoryWorkflowStore.cs rename to src/core/Esla.Persistence.InMemory/InMemoryWorkflowStore.cs index 0b58acc5a..7e0c4c8ac 100644 --- a/src/core/Flowsharp.Persistence.InMemory/InMemoryWorkflowStore.cs +++ b/src/core/Esla.Persistence.InMemory/InMemoryWorkflowStore.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Persistence.InMemory +namespace Elsa.Persistence.InMemory { public class InMemoryWorkflowStore : IWorkflowStore { diff --git a/src/core/Esla.Runtime.Abstractions/Esla.Runtime.Abstractions.csproj b/src/core/Esla.Runtime.Abstractions/Esla.Runtime.Abstractions.csproj new file mode 100644 index 000000000..0ffc68c44 --- /dev/null +++ b/src/core/Esla.Runtime.Abstractions/Esla.Runtime.Abstractions.csproj @@ -0,0 +1,12 @@ + + + + netstandard2.0 + Elsa.Runtime + + + + + + + diff --git a/src/core/Flowsharp.Runtime.Abstractions/IWorkflowHost.cs b/src/core/Esla.Runtime.Abstractions/IWorkflowHost.cs similarity index 94% rename from src/core/Flowsharp.Runtime.Abstractions/IWorkflowHost.cs rename to src/core/Esla.Runtime.Abstractions/IWorkflowHost.cs index e982af85e..bf53ed40e 100644 --- a/src/core/Flowsharp.Runtime.Abstractions/IWorkflowHost.cs +++ b/src/core/Esla.Runtime.Abstractions/IWorkflowHost.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Runtime.Abstractions +namespace Elsa.Runtime { public interface IWorkflowHost { diff --git a/src/core/Esla.Runtime/Esla.Runtime.csproj b/src/core/Esla.Runtime/Esla.Runtime.csproj new file mode 100644 index 000000000..44ccb403a --- /dev/null +++ b/src/core/Esla.Runtime/Esla.Runtime.csproj @@ -0,0 +1,14 @@ + + + + netstandard2.0 + Elsa.Runtime + + + + + + + + + diff --git a/src/core/Flowsharp.Runtime/Extensions/ServiceCollectionExtensions.cs b/src/core/Esla.Runtime/Extensions/ServiceCollectionExtensions.cs similarity index 80% rename from src/core/Flowsharp.Runtime/Extensions/ServiceCollectionExtensions.cs rename to src/core/Esla.Runtime/Extensions/ServiceCollectionExtensions.cs index cc23c206d..9531347c5 100644 --- a/src/core/Flowsharp.Runtime/Extensions/ServiceCollectionExtensions.cs +++ b/src/core/Esla.Runtime/Extensions/ServiceCollectionExtensions.cs @@ -1,7 +1,6 @@ -using Flowsharp.Runtime.Abstractions; using Microsoft.Extensions.DependencyInjection; -namespace Flowsharp.Runtime.Extensions +namespace Elsa.Runtime.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/core/Flowsharp.Runtime/WorkflowHost.cs b/src/core/Esla.Runtime/WorkflowHost.cs similarity index 92% rename from src/core/Flowsharp.Runtime/WorkflowHost.cs rename to src/core/Esla.Runtime/WorkflowHost.cs index 7b37abc03..9b1ecfe2d 100644 --- a/src/core/Flowsharp.Runtime/WorkflowHost.cs +++ b/src/core/Esla.Runtime/WorkflowHost.cs @@ -1,15 +1,13 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Persistence; -using Flowsharp.Persistence.Extensions; -using Flowsharp.Persistence.Specifications; -using Flowsharp.Runtime.Abstractions; -using Flowsharp.Serialization; -using Flowsharp.Serialization.Extensions; +using Elsa.Models; +using Elsa.Persistence; +using Elsa.Persistence.Extensions; +using Elsa.Persistence.Specifications; +using Elsa.Serialization; -namespace Flowsharp.Runtime +namespace Elsa.Runtime { public class WorkflowHost : IWorkflowHost { diff --git a/src/core/Flowsharp.Persistence.Abstractions/Flowsharp.Persistence.Abstractions.csproj b/src/core/Flowsharp.Persistence.Abstractions/Flowsharp.Persistence.Abstractions.csproj deleted file mode 100644 index 3f2cddfb2..000000000 --- a/src/core/Flowsharp.Persistence.Abstractions/Flowsharp.Persistence.Abstractions.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - Flowsharp.Persistence - - - - - - - diff --git a/src/core/Flowsharp.Persistence.Abstractions/Specifications/AllWorkflows.cs b/src/core/Flowsharp.Persistence.Abstractions/Specifications/AllWorkflows.cs deleted file mode 100644 index 9f1161198..000000000 --- a/src/core/Flowsharp.Persistence.Abstractions/Specifications/AllWorkflows.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Flowsharp.Models; -using Flowsharp.Persistence.Specifications.Primitives; - -namespace Flowsharp.Persistence.Specifications -{ - public class AllWorkflows : All - { - } -} \ No newline at end of file diff --git a/src/core/Flowsharp.Persistence.InMemory/Flowsharp.Persistence.InMemory.csproj b/src/core/Flowsharp.Persistence.InMemory/Flowsharp.Persistence.InMemory.csproj deleted file mode 100644 index 06e900520..000000000 --- a/src/core/Flowsharp.Persistence.InMemory/Flowsharp.Persistence.InMemory.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/core/Flowsharp.Runtime.Abstractions/Flowsharp.Runtime.Abstractions.csproj b/src/core/Flowsharp.Runtime.Abstractions/Flowsharp.Runtime.Abstractions.csproj deleted file mode 100644 index 633d246d2..000000000 --- a/src/core/Flowsharp.Runtime.Abstractions/Flowsharp.Runtime.Abstractions.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/core/Flowsharp.Runtime/Flowsharp.Runtime.csproj b/src/core/Flowsharp.Runtime/Flowsharp.Runtime.csproj deleted file mode 100644 index f5f3512d3..000000000 --- a/src/core/Flowsharp.Runtime/Flowsharp.Runtime.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - diff --git a/src/samples/Riven.Web/Riven.Web.csproj b/src/samples/Riven.Web/Riven.Web.csproj deleted file mode 100644 index 146228e8c..000000000 --- a/src/samples/Riven.Web/Riven.Web.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netcoreapp2.2 - InProcess - latest - - - - - - - - - - - - - - - - - diff --git a/src/samples/Riven.Web/Controllers/ValuesController.cs b/src/samples/SampleHost.Web/Controllers/ValuesController.cs similarity index 86% rename from src/samples/Riven.Web/Controllers/ValuesController.cs rename to src/samples/SampleHost.Web/Controllers/ValuesController.cs index 0328f981d..ef8d60a1c 100644 --- a/src/samples/Riven.Web/Controllers/ValuesController.cs +++ b/src/samples/SampleHost.Web/Controllers/ValuesController.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; -namespace Riven.Web.Controllers +namespace SampleHost.Web.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/src/samples/Riven.Web/Program.cs b/src/samples/SampleHost.Web/Program.cs similarity index 95% rename from src/samples/Riven.Web/Program.cs rename to src/samples/SampleHost.Web/Program.cs index f459ea036..b91720ba0 100644 --- a/src/samples/Riven.Web/Program.cs +++ b/src/samples/SampleHost.Web/Program.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -namespace Riven.Web +namespace SampleHost.Web { public class Program { diff --git a/src/samples/Riven.Web/Properties/launchSettings.json b/src/samples/SampleHost.Web/Properties/launchSettings.json similarity index 96% rename from src/samples/Riven.Web/Properties/launchSettings.json rename to src/samples/SampleHost.Web/Properties/launchSettings.json index 22e8468ad..dbaa872ac 100644 --- a/src/samples/Riven.Web/Properties/launchSettings.json +++ b/src/samples/SampleHost.Web/Properties/launchSettings.json @@ -17,7 +17,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Riven.Web": { + "SampleHost.Web": { "commandName": "Project", "launchBrowser": true, "launchUrl": "api/values", diff --git a/src/samples/SampleHost.Web/SampleHost.Web.csproj b/src/samples/SampleHost.Web/SampleHost.Web.csproj new file mode 100644 index 000000000..ed7291749 --- /dev/null +++ b/src/samples/SampleHost.Web/SampleHost.Web.csproj @@ -0,0 +1,23 @@ + + + + netcoreapp2.2 + InProcess + latest + + + + + + + + + + + + + + + + + diff --git a/src/samples/Riven.Web/Startup.cs b/src/samples/SampleHost.Web/Startup.cs similarity index 81% rename from src/samples/Riven.Web/Startup.cs rename to src/samples/SampleHost.Web/Startup.cs index 2416bd5ab..62aac6de9 100644 --- a/src/samples/Riven.Web/Startup.cs +++ b/src/samples/SampleHost.Web/Startup.cs @@ -1,16 +1,16 @@ -using Flowsharp.Activities.Console.Extensions; -using Flowsharp.Activities.Http.Extensions; -using Flowsharp.Activities.Primitives.Extensions; -using Flowsharp.Extensions; -using Flowsharp.Persistence.FileSystem.Extensions; -using Flowsharp.Runtime.Extensions; +using Elsa.Activities.Console.Extensions; +using Elsa.Activities.Http.Extensions; +using Elsa.Activities.Primitives.Extensions; +using Elsa.Extensions; +using Elsa.Persistence.FileSystem.Extensions; +using Elsa.Runtime.Extensions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace Riven.Web +namespace SampleHost.Web { public class Startup { diff --git a/src/samples/Riven.Web/appsettings.Development.json b/src/samples/SampleHost.Web/appsettings.Development.json similarity index 100% rename from src/samples/Riven.Web/appsettings.Development.json rename to src/samples/SampleHost.Web/appsettings.Development.json diff --git a/src/samples/Riven.Web/appsettings.json b/src/samples/SampleHost.Web/appsettings.json similarity index 52% rename from src/samples/Riven.Web/appsettings.json rename to src/samples/SampleHost.Web/appsettings.json index eb7ca0895..1d35392b3 100644 --- a/src/samples/Riven.Web/appsettings.json +++ b/src/samples/SampleHost.Web/appsettings.json @@ -6,7 +6,7 @@ }, "AllowedHosts": "*", "FileStore": { - "RootDirectory": "C:\\Activities\\Projects\\Flowsharp\\src\\web\\dashboard\\App_Data\\Sites\\Default\\workflows\\workflows", + "RootDirectory": "C:\\Activities\\Projects\\Elsa\\src\\web\\dashboard\\App_Data\\Sites\\Default\\workflows\\workflows", "Format": "YAML" } } diff --git a/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj b/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj new file mode 100644 index 000000000..041299f5b --- /dev/null +++ b/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj @@ -0,0 +1,27 @@ + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/web/dashboard/Program.cs b/src/web/dashboard/Elsa.Web.Dashboard/Program.cs similarity index 91% rename from src/web/dashboard/Program.cs rename to src/web/dashboard/Elsa.Web.Dashboard/Program.cs index 0189c91b9..f44088d53 100644 --- a/src/web/dashboard/Program.cs +++ b/src/web/dashboard/Elsa.Web.Dashboard/Program.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -namespace Flowsharp.Web.Dashboard +namespace Elsa.Web.Dashboard { public class Program { diff --git a/src/web/dashboard/Properties/launchSettings.json b/src/web/dashboard/Elsa.Web.Dashboard/Properties/launchSettings.json similarity index 95% rename from src/web/dashboard/Properties/launchSettings.json rename to src/web/dashboard/Elsa.Web.Dashboard/Properties/launchSettings.json index 16b39cfa7..db68edb13 100644 --- a/src/web/dashboard/Properties/launchSettings.json +++ b/src/web/dashboard/Elsa.Web.Dashboard/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Flowsharp.Dashboard.Web": { + "Elsa.Dashboard.Web": { "commandName": "Project", "launchBrowser": true, "applicationUrl": "https://localhost:5001;http://localhost:5000", diff --git a/src/web/dashboard/Startup.cs b/src/web/dashboard/Elsa.Web.Dashboard/Startup.cs similarity index 88% rename from src/web/dashboard/Startup.cs rename to src/web/dashboard/Elsa.Web.Dashboard/Startup.cs index 53ee55205..abaf51d1a 100644 --- a/src/web/dashboard/Startup.cs +++ b/src/web/dashboard/Elsa.Web.Dashboard/Startup.cs @@ -1,9 +1,9 @@ -using Flowsharp.Web.Management.Extensions; +using Elsa.Web.Management.Extensions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -namespace Flowsharp.Web.Dashboard +namespace Elsa.Web.Dashboard { public class Startup { diff --git a/src/web/dashboard/Elsa.Web.Dashboard/tenants.json b/src/web/dashboard/Elsa.Web.Dashboard/tenants.json new file mode 100644 index 000000000..fc60155f1 --- /dev/null +++ b/src/web/dashboard/Elsa.Web.Dashboard/tenants.json @@ -0,0 +1,17 @@ +{ + "Default": { + "State": "Running", + "RequestUrlHost": null, + "RequestUrlPrefix": null, + "CurrentTheme" : "Elsa", + "Features": [ + "Elsa", + "Elsa.Web.Management", + "Elsa.Web.Persistence.FileSystem", + "Elsa.Web.Components", + "Elsa.Web.Activities.Primitives", + "Elsa.Web.Activities.Console", + "Elsa.Web.Activities.Http" + ] + } +} \ No newline at end of file diff --git a/src/web/dashboard/Flowsharp.Web.Dashboard.csproj b/src/web/dashboard/Flowsharp.Web.Dashboard.csproj deleted file mode 100644 index cf35afff0..000000000 --- a/src/web/dashboard/Flowsharp.Web.Dashboard.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.2 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/web/dashboard/tenants.json b/src/web/dashboard/tenants.json deleted file mode 100644 index ea44551cc..000000000 --- a/src/web/dashboard/tenants.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Default": { - "State": "Running", - "RequestUrlHost": null, - "RequestUrlPrefix": null, - "CurrentTheme" : "Flowsharp.Themes.Bootstrap", - "Features": [ - "Flowsharp.Themes.Bootstrap", - "Flowsharp.Web.Management", - "Flowsharp.Web.Persistence.FileSystem", - "Flowsharp.Web.ViewComponents", - "Flowsharp.Web.Activities.Primitives", - "Flowsharp.Web.Activities.Console", - "Flowsharp.Web.Activities.Http" - ] - } -} \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Abstractions/Drivers/ActivityDisplayDriver.cs b/src/web/modules/Elsa.Web.Abstractions/Drivers/ActivityDisplayDriver.cs similarity index 97% rename from src/web/modules/Flowsharp.Web.Abstractions/Drivers/ActivityDisplayDriver.cs rename to src/web/modules/Elsa.Web.Abstractions/Drivers/ActivityDisplayDriver.cs index b2eb86011..ed47225ce 100644 --- a/src/web/modules/Flowsharp.Web.Abstractions/Drivers/ActivityDisplayDriver.cs +++ b/src/web/modules/Elsa.Web.Abstractions/Drivers/ActivityDisplayDriver.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; -using Flowsharp.Web.Abstractions.ViewModels; +using Elsa.Web.ViewModels; using OrchardCore.DisplayManagement.Handlers; using OrchardCore.DisplayManagement.ModelBinding; using OrchardCore.DisplayManagement.Views; -namespace Flowsharp.Web.Abstractions.Drivers +namespace Elsa.Web.Drivers { /// /// Base class for activity drivers. diff --git a/src/web/modules/Flowsharp.Web.Abstractions/Flowsharp.Web.Abstractions.csproj b/src/web/modules/Elsa.Web.Abstractions/Elsa.Web.Abstractions.csproj similarity index 68% rename from src/web/modules/Flowsharp.Web.Abstractions/Flowsharp.Web.Abstractions.csproj rename to src/web/modules/Elsa.Web.Abstractions/Elsa.Web.Abstractions.csproj index 49fbbe2cd..b8a468be0 100644 --- a/src/web/modules/Flowsharp.Web.Abstractions/Flowsharp.Web.Abstractions.csproj +++ b/src/web/modules/Elsa.Web.Abstractions/Elsa.Web.Abstractions.csproj @@ -2,6 +2,7 @@ netstandard2.0 + Elsa.Web @@ -9,7 +10,7 @@ - + diff --git a/src/web/modules/Elsa.Web.Abstractions/Extensions/ServiceCollectionExtensions.cs b/src/web/modules/Elsa.Web.Abstractions/Extensions/ServiceCollectionExtensions.cs new file mode 100644 index 000000000..5bc8c5f88 --- /dev/null +++ b/src/web/modules/Elsa.Web.Abstractions/Extensions/ServiceCollectionExtensions.cs @@ -0,0 +1,17 @@ +using Microsoft.Extensions.DependencyInjection; +using OrchardCore.DisplayManagement.Handlers; + +namespace Elsa.Web.Extensions +{ + public static class ServiceCollectionExtensions + { + public static IServiceCollection AddActivity(this IServiceCollection services) + where THandler : class, IActivityHandler + where TDriver : class, IDisplayDriver + { + return services + .AddScoped() + .AddScoped, TDriver>(); + } + } +} \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Abstractions/Services/IActivityDisplayManager.cs b/src/web/modules/Elsa.Web.Abstractions/Services/IActivityDisplayManager.cs similarity index 73% rename from src/web/modules/Flowsharp.Web.Abstractions/Services/IActivityDisplayManager.cs rename to src/web/modules/Elsa.Web.Abstractions/Services/IActivityDisplayManager.cs index 1b0d6e4b9..4ef3bfcbc 100644 --- a/src/web/modules/Flowsharp.Web.Abstractions/Services/IActivityDisplayManager.cs +++ b/src/web/modules/Elsa.Web.Abstractions/Services/IActivityDisplayManager.cs @@ -1,6 +1,6 @@ using OrchardCore.DisplayManagement; -namespace Flowsharp.Web.Abstractions.Services +namespace Elsa.Web.Services { public interface IActivityDisplayManager : IDisplayManager { diff --git a/src/web/modules/Flowsharp.Web.Abstractions/Services/IActivityShapeFactory.cs b/src/web/modules/Elsa.Web.Abstractions/Services/IActivityShapeFactory.cs similarity index 88% rename from src/web/modules/Flowsharp.Web.Abstractions/Services/IActivityShapeFactory.cs rename to src/web/modules/Elsa.Web.Abstractions/Services/IActivityShapeFactory.cs index e1a627943..7f3fd8451 100644 --- a/src/web/modules/Flowsharp.Web.Abstractions/Services/IActivityShapeFactory.cs +++ b/src/web/modules/Elsa.Web.Abstractions/Services/IActivityShapeFactory.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using OrchardCore.DisplayManagement; -namespace Flowsharp.Web.Abstractions.Services +namespace Elsa.Web.Services { public interface IActivityShapeFactory { diff --git a/src/web/modules/Flowsharp.Web.Abstractions/ViewModels/ActivityShapeModel.cs b/src/web/modules/Elsa.Web.Abstractions/ViewModels/ActivityShapeModel.cs similarity index 92% rename from src/web/modules/Flowsharp.Web.Abstractions/ViewModels/ActivityShapeModel.cs rename to src/web/modules/Elsa.Web.Abstractions/ViewModels/ActivityShapeModel.cs index e5f77166d..f2d0e9a17 100644 --- a/src/web/modules/Flowsharp.Web.Abstractions/ViewModels/ActivityShapeModel.cs +++ b/src/web/modules/Elsa.Web.Abstractions/ViewModels/ActivityShapeModel.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Localization; using OrchardCore.DisplayManagement.Views; -namespace Flowsharp.Web.Abstractions.ViewModels +namespace Elsa.Web.ViewModels { public class ActivityShapeModel : ShapeViewModel where TActivity : IActivity { diff --git a/src/web/modules/Elsa.Web.Activities.Console/Drivers/ReadLineDriver.cs b/src/web/modules/Elsa.Web.Activities.Console/Drivers/ReadLineDriver.cs new file mode 100644 index 000000000..c7c09ea26 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Console/Drivers/ReadLineDriver.cs @@ -0,0 +1,9 @@ +using Elsa.Activities.Console.Activities; +using Elsa.Web.Drivers; + +namespace Elsa.Web.Activities.Console.Drivers +{ + public class ReadLineDriver : ActivityDisplayDriver + { + } +} \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Drivers/WriteLineDriver.cs b/src/web/modules/Elsa.Web.Activities.Console/Drivers/WriteLineDriver.cs similarity index 70% rename from src/web/modules/Flowsharp.Web.Activities.Console/Drivers/WriteLineDriver.cs rename to src/web/modules/Elsa.Web.Activities.Console/Drivers/WriteLineDriver.cs index 6e355e124..81e7e6270 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Drivers/WriteLineDriver.cs +++ b/src/web/modules/Elsa.Web.Activities.Console/Drivers/WriteLineDriver.cs @@ -1,9 +1,9 @@ -using Flowsharp.Activities.Console.Activities; -using Flowsharp.Expressions; -using Flowsharp.Web.Abstractions.Drivers; -using Flowsharp.Web.Activities.Console.ViewModels; +using Elsa.Activities.Console.Activities; +using Elsa.Expressions; +using Elsa.Web.Activities.Console.ViewModels; +using Elsa.Web.Drivers; -namespace Flowsharp.Web.Activities.Console.Drivers +namespace Elsa.Web.Activities.Console.Drivers { public class WriteLineDriver : ActivityDisplayDriver { diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Flowsharp.Web.Activities.Console.csproj b/src/web/modules/Elsa.Web.Activities.Console/Elsa.Web.Activities.Console.csproj similarity index 75% rename from src/web/modules/Flowsharp.Web.Activities.Console/Flowsharp.Web.Activities.Console.csproj rename to src/web/modules/Elsa.Web.Activities.Console/Elsa.Web.Activities.Console.csproj index b53e80717..8b979a459 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Flowsharp.Web.Activities.Console.csproj +++ b/src/web/modules/Elsa.Web.Activities.Console/Elsa.Web.Activities.Console.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Manifest.cs b/src/web/modules/Elsa.Web.Activities.Console/Manifest.cs similarity index 66% rename from src/web/modules/Flowsharp.Web.Activities.Console/Manifest.cs rename to src/web/modules/Elsa.Web.Activities.Console/Manifest.cs index d736b07fe..40ae7402b 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Manifest.cs +++ b/src/web/modules/Elsa.Web.Activities.Console/Manifest.cs @@ -1,6 +1,7 @@ using OrchardCore.Modules.Manifest; [assembly: Module( - Name = "Flowsharp Primitive Activities", + Name = "Console Activities", + Category = "Workflows", Description = "Provides a set of primitive activities." )] diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Startup.cs b/src/web/modules/Elsa.Web.Activities.Console/Startup.cs similarity index 63% rename from src/web/modules/Flowsharp.Web.Activities.Console/Startup.cs rename to src/web/modules/Elsa.Web.Activities.Console/Startup.cs index 03fb7c251..300f82152 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Startup.cs +++ b/src/web/modules/Elsa.Web.Activities.Console/Startup.cs @@ -1,10 +1,10 @@ -using Flowsharp.Activities.Console.Handlers; -using Flowsharp.Web.Abstractions.Extensions.Flowsharp.Web.Abstractions.Extensions; -using Flowsharp.Web.Activities.Console.Drivers; +using Elsa.Activities.Console.Handlers; +using Elsa.Web.Activities.Console.Drivers; +using Elsa.Web.Extensions; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; -namespace Flowsharp.Web.Activities.Console +namespace Elsa.Web.Activities.Console { public class Startup : StartupBase { diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/ViewModels/WriteLineViewModel.cs b/src/web/modules/Elsa.Web.Activities.Console/ViewModels/WriteLineViewModel.cs similarity index 64% rename from src/web/modules/Flowsharp.Web.Activities.Console/ViewModels/WriteLineViewModel.cs rename to src/web/modules/Elsa.Web.Activities.Console/ViewModels/WriteLineViewModel.cs index 67a7c4b0c..8953b176a 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/ViewModels/WriteLineViewModel.cs +++ b/src/web/modules/Elsa.Web.Activities.Console/ViewModels/WriteLineViewModel.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.Activities.Console.ViewModels +namespace Elsa.Web.Activities.Console.ViewModels { public class WriteLineViewModel { diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Views/ReadLine.Card.cshtml b/src/web/modules/Elsa.Web.Activities.Console/Views/ReadLine.Card.cshtml similarity index 67% rename from src/web/modules/Flowsharp.Web.Activities.Console/Views/ReadLine.Card.cshtml rename to src/web/modules/Elsa.Web.Activities.Console/Views/ReadLine.Card.cshtml index 6adb272c7..c3d7d87e7 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Views/ReadLine.Card.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Console/Views/ReadLine.Card.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel @{ var activityDescriptor = Model.Activity.Descriptor; } diff --git a/src/web/modules/Elsa.Web.Activities.Console/Views/ReadLine.Design.cshtml b/src/web/modules/Elsa.Web.Activities.Console/Views/ReadLine.Design.cshtml new file mode 100644 index 000000000..4ba2a2c73 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Console/Views/ReadLine.Design.cshtml @@ -0,0 +1,5 @@ +@model Elsa.Web.ViewModels.ActivityShapeModel + +
+

@Model.DisplayText

+
\ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Card.cshtml b/src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Card.cshtml similarity index 66% rename from src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Card.cshtml rename to src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Card.cshtml index 6faca4b18..91ba0ec8d 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Card.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Card.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel @{ var activityDescriptor = Model.Activity.Descriptor; } diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Design.cshtml b/src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Design.cshtml similarity index 58% rename from src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Design.cshtml rename to src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Design.cshtml index 11b3e3057..ae80d368e 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Design.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Design.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel

@Model.DisplayText

diff --git a/src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Edit.cshtml b/src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Edit.cshtml similarity index 70% rename from src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Edit.cshtml rename to src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Edit.cshtml index 63bb5dfa0..faa1fee4a 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Console/Views/WriteLine.Edit.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Console/Views/WriteLine.Edit.cshtml @@ -1,4 +1,4 @@ -@model WriteLineViewModel +@model Elsa.Web.Activities.Console.ViewModels.WriteLineViewModel
diff --git a/src/web/modules/Flowsharp.Web.Activities.Primitives/Views/_ViewImports.cshtml b/src/web/modules/Elsa.Web.Activities.Console/Views/_ViewImports.cshtml similarity index 54% rename from src/web/modules/Flowsharp.Web.Activities.Primitives/Views/_ViewImports.cshtml rename to src/web/modules/Elsa.Web.Activities.Console/Views/_ViewImports.cshtml index 099a58bb4..db890e877 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Primitives/Views/_ViewImports.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Console/Views/_ViewImports.cshtml @@ -1,4 +1,2 @@ -@using Flowsharp.Activities.Primitives.Activities -@using Flowsharp.Web.Abstractions.ViewModels @inherits OrchardCore.DisplayManagement.Razor.RazorPage @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Drivers/HttpRequestTriggerDriver.cs b/src/web/modules/Elsa.Web.Activities.Http/Drivers/HttpRequestTriggerDriver.cs similarity index 75% rename from src/web/modules/Flowsharp.Web.Activities.Http/Drivers/HttpRequestTriggerDriver.cs rename to src/web/modules/Elsa.Web.Activities.Http/Drivers/HttpRequestTriggerDriver.cs index 0a5b8f19b..9d8346de4 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Drivers/HttpRequestTriggerDriver.cs +++ b/src/web/modules/Elsa.Web.Activities.Http/Drivers/HttpRequestTriggerDriver.cs @@ -1,8 +1,8 @@ -using Flowsharp.Activities.Http.Activities; -using Flowsharp.Web.Abstractions.Drivers; -using Flowsharp.Web.Activities.Http.ViewModels; +using Elsa.Activities.Http.Activities; +using Elsa.Web.Activities.Http.ViewModels; +using Elsa.Web.Drivers; -namespace Flowsharp.Web.Activities.Http.Drivers +namespace Elsa.Web.Activities.Http.Drivers { public class HttpRequestTriggerDriver : ActivityDisplayDriver { diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Flowsharp.Web.Activities.Http.csproj b/src/web/modules/Elsa.Web.Activities.Http/Elsa.Web.Activities.Http.csproj similarity index 64% rename from src/web/modules/Flowsharp.Web.Activities.Http/Flowsharp.Web.Activities.Http.csproj rename to src/web/modules/Elsa.Web.Activities.Http/Elsa.Web.Activities.Http.csproj index d3d54bbbf..52ae62370 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Flowsharp.Web.Activities.Http.csproj +++ b/src/web/modules/Elsa.Web.Activities.Http/Elsa.Web.Activities.Http.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Manifest.cs b/src/web/modules/Elsa.Web.Activities.Http/Manifest.cs similarity index 66% rename from src/web/modules/Flowsharp.Web.Activities.Http/Manifest.cs rename to src/web/modules/Elsa.Web.Activities.Http/Manifest.cs index 2aa17a7be..abb80681f 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Manifest.cs +++ b/src/web/modules/Elsa.Web.Activities.Http/Manifest.cs @@ -1,6 +1,7 @@ using OrchardCore.Modules.Manifest; [assembly: Module( - Name = "Flowsharp HTTP Activities", + Name = "HTTP Activities", + Category = "Workflows", Description = "Provides a set of HTTP activities." )] diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Startup.cs b/src/web/modules/Elsa.Web.Activities.Http/Startup.cs similarity index 61% rename from src/web/modules/Flowsharp.Web.Activities.Http/Startup.cs rename to src/web/modules/Elsa.Web.Activities.Http/Startup.cs index c9d8eecc9..22083a19d 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Startup.cs +++ b/src/web/modules/Elsa.Web.Activities.Http/Startup.cs @@ -1,10 +1,10 @@ -using Flowsharp.Activities.Http.Handlers; -using Flowsharp.Web.Abstractions.Extensions.Flowsharp.Web.Abstractions.Extensions; -using Flowsharp.Web.Activities.Http.Drivers; +using Elsa.Activities.Http.Handlers; +using Elsa.Web.Activities.Http.Drivers; +using Elsa.Web.Extensions; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; -namespace Flowsharp.Web.Activities.Http +namespace Elsa.Web.Activities.Http { public class Startup : StartupBase { diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/ViewModels/HttpRequestTriggerViewModel.cs b/src/web/modules/Elsa.Web.Activities.Http/ViewModels/HttpRequestTriggerViewModel.cs similarity index 92% rename from src/web/modules/Flowsharp.Web.Activities.Http/ViewModels/HttpRequestTriggerViewModel.cs rename to src/web/modules/Elsa.Web.Activities.Http/ViewModels/HttpRequestTriggerViewModel.cs index 4f7c36b65..80722a10e 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/ViewModels/HttpRequestTriggerViewModel.cs +++ b/src/web/modules/Elsa.Web.Activities.Http/ViewModels/HttpRequestTriggerViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.AspNetCore.Mvc.Rendering; -namespace Flowsharp.Web.Activities.Http.ViewModels +namespace Elsa.Web.Activities.Http.ViewModels { public class HttpRequestTriggerViewModel { diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Card.cshtml b/src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Card.cshtml similarity index 73% rename from src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Card.cshtml rename to src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Card.cshtml index ca37db310..2ee269722 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Card.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Card.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel @{ var activityDescriptor = Model.Activity.Descriptor; } diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Design.cshtml b/src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Design.cshtml similarity index 65% rename from src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Design.cshtml rename to src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Design.cshtml index b25608210..159176446 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Design.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Design.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel

@Model.DisplayText

diff --git a/src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Edit.cshtml b/src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Edit.cshtml similarity index 94% rename from src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Edit.cshtml rename to src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Edit.cshtml index 3c94c9009..ca83adcb1 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Http/Views/HttpRequestTrigger.Edit.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Http/Views/HttpRequestTrigger.Edit.cshtml @@ -1,5 +1,5 @@ @using OrchardCore.Mvc.Core.Utilities -@model HttpRequestTriggerViewModel +@model Elsa.Web.Activities.Http.ViewModels.HttpRequestTriggerViewModel
diff --git a/src/web/modules/Elsa.Web.Activities.Http/Views/_ViewImports.cshtml b/src/web/modules/Elsa.Web.Activities.Http/Views/_ViewImports.cshtml new file mode 100644 index 000000000..ecd78fc31 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Http/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using Elsa.Activities.Http.Activities +@inherits OrchardCore.DisplayManagement.Razor.RazorPage +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/ForEachDriver.cs b/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/ForEachDriver.cs new file mode 100644 index 000000000..c1e853820 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/ForEachDriver.cs @@ -0,0 +1,9 @@ +using Elsa.Activities.Primitives.Activities; +using Elsa.Web.Drivers; + +namespace Elsa.Web.Activities.Primitives.Drivers +{ + public class ForEachDriver : ActivityDisplayDriver + { + } +} \ No newline at end of file diff --git a/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/IfElseDriver.cs b/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/IfElseDriver.cs new file mode 100644 index 000000000..8782bd441 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/IfElseDriver.cs @@ -0,0 +1,9 @@ +using Elsa.Activities.Primitives.Activities; +using Elsa.Web.Drivers; + +namespace Elsa.Web.Activities.Primitives.Drivers +{ + public class IfElseDriver : ActivityDisplayDriver + { + } +} \ No newline at end of file diff --git a/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/UnknownActivityDriver.cs b/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/UnknownActivityDriver.cs new file mode 100644 index 000000000..7e44081ff --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Drivers/UnknownActivityDriver.cs @@ -0,0 +1,9 @@ +using Elsa.Activities; +using Elsa.Web.Drivers; + +namespace Elsa.Web.Activities.Primitives.Drivers +{ + public class UnknownActivityDriver : ActivityDisplayDriver + { + } +} \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Activities.Primitives/Flowsharp.Web.Activities.Primitives.csproj b/src/web/modules/Elsa.Web.Activities.Primitives/Elsa.Web.Activities.Primitives.csproj similarity index 63% rename from src/web/modules/Flowsharp.Web.Activities.Primitives/Flowsharp.Web.Activities.Primitives.csproj rename to src/web/modules/Elsa.Web.Activities.Primitives/Elsa.Web.Activities.Primitives.csproj index d27f57517..0f90e0fb2 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Primitives/Flowsharp.Web.Activities.Primitives.csproj +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Elsa.Web.Activities.Primitives.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/web/modules/Flowsharp.Web.Activities.Primitives/Manifest.cs b/src/web/modules/Elsa.Web.Activities.Primitives/Manifest.cs similarity index 65% rename from src/web/modules/Flowsharp.Web.Activities.Primitives/Manifest.cs rename to src/web/modules/Elsa.Web.Activities.Primitives/Manifest.cs index d736b07fe..e1536c120 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Primitives/Manifest.cs +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Manifest.cs @@ -1,6 +1,7 @@ using OrchardCore.Modules.Manifest; [assembly: Module( - Name = "Flowsharp Primitive Activities", + Name = "Primitive Activities", + Category = "Workflows", Description = "Provides a set of primitive activities." )] diff --git a/src/web/modules/Flowsharp.Web.Activities.Primitives/Startup.cs b/src/web/modules/Elsa.Web.Activities.Primitives/Startup.cs similarity index 63% rename from src/web/modules/Flowsharp.Web.Activities.Primitives/Startup.cs rename to src/web/modules/Elsa.Web.Activities.Primitives/Startup.cs index bea2c8627..60999bbee 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Primitives/Startup.cs +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Startup.cs @@ -1,11 +1,11 @@ -using Flowsharp.Activities.Primitives.Handlers; -using Flowsharp.Handlers; -using Flowsharp.Web.Abstractions.Extensions.Flowsharp.Web.Abstractions.Extensions; -using Flowsharp.Web.Activities.Primitives.Drivers; +using Elsa.Activities.Primitives.Handlers; +using Elsa.Handlers; +using Elsa.Web.Activities.Primitives.Drivers; +using Elsa.Web.Extensions; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; -namespace Flowsharp.Web.Activities.Primitives +namespace Elsa.Web.Activities.Primitives { public class Startup : StartupBase { diff --git a/src/web/modules/Flowsharp.Web.Activities.Primitives/Views/ForEach.Card.cshtml b/src/web/modules/Elsa.Web.Activities.Primitives/Views/ForEach.Card.cshtml similarity index 66% rename from src/web/modules/Flowsharp.Web.Activities.Primitives/Views/ForEach.Card.cshtml rename to src/web/modules/Elsa.Web.Activities.Primitives/Views/ForEach.Card.cshtml index 6afc66165..2df6685fd 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Primitives/Views/ForEach.Card.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Views/ForEach.Card.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel @{ var activityDescriptor = Model.Activity.Descriptor; } diff --git a/src/web/modules/Elsa.Web.Activities.Primitives/Views/ForEach.Design.cshtml b/src/web/modules/Elsa.Web.Activities.Primitives/Views/ForEach.Design.cshtml new file mode 100644 index 000000000..210d433b2 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Views/ForEach.Design.cshtml @@ -0,0 +1,5 @@ +@model Elsa.Web.ViewModels.ActivityShapeModel + +
+

@Model.DisplayText

+
\ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.Activities.Primitives/Views/IfElse.Card.cshtml b/src/web/modules/Elsa.Web.Activities.Primitives/Views/IfElse.Card.cshtml similarity index 66% rename from src/web/modules/Flowsharp.Web.Activities.Primitives/Views/IfElse.Card.cshtml rename to src/web/modules/Elsa.Web.Activities.Primitives/Views/IfElse.Card.cshtml index 72006ff5e..4cd8abbcc 100644 --- a/src/web/modules/Flowsharp.Web.Activities.Primitives/Views/IfElse.Card.cshtml +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Views/IfElse.Card.cshtml @@ -1,4 +1,4 @@ -@model ActivityShapeModel +@model Elsa.Web.ViewModels.ActivityShapeModel @{ var activityDescriptor = Model.Activity.Descriptor; } diff --git a/src/web/modules/Elsa.Web.Activities.Primitives/Views/IfElse.Design.cshtml b/src/web/modules/Elsa.Web.Activities.Primitives/Views/IfElse.Design.cshtml new file mode 100644 index 000000000..3a61a86f3 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Views/IfElse.Design.cshtml @@ -0,0 +1,5 @@ +@model Elsa.Web.ViewModels.ActivityShapeModel + +
+

@Model.DisplayText

+
\ No newline at end of file diff --git a/src/web/modules/Elsa.Web.Activities.Primitives/Views/_ViewImports.cshtml b/src/web/modules/Elsa.Web.Activities.Primitives/Views/_ViewImports.cshtml new file mode 100644 index 000000000..db890e877 --- /dev/null +++ b/src/web/modules/Elsa.Web.Activities.Primitives/Views/_ViewImports.cshtml @@ -0,0 +1,2 @@ +@inherits OrchardCore.DisplayManagement.Razor.RazorPage +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/package-lock.json b/src/web/modules/Elsa.Web.Components/Assets/package-lock.json similarity index 55% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/package-lock.json rename to src/web/modules/Elsa.Web.Components/Assets/package-lock.json index f1b6fe6c2..1eff3e49f 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/package-lock.json +++ b/src/web/modules/Elsa.Web.Components/Assets/package-lock.json @@ -3,16 +3,16 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/bootstrap": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.1.2.tgz", - "integrity": "sha512-BiC/IxqyLS68UFp71t2Px80ql/FpaUKSy469aa6HTDFRkv/FvdzRZjF6ifDql/VKSLyin5AZa/yARLetMFM4rQ==", - "dev": true, - "requires": { - "@types/jquery": "*", - "popper.js": "^1.14.1" - } - }, + "@types/bootstrap": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.1.2.tgz", + "integrity": "sha512-BiC/IxqyLS68UFp71t2Px80ql/FpaUKSy469aa6HTDFRkv/FvdzRZjF6ifDql/VKSLyin5AZa/yARLetMFM4rQ==", + "dev": true, + "requires": { + "@types/jquery": "*", + "popper.js": "^1.14.1" + } + }, "@types/jquery": { "version": "3.3.22", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.22.tgz", @@ -33,11 +33,6 @@ "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==", "dev": true - }, - "bootstrap": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz", - "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==" }, "decode-html": { "version": "2.0.0", @@ -49,16 +44,11 @@ "resolved": "https://registry.npmjs.org/jsplumb/-/jsplumb-2.8.3.tgz", "integrity": "sha512-x3UOKt0e0uWY9UaLteY6KnlqXGU/mF4Es5IHCSyKwtYjI4TtIvoiwYdq4ytS1I6aLTwW8g77fmNYyOmACtMAVg==" }, - "popper.js": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", - "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=", - "dev": true - }, - "requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==" + "popper.js": { + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", + "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=", + "dev": true } } } diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/package.json b/src/web/modules/Elsa.Web.Components/Assets/package.json similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/package.json rename to src/web/modules/Elsa.Web.Components/Assets/package.json diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/@types/jsplumb.d.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/@types/jsplumb.d.ts similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/@types/jsplumb.d.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/@types/jsplumb.d.ts diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/@types/popper.d.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/@types/popper.d.ts similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/@types/popper.d.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/@types/popper.d.ts diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/decode-html/decode-html.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/decode-html/decode-html.ts similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/decode-html/decode-html.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/decode-html/decode-html.ts diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-descriptor.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-descriptor.ts similarity index 85% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-descriptor.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-descriptor.ts index ca4ba9393..3b64021f8 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-descriptor.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-descriptor.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export interface ActivityDescriptor { name: string; displayText: string; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-editor.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-editor.ts similarity index 99% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-editor.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-editor.ts index 1667a4111..28faf1490 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-editor.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-editor.ts @@ -2,7 +2,7 @@ /// /// -namespace Flowsharp { +namespace Elsa { export class ActivityEditor { private containerElement: JQuery; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-info.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-info.ts similarity index 90% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-info.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-info.ts index 7abb0ffed..edcd1b519 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-info.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-info.ts @@ -1,5 +1,5 @@ /// -namespace Flowsharp { +namespace Elsa { export interface ActivityInfo { activityElement: HTMLElement; activityName: string; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-metadata.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-metadata.ts similarity index 77% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-metadata.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-metadata.ts index 56854e16f..9994e7620 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-metadata.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-metadata.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export interface IActivityMetadata { customFields: any; } diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-picker.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-picker.ts similarity index 99% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-picker.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-picker.ts index f9098917f..101344f09 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity-picker.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity-picker.ts @@ -2,7 +2,7 @@ /// /// -namespace Flowsharp { +namespace Elsa { export class ActivityPicker { private readonly container: JQuery; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity.ts similarity index 86% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity.ts index 18d13a317..1d6e897d4 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/activity.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/activity.ts @@ -1,6 +1,6 @@ /// -namespace Flowsharp { +namespace Elsa { export interface IActivity { id: string; metadata: IActivityMetadata; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/connection.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/connection.ts similarity index 89% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/connection.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/connection.ts index 8a23470bd..3997f03ab 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/connection.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/connection.ts @@ -1,6 +1,6 @@ /// /// -namespace Flowsharp { +namespace Elsa { export interface IConnection { source: ISourceEndpoint; target: ITargetEndpoint; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/selected-activity-info.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/selected-activity-info.ts similarity index 84% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/selected-activity-info.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/selected-activity-info.ts index 3e28ac22a..70c1b6ddb 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/selected-activity-info.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/selected-activity-info.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export interface SelectedActivityInfo { activityName: string; activityDisplayText: string; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/source-endpoint.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/source-endpoint.ts similarity index 81% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/source-endpoint.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/source-endpoint.ts index d84473e78..32c06e327 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/source-endpoint.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/source-endpoint.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export interface ISourceEndpoint { name: string; activityId: string; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/target-endpoint.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/target-endpoint.ts similarity index 77% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/target-endpoint.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/target-endpoint.ts index fd6cc0532..0a10e7d11 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/target-endpoint.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/target-endpoint.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export interface ITargetEndpoint { activityId: string; } diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-designer-config.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-designer-config.ts similarity index 98% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-designer-config.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-designer-config.ts index cf01e79e7..88fae5752 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-designer-config.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-designer-config.ts @@ -1,5 +1,5 @@ /// -namespace Flowsharp { +namespace Elsa { export class WorkflowDesignerConfig { static createJsPlumbInstance(container: HTMLElement): any { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-designer.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-designer.ts similarity index 99% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-designer.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-designer.ts index f3609a830..dce1b8c2a 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-designer.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-designer.ts @@ -7,7 +7,7 @@ /// /// -namespace Flowsharp { +namespace Elsa { export class WorkflowDesigner { private readonly container: JQuery; private readonly canvasContainer: JQuery; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-metadata.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-metadata.ts similarity index 88% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-metadata.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-metadata.ts index d82d46aa0..418305960 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-metadata.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-metadata.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export interface IWorkflowMetadata { id: string; parentId: string; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-status.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-status.ts similarity index 88% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-status.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-status.ts index 794f4426e..008c54039 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow-status.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow-status.ts @@ -1,4 +1,4 @@ -namespace Flowsharp { +namespace Elsa { export enum WorkflowStatus { Idle, Starting, diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow.ts b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow.ts similarity index 93% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow.ts rename to src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow.ts index 6215d259b..de4f521ab 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/scripts/flowsharp/workflow.ts +++ b/src/web/modules/Elsa.Web.Components/Assets/scripts/elsa/workflow.ts @@ -3,7 +3,7 @@ /// /// -namespace Flowsharp { +namespace Elsa { export interface IWorkflow { metadata: IWorkflowMetadata; activities: IActivity[]; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/styles/activity-library.scss b/src/web/modules/Elsa.Web.Components/Assets/styles/activity-library.scss similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/styles/activity-library.scss rename to src/web/modules/Elsa.Web.Components/Assets/styles/activity-library.scss diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/styles/postcss.config.js b/src/web/modules/Elsa.Web.Components/Assets/styles/postcss.config.js similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/styles/postcss.config.js rename to src/web/modules/Elsa.Web.Components/Assets/styles/postcss.config.js diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Assets/styles/workflow-designer.scss b/src/web/modules/Elsa.Web.Components/Assets/styles/workflow-designer.scss similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Assets/styles/workflow-designer.scss rename to src/web/modules/Elsa.Web.Components/Assets/styles/workflow-designer.scss diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Controllers/ActivityController.cs b/src/web/modules/Elsa.Web.Components/Controllers/ActivityController.cs similarity index 94% rename from src/web/modules/Flowsharp.Web.ViewComponents/Controllers/ActivityController.cs rename to src/web/modules/Elsa.Web.Components/Controllers/ActivityController.cs index b075337e0..1f97ade1e 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Controllers/ActivityController.cs +++ b/src/web/modules/Elsa.Web.Components/Controllers/ActivityController.cs @@ -1,16 +1,16 @@ using System; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Extensions; -using Flowsharp.Serialization.Tokenizers; -using Flowsharp.Web.Abstractions.Services; -using Flowsharp.Web.ViewComponents.ViewModels; +using Elsa.Extensions; +using Elsa.Serialization.Tokenizers; +using Elsa.Web.Components.ViewModels; +using Elsa.Web.Services; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using OrchardCore.DisplayManagement.ModelBinding; -namespace Flowsharp.Web.ViewComponents.Controllers +namespace Elsa.Web.Components.Controllers { [Route("[controller]")] [IgnoreAntiforgeryToken] diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Flowsharp.Web.ViewComponents.csproj b/src/web/modules/Elsa.Web.Components/Elsa.Web.Components.csproj similarity index 60% rename from src/web/modules/Flowsharp.Web.ViewComponents/Flowsharp.Web.ViewComponents.csproj rename to src/web/modules/Elsa.Web.Components/Elsa.Web.Components.csproj index b004fdf4f..a5579358c 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Flowsharp.Web.ViewComponents.csproj +++ b/src/web/modules/Elsa.Web.Components/Elsa.Web.Components.csproj @@ -2,6 +2,7 @@ netcoreapp2.1 + Elsa.Web.Components @@ -11,10 +12,10 @@ - - - - + + + + @@ -25,4 +26,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Manifest.cs b/src/web/modules/Elsa.Web.Components/Manifest.cs similarity index 75% rename from src/web/modules/Flowsharp.Web.ViewComponents/Manifest.cs rename to src/web/modules/Elsa.Web.Components/Manifest.cs index 9c17066fe..8c075d870 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Manifest.cs +++ b/src/web/modules/Elsa.Web.Components/Manifest.cs @@ -1,7 +1,8 @@ using OrchardCore.Modules.Manifest; [assembly: Module( - Name = "Flowsharp View Components", + Name = "Workflows View Components", + Category = "Workflows", Description = "Provides a set of reusable view components such as the Workflow Editor.", Dependencies = new[] { "OrchardCore.Resources" } )] \ No newline at end of file diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Models/ActivityDesignerMetadata.cs b/src/web/modules/Elsa.Web.Components/Models/ActivityDesignerMetadata.cs similarity index 73% rename from src/web/modules/Flowsharp.Web.ViewComponents/Models/ActivityDesignerMetadata.cs rename to src/web/modules/Elsa.Web.Components/Models/ActivityDesignerMetadata.cs index 6a58a058f..31409cdd1 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Models/ActivityDesignerMetadata.cs +++ b/src/web/modules/Elsa.Web.Components/Models/ActivityDesignerMetadata.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.ViewComponents.Models +namespace Elsa.Web.Components.Models { public class ActivityDesignerMetadata { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Services/ActivityDisplayManager.cs b/src/web/modules/Elsa.Web.Components/Services/ActivityDisplayManager.cs similarity index 90% rename from src/web/modules/Flowsharp.Web.ViewComponents/Services/ActivityDisplayManager.cs rename to src/web/modules/Elsa.Web.Components/Services/ActivityDisplayManager.cs index d667816a5..3c538a3d6 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Services/ActivityDisplayManager.cs +++ b/src/web/modules/Elsa.Web.Components/Services/ActivityDisplayManager.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Flowsharp.Web.Abstractions.Services; +using Elsa.Web.Services; using Microsoft.Extensions.Logging; using OrchardCore.DisplayManagement; using OrchardCore.DisplayManagement.Descriptors; @@ -7,7 +7,7 @@ using OrchardCore.DisplayManagement.Handlers; using OrchardCore.DisplayManagement.Layout; using OrchardCore.DisplayManagement.Theming; -namespace Flowsharp.Web.ViewComponents.Services +namespace Elsa.Web.Components.Services { public class ActivityDisplayManager : DisplayManager, IActivityDisplayManager { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Services/ActivityShapeFactory.cs b/src/web/modules/Elsa.Web.Components/Services/ActivityShapeFactory.cs similarity index 92% rename from src/web/modules/Flowsharp.Web.ViewComponents/Services/ActivityShapeFactory.cs rename to src/web/modules/Elsa.Web.Components/Services/ActivityShapeFactory.cs index ff574c6e3..f28b81d35 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Services/ActivityShapeFactory.cs +++ b/src/web/modules/Elsa.Web.Components/Services/ActivityShapeFactory.cs @@ -2,11 +2,11 @@ using System; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Web.Abstractions.Services; -using Flowsharp.Web.ViewComponents.Models; +using Elsa.Web.Components.Models; +using Elsa.Web.Services; using OrchardCore.DisplayManagement; -namespace Flowsharp.Web.ViewComponents.Services +namespace Elsa.Web.Components.Services { public class ActivityShapeFactory : IActivityShapeFactory { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Startup.cs b/src/web/modules/Elsa.Web.Components/Startup.cs similarity index 73% rename from src/web/modules/Flowsharp.Web.ViewComponents/Startup.cs rename to src/web/modules/Elsa.Web.Components/Startup.cs index 785471ce0..c77d989ee 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Startup.cs +++ b/src/web/modules/Elsa.Web.Components/Startup.cs @@ -1,10 +1,10 @@ -using Flowsharp.Extensions; -using Flowsharp.Web.Abstractions.Services; -using Flowsharp.Web.ViewComponents.Services; +using Elsa.Extensions; +using Elsa.Web.Components.Services; +using Elsa.Web.Services; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; -namespace Flowsharp.Web.ViewComponents +namespace Elsa.Web.Components { public class Startup : StartupBase { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/ActivityEditor.cs b/src/web/modules/Elsa.Web.Components/ViewComponents/ActivityEditor.cs similarity index 73% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/ActivityEditor.cs rename to src/web/modules/Elsa.Web.Components/ViewComponents/ActivityEditor.cs index 1d65c281a..8d83fcdb5 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/ActivityEditor.cs +++ b/src/web/modules/Elsa.Web.Components/ViewComponents/ActivityEditor.cs @@ -1,7 +1,7 @@ -using Flowsharp.Web.ViewComponents.ViewModels; +using Elsa.Web.Components.ViewModels; using Microsoft.AspNetCore.Mvc; -namespace Flowsharp.Web.ViewComponents.ViewComponents +namespace Elsa.Web.Components.ViewComponents { public class ActivityEditor : ViewComponent { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/ActivityPicker.cs b/src/web/modules/Elsa.Web.Components/ViewComponents/ActivityPicker.cs similarity index 87% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/ActivityPicker.cs rename to src/web/modules/Elsa.Web.Components/ViewComponents/ActivityPicker.cs index c1e696a94..d082dd5ca 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/ActivityPicker.cs +++ b/src/web/modules/Elsa.Web.Components/ViewComponents/ActivityPicker.cs @@ -1,14 +1,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Extensions; -using Flowsharp.Models; -using Flowsharp.Web.Abstractions.Services; -using Flowsharp.Web.ViewComponents.ViewModels; +using Elsa.Extensions; +using Elsa.Models; +using Elsa.Web.Components.ViewModels; +using Elsa.Web.Services; using Microsoft.AspNetCore.Mvc; using OrchardCore.DisplayManagement; -namespace Flowsharp.Web.ViewComponents.ViewComponents +namespace Elsa.Web.Components.ViewComponents { public class ActivityPicker : ViewComponent { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/WorkflowDesigner.cs b/src/web/modules/Elsa.Web.Components/ViewComponents/WorkflowDesigner.cs similarity index 88% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/WorkflowDesigner.cs rename to src/web/modules/Elsa.Web.Components/ViewComponents/WorkflowDesigner.cs index db4fc3389..d8f81d46b 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewComponents/WorkflowDesigner.cs +++ b/src/web/modules/Elsa.Web.Components/ViewComponents/WorkflowDesigner.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Flowsharp.Models; -using Flowsharp.Persistence; -using Flowsharp.Web.Abstractions.Services; -using Flowsharp.Web.ViewComponents.ViewModels; +using Elsa.Models; +using Elsa.Persistence; +using Elsa.Web.Components.ViewModels; +using Elsa.Web.Services; using Microsoft.AspNetCore.Mvc; -namespace Flowsharp.Web.ViewComponents.ViewComponents +namespace Elsa.Web.Components.ViewComponents { public class WorkflowDesigner : ViewComponent { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityCardViewModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityCardViewModel.cs similarity index 75% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityCardViewModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ActivityCardViewModel.cs index 85d22a302..2f2ae61eb 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityCardViewModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityCardViewModel.cs @@ -1,7 +1,7 @@ -using Flowsharp.Models; +using Elsa.Models; using OrchardCore.DisplayManagement.Views; -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ActivityCardViewModel : ShapeViewModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityDescriptorViewModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityDescriptorViewModel.cs similarity index 76% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityDescriptorViewModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ActivityDescriptorViewModel.cs index 726d1e491..348e2c2cc 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityDescriptorViewModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityDescriptorViewModel.cs @@ -1,7 +1,7 @@ -using Flowsharp.Models; +using Elsa.Models; using OrchardCore.DisplayManagement.Views; -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ActivityDescriptorViewModel : ShapeViewModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorEditViewModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorEditViewModel.cs similarity index 76% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorEditViewModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorEditViewModel.cs index edb389800..540da7b4b 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorEditViewModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorEditViewModel.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ActivityEditorEditViewModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorUpdateModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorUpdateModel.cs similarity index 68% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorUpdateModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorUpdateModel.cs index f3683e369..bc87e0d0b 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorUpdateModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorUpdateModel.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ActivityEditorUpdateModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorViewModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorViewModel.cs similarity index 52% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorViewModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorViewModel.cs index 96c7cbaa8..168aea33b 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityEditorViewModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityEditorViewModel.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ActivityEditorViewModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityPickerViewModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityPickerViewModel.cs similarity index 91% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityPickerViewModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ActivityPickerViewModel.cs index 88ca6d957..5b6268767 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ActivityPickerViewModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ActivityPickerViewModel.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; -using Flowsharp.Models; +using Elsa.Models; using Microsoft.Extensions.Localization; using OrchardCore.DisplayManagement; -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ActivityPickerViewModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ConnectionModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/ConnectionModel.cs similarity index 84% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ConnectionModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/ConnectionModel.cs index cf3aa1153..a690f816b 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/ConnectionModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/ConnectionModel.cs @@ -1,6 +1,6 @@ -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class ConnectionModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/SourceEndPointModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/SourceEndPointModel.cs similarity index 85% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/SourceEndPointModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/SourceEndPointModel.cs index 6bd5251b6..195c58235 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/SourceEndPointModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/SourceEndPointModel.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class SourceEndPointModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/TargetEndPointModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/TargetEndPointModel.cs similarity index 81% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/TargetEndPointModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/TargetEndPointModel.cs index 7f14e9fb4..179cb675e 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/TargetEndPointModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/TargetEndPointModel.cs @@ -1,4 +1,4 @@ -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class TargetEndPointModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/WorkflowDesignerViewModel.cs b/src/web/modules/Elsa.Web.Components/ViewModels/WorkflowDesignerViewModel.cs similarity index 88% rename from src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/WorkflowDesignerViewModel.cs rename to src/web/modules/Elsa.Web.Components/ViewModels/WorkflowDesignerViewModel.cs index 60e75328a..48f76d817 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/ViewModels/WorkflowDesignerViewModel.cs +++ b/src/web/modules/Elsa.Web.Components/ViewModels/WorkflowDesignerViewModel.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using Flowsharp.Models; +using Elsa.Models; -namespace Flowsharp.Web.ViewComponents.ViewModels +namespace Elsa.Web.Components.ViewModels { public class WorkflowDesignerViewModel { diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity.Card.cshtml b/src/web/modules/Elsa.Web.Components/Views/Activity.Card.cshtml similarity index 91% rename from src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity.Card.cshtml rename to src/web/modules/Elsa.Web.Components/Views/Activity.Card.cshtml index 046b4c514..02cdbc527 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity.Card.cshtml +++ b/src/web/modules/Elsa.Web.Components/Views/Activity.Card.cshtml @@ -1,3 +1,5 @@ +@using Elsa.Models +@using OrchardCore.Mvc.Utilities @model dynamic @{ var activityDescriptor = (ActivityDescriptor) Model.ActivityDescriptor; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity.Design.cshtml b/src/web/modules/Elsa.Web.Components/Views/Activity.Design.cshtml similarity index 87% rename from src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity.Design.cshtml rename to src/web/modules/Elsa.Web.Components/Views/Activity.Design.cshtml index 603807414..3fdbefd33 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity.Design.cshtml +++ b/src/web/modules/Elsa.Web.Components/Views/Activity.Design.cshtml @@ -1,3 +1,9 @@ +@using Elsa +@using Elsa.Models +@using Elsa.Web.Components.Models +@using Microsoft.Extensions.Localization +@using Newtonsoft.Json +@using Newtonsoft.Json.Serialization @model dynamic @{ var activity = (IActivity)Model.Activity; diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity/Display.cshtml b/src/web/modules/Elsa.Web.Components/Views/Activity/Display.cshtml similarity index 100% rename from src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity/Display.cshtml rename to src/web/modules/Elsa.Web.Components/Views/Activity/Display.cshtml diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity/Edit.cshtml b/src/web/modules/Elsa.Web.Components/Views/Activity/Edit.cshtml similarity index 69% rename from src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity/Edit.cshtml rename to src/web/modules/Elsa.Web.Components/Views/Activity/Edit.cshtml index 4fa731161..d0d30a59b 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Activity/Edit.cshtml +++ b/src/web/modules/Elsa.Web.Components/Views/Activity/Edit.cshtml @@ -1,4 +1,4 @@ -@model ActivityEditorEditViewModel +@model Elsa.Web.Components.ViewModels.ActivityEditorEditViewModel
@await DisplayAsync(Model.ActivityEditorShape.Content) diff --git a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Shared/Components/ActivityEditor/Default.cshtml b/src/web/modules/Elsa.Web.Components/Views/Shared/Components/ActivityEditor/Default.cshtml similarity index 70% rename from src/web/modules/Flowsharp.Web.ViewComponents/Views/Shared/Components/ActivityEditor/Default.cshtml rename to src/web/modules/Elsa.Web.Components/Views/Shared/Components/ActivityEditor/Default.cshtml index 6cbd37e63..4816741c2 100644 --- a/src/web/modules/Flowsharp.Web.ViewComponents/Views/Shared/Components/ActivityEditor/Default.cshtml +++ b/src/web/modules/Elsa.Web.Components/Views/Shared/Components/ActivityEditor/Default.cshtml @@ -1,6 +1,6 @@ -@model ActivityEditorViewModel +@model Elsa.Web.Components.ViewModels.ActivityEditorViewModel -