diff --git a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs index 41dfeb81c..d2261165c 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs +++ b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs @@ -1,9 +1,11 @@ +using System; using Elsa.Activities.UserTask.Extensions; using Elsa.Caching.Rebus.Extensions; using Elsa.Persistence.EntityFramework.Core.Extensions; using Elsa.Persistence.EntityFramework.SqlServer; using Elsa.Rebus.RabbitMq; using Elsa.Samples.Server.Host.Activities; +using Hangfire; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; @@ -52,7 +54,7 @@ namespace Elsa.Samples.Server.Host // store.UseClustering(); // })) //.AddHangfireTemporalActivities(hangfire => hangfire.UseInMemoryStorage(), (_, hangfireServer) => hangfireServer.SchedulePollingInterval = TimeSpan.FromSeconds(5)) - //.AddHangfireTemporalActivities(hangfire => hangfire.UseSqlServerStorage(sqlServerConnectionString), (_, hangfireServer) => hangfireServer.SchedulePollingInterval = TimeSpan.FromSeconds(5)) + .AddHangfireTemporalActivities(hangfire => hangfire.UseSqlServerStorage(sqlServerConnectionString), (_, hangfireServer) => hangfireServer.SchedulePollingInterval = TimeSpan.FromSeconds(5)) .AddJavaScriptActivities() .AddUserTaskActivities() .AddActivitiesFrom() diff --git a/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj b/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj deleted file mode 100644 index baea59638..000000000 --- a/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - - net5.0 - latest - false - enable - - - - - - - - - - - - - - - - - - diff --git a/src/server/Elsa.Server.Host/FodyWeavers.xml b/src/server/Elsa.Server.Host/FodyWeavers.xml deleted file mode 100644 index 4c4041f8a..000000000 --- a/src/server/Elsa.Server.Host/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/server/Elsa.Server.Host/Models/SampleInputModel.cs b/src/server/Elsa.Server.Host/Models/SampleInputModel.cs deleted file mode 100644 index d2ca8be42..000000000 --- a/src/server/Elsa.Server.Host/Models/SampleInputModel.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Elsa.Samples.Server.Host.Models -{ - public record SampleInputModel(string Name); -} \ No newline at end of file diff --git a/src/server/Elsa.Server.Host/Program.cs b/src/server/Elsa.Server.Host/Program.cs deleted file mode 100644 index 74c092612..000000000 --- a/src/server/Elsa.Server.Host/Program.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Elsa.Server.Host; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; - -namespace Elsa.Samples.Server.Host -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => webBuilder - .UseStaticWebAssets() - .UseStartup()) - // .UseOrleans(siloBuilder => siloBuilder - // .UseLocalhostClustering() - // .Configure(options => - // { - // options.ClusterId = "localhost"; - // options.ServiceId = "elsa-workflows"; - // }) - // .ConfigureApplicationParts(parts => parts.AddApplicationPart(typeof(IWorkflowDefinitionGrain).Assembly).WithReferences()) - // .Configure(options => options.AdvertisedIPAddress = IPAddress.Loopback)) - ; - } -} \ No newline at end of file diff --git a/src/server/Elsa.Server.Host/Properties/launchSettings.json b/src/server/Elsa.Server.Host/Properties/launchSettings.json deleted file mode 100644 index d2c6cea5f..000000000 --- a/src/server/Elsa.Server.Host/Properties/launchSettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "profiles": { - "Elsa.Server.Host": { - "commandName": "Project", - "launchBrowser": false, - "applicationUrl": "https://localhost:11000", - "launchUrl": "https://localhost:11000/swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/src/server/Elsa.Server.Host/Startup.cs b/src/server/Elsa.Server.Host/Startup.cs deleted file mode 100644 index 84127e57a..000000000 --- a/src/server/Elsa.Server.Host/Startup.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using Elsa.Persistence.EntityFramework.Core.Extensions; -using Elsa.Persistence.EntityFramework.Sqlite; -using Elsa.Persistence.EntityFramework.SqlServer; -using Hangfire; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace Elsa.Server.Host -{ - public class Startup - { - public Startup(IWebHostEnvironment environment, IConfiguration configuration) - { - Environment = environment; - Configuration = configuration; - } - - private IWebHostEnvironment Environment { get; } - private IConfiguration Configuration { get; } - - public void ConfigureServices(IServiceCollection services) - { - var elsaSection = Configuration.GetSection("Elsa"); - var sqlServerConnectionString = Configuration.GetConnectionString("SqlServer"); - - services.AddControllers(); - - services - //.AddRedis(Configuration.GetConnectionString("Redis")) - .AddElsa(elsa => elsa - //.WithContainerName(Configuration["ContainerName"] ?? System.Environment.MachineName) - .UseEntityFrameworkPersistence(ef => ef.UseSqlServer(sqlServerConnectionString)) - //.UseRabbitMq(Configuration.GetConnectionString("RabbitMq")) - //.UseRebusCacheSignal() - //.UseRedisCacheSignal() - // .ConfigureDistributedLockProvider(options => options.UseProviderFactory(sp => name => - // { - // var connection = sp.GetRequiredService(); - // return new RedisDistributedLock(name, connection.GetDatabase()); - // })) - .AddConsoleActivities() - .AddHttpActivities(elsaSection.GetSection("Http").Bind) - .AddEmailActivities(elsaSection.GetSection("Smtp").Bind) - //.AddQuartzTemporalActivities() - .AddHangfireTemporalActivities(hangfire => hangfire.UseSqlServerStorage(sqlServerConnectionString), (_, hangfireServer) => hangfireServer.SchedulePollingInterval = TimeSpan.FromSeconds(5)) - .AddJavaScriptActivities() - .AddActivitiesFrom() - .AddWorkflowsFrom() - ); - - // Elsa API endpoints. - services - .AddElsaApiEndpoints() - .AddElsaSwagger(); - - // Allow arbitrary client browser apps to access the API for demo purposes only. - // In a production environment, make sure to allow only origins you trust. - services.AddCors(cors => cors.AddDefaultPolicy(policy => policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin().WithExposedHeaders("Content-Disposition"))); - } - - public void Configure(IApplicationBuilder app) - { - if (Environment.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseSwagger(); - app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Elsa")); - } - - app - .UseCors() - .UseHttpActivities() - .UseRouting() - .UseEndpoints(endpoints => - { - endpoints.MapControllers(); - }); - } - } -} \ No newline at end of file diff --git a/src/server/Elsa.Server.Host/appsettings.Development.json b/src/server/Elsa.Server.Host/appsettings.Development.json deleted file mode 100644 index 9c8e47589..000000000 --- a/src/server/Elsa.Server.Host/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "Orleans": "Warning", - "System": "Information", - "Microsoft": "Warning" - } - } -} diff --git a/src/server/Elsa.Server.Host/appsettings.json b/src/server/Elsa.Server.Host/appsettings.json deleted file mode 100644 index 3cf9de7ac..000000000 --- a/src/server/Elsa.Server.Host/appsettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Orleans": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "ConnectionStrings": { - "RabbitMq": "amqp://localhost:5672", - "Redis": "localhost:6379,abortConnect=false", - "SqlServer": "" - }, - "Elsa": { - "Http": { - "BaseUrl": "https://localhost:11000", - "BasePath": "/workflows" - }, - "Smtp": { - "Host": "localhost", - "Port": "2525", - "DefaultSender": "noreply@acme.com" - } - } -} diff --git a/src/server/Elsa.Server.Host/docker-compose.yaml b/src/server/Elsa.Server.Host/docker-compose.yaml deleted file mode 100644 index b56feab71..000000000 --- a/src/server/Elsa.Server.Host/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: '3.7' - -services: - - mongodb: - image: mongo - ports: - - "27017:27017" - volumes: - - /var/lib/mongodb:/var/lib/mongodb - - azureblobstorage: - image: mcr.microsoft.com/azure-blob-storage - - redis: - image: redis - ports: - - "6379:6379" - - rabbitmq: - image: "rabbitmq:3-management" - ports: - - "15672:15672" - - "5672:5672" - - smtp4dev: - image: rnwood/smtp4dev:linux-amd64-3.1.0-ci0856 - ports: - - "3000:80" - - "2525:25" \ No newline at end of file