From 170258d28dd1597dc275eb8eab011288df970c79 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sat, 6 Jun 2020 09:11:36 +0800 Subject: [PATCH] Quartzmin to SilkierQuartz --- Quartzmin.sln | 2 +- README.md | 12 ++++++------ sample/AspNetCore31/AspNetCore31.csproj | 2 +- sample/AspNetCore31/DemoScheduler.cs | 2 +- sample/AspNetCore31/Pages/Shared/_Layout.cshtml | 2 +- sample/AspNetCore31/Program.cs | 2 +- sample/AspNetCore31/Startup.cs | 6 +++--- .../Quartz.Plugins.RecentHistory.csproj | 6 +++--- src/Quartzmin/AppBuilderExtensions.cs | 12 ++++++------ src/Quartzmin/ApplicationBuilderExtensions.cs | 14 +++++++------- src/Quartzmin/Cache.cs | 2 +- src/Quartzmin/Controllers/CalendarsController.cs | 6 +++--- src/Quartzmin/Controllers/ExecutionsController.cs | 6 +++--- src/Quartzmin/Controllers/HistoryController.cs | 2 +- src/Quartzmin/Controllers/JobDataMapController.cs | 8 ++++---- src/Quartzmin/Controllers/JobsController.cs | 6 +++--- src/Quartzmin/Controllers/PageControllerBase.cs | 6 +++--- src/Quartzmin/Controllers/SchedulerController.cs | 6 +++--- src/Quartzmin/Controllers/TriggersController.cs | 6 +++--- src/Quartzmin/DateTimeSettings.cs | 2 +- src/Quartzmin/Extensions.cs | 6 +++--- src/Quartzmin/Helpers/FromFormAttribute.cs | 2 +- src/Quartzmin/Helpers/HandlebarsHelpers.cs | 12 ++++++------ src/Quartzmin/Helpers/JobDataMapRequest.cs | 4 ++-- src/Quartzmin/Helpers/JsonErrorResponse.cs | 2 +- .../Helpers/JsonPascalCaseNamingPolicy.cs | 2 +- src/Quartzmin/Helpers/ModelValidator.cs | 4 ++-- src/Quartzmin/HostedService/IJobRegistrator.cs | 2 +- .../HostedService/IJobRegistratorExtensions.cs | 2 +- src/Quartzmin/HostedService/IScheduleJob.cs | 2 +- .../HostedService/IServiceCollectionExtensions.cs | 2 +- src/Quartzmin/HostedService/JobOptions.cs | 2 +- src/Quartzmin/HostedService/JobRegistrator.cs | 2 +- src/Quartzmin/HostedService/QuartzHostedService.cs | 2 +- src/Quartzmin/HostedService/ScheduleJob.cs | 2 +- .../HostedService/ServiceCollectionJobFactory.cs | 2 +- src/Quartzmin/HostedService/TriggerOptions.cs | 2 +- src/Quartzmin/Models/CalendarListItem.cs | 2 +- src/Quartzmin/Models/CalendarViewModel.cs | 6 +++--- src/Quartzmin/Models/FormFile.cs | 2 +- src/Quartzmin/Models/Histogram.cs | 2 +- src/Quartzmin/Models/IHasValidation.cs | 2 +- src/Quartzmin/Models/JobDataMapItem.cs | 4 ++-- src/Quartzmin/Models/JobDataMapItemBase.cs | 4 ++-- src/Quartzmin/Models/JobDataMapModel.cs | 2 +- src/Quartzmin/Models/JobListItem.cs | 2 +- src/Quartzmin/Models/JobViewModel.cs | 4 ++-- src/Quartzmin/Models/KeyModel.cs | 2 +- src/Quartzmin/Models/TriggerListItem.cs | 2 +- src/Quartzmin/Models/TriggerViewModel.cs | 4 ++-- src/Quartzmin/Models/ValidationResult.cs | 2 +- .../Owin/FixedEmbeddedResourceFileSystem.cs | 2 +- src/Quartzmin/Owin/SeekableRequestMiddleware.cs | 2 +- src/Quartzmin/QuartzminOptions.cs | 12 ++++++------ src/Quartzmin/Services.cs | 10 +++++----- .../{Quartzmin.csproj => SilkierQuartz.csproj} | 8 ++++---- src/Quartzmin/TypeHandlerService.cs | 4 ++-- src/Quartzmin/TypeHandlers/Attributes.cs | 2 +- src/Quartzmin/TypeHandlers/BooleanHandler.cs | 2 +- src/Quartzmin/TypeHandlers/DateTimeHandler.cs | 2 +- src/Quartzmin/TypeHandlers/EnumHandler.cs | 2 +- src/Quartzmin/TypeHandlers/FileHandler.cs | 4 ++-- src/Quartzmin/TypeHandlers/NumberHandler.cs | 2 +- src/Quartzmin/TypeHandlers/OptionSetHandler.cs | 2 +- src/Quartzmin/TypeHandlers/StringHandler.cs | 2 +- src/Quartzmin/TypeHandlers/TypeHandlerBase.cs | 4 ++-- .../TypeHandlers/UnsupportedTypeHandler.cs | 2 +- src/Quartzmin/ViewEngine.cs | 2 +- src/Quartzmin/ViewFileSystemFactory.cs | 6 +++--- src/Quartzmin/Views/Layout.hbs | 6 +++--- .../IServiceCollectionExtensionsUnitTest.cs | 6 +++--- .../QuartzHostedServiceUnitTest.cs | 2 +- .../SilkierQuartz.Test.csproj | 2 +- 73 files changed, 144 insertions(+), 144 deletions(-) rename src/Quartzmin/{Quartzmin.csproj => SilkierQuartz.csproj} (94%) diff --git a/Quartzmin.sln b/Quartzmin.sln index 58f28e6..2f6b58b 100644 --- a/Quartzmin.sln +++ b/Quartzmin.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B669A725-70A9-4E80-BAC7-9765A14CAAA4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quartzmin", "src\Quartzmin\Quartzmin.csproj", "{D7BBB236-B0D3-4CB8-86C8-C7E925BBBE38}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilkierQuartz", "src\Quartzmin\SilkierQuartz.csproj", "{D7BBB236-B0D3-4CB8-86C8-C7E925BBBE38}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quartz.Plugins.RecentHistory", "src\Quartz.Plugins.RecentHistory\Quartz.Plugins.RecentHistory.csproj", "{4CEFA319-5052-4B65-B1B8-647CCFFF2A1C}" EndProject diff --git a/README.md b/README.md index 59f7e24..876e60a 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ [![NuGet](https://img.shields.io/nuget/v/SilkierQuartz.svg)](https://www.nuget.org/packages/SilkierQuartz) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE) -SilkierQuartz is a new after merging [Quartzmin](https://github.com/jlucansky/Quartzmin) and [QuartzHostedService](https://github.com/mukmyash/QuartzHostedService)! +SilkierQuartz is a new after merging [SilkierQuartz](https://github.com/jlucansky/SilkierQuartz) and [QuartzHostedService](https://github.com/mukmyash/QuartzHostedService)! > [Quartz.NET](https://www.quartz-scheduler.net) is a full-featured, open source job scheduling system that can be used from smallest apps to large scale enterprise systems. -> [Quartzmin](https://github.com/jlucansky/Quartzmin) Quartzmin is powerful, easy to use web management tool for Quartz.NET +> [SilkierQuartz](https://github.com/jlucansky/SilkierQuartz) SilkierQuartz is powerful, easy to use web management tool for Quartz.NET > [QuartzHostedService](https://github.com/mukmyash/QuartzHostedService) QuartzHostedService is easy to host Quartz as service in .Net Core ! @@ -18,11 +18,11 @@ So SilkierQuartz can be used within your existing application with minimum effort as a Quartz.NET plugin when it automatically creates embedded web server. Or it can be plugged into your existing OWIN-based web application as a middleware. -![Demo](https://raw.githubusercontent.com/jlucansky/public-assets/master/Quartzmin/demo.gif) +![Demo](https://raw.githubusercontent.com/jlucansky/public-assets/master/SilkierQuartz/demo.gif) -The goal of this project is to provide convenient tool to utilize most of the functionality that Quartz.NET enables. The biggest challenge was to create a simple yet effective editor of job data map which is heart of Quartz.NET. Every job data map item is strongly typed and Quartzmin can be easily extended with a custom editor for your specific type beside standard supported types such as String, Integer, DateTime and so on. +The goal of this project is to provide convenient tool to utilize most of the functionality that Quartz.NET enables. The biggest challenge was to create a simple yet effective editor of job data map which is heart of Quartz.NET. Every job data map item is strongly typed and SilkierQuartz can be easily extended with a custom editor for your specific type beside standard supported types such as String, Integer, DateTime and so on. -Quartzmin was created with **Semantic UI** and **Handlebars.Net** as the template engine. +SilkierQuartz was created with **Semantic UI** and **Handlebars.Net** as the template engine. ## Features - Add, modify jobs and triggers @@ -74,7 +74,7 @@ public void ConfigureServices(IServiceCollection services) public void Configure(IApplicationBuilder app) { - app.UseSilkierQuartz(new QuartzminOptions() + app.UseSilkierQuartz(new SilkierQuartzOptions() { Scheduler = StdSchedulerFactory.GetDefaultScheduler().Result }); diff --git a/sample/AspNetCore31/AspNetCore31.csproj b/sample/AspNetCore31/AspNetCore31.csproj index 05c45e1..bbc947a 100644 --- a/sample/AspNetCore31/AspNetCore31.csproj +++ b/sample/AspNetCore31/AspNetCore31.csproj @@ -6,7 +6,7 @@ - + diff --git a/sample/AspNetCore31/DemoScheduler.cs b/sample/AspNetCore31/DemoScheduler.cs index 8152cdc..f149324 100644 --- a/sample/AspNetCore31/DemoScheduler.cs +++ b/sample/AspNetCore31/DemoScheduler.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.IO; using System.Threading.Tasks; -namespace Quartzmin +namespace SilkierQuartz { public static class DemoScheduler { diff --git a/sample/AspNetCore31/Pages/Shared/_Layout.cshtml b/sample/AspNetCore31/Pages/Shared/_Layout.cshtml index f1c32d0..660755d 100644 --- a/sample/AspNetCore31/Pages/Shared/_Layout.cshtml +++ b/sample/AspNetCore31/Pages/Shared/_Layout.cshtml @@ -22,7 +22,7 @@ Home
  • - Quartzmin + SilkierQuartz
  • Privacy diff --git a/sample/AspNetCore31/Program.cs b/sample/AspNetCore31/Program.cs index 05dc4e1..671fe53 100644 --- a/sample/AspNetCore31/Program.cs +++ b/sample/AspNetCore31/Program.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Quartzmin; +using SilkierQuartz; namespace AspNetCore31 { diff --git a/sample/AspNetCore31/Startup.cs b/sample/AspNetCore31/Startup.cs index 96a30e9..ab716ef 100644 --- a/sample/AspNetCore31/Startup.cs +++ b/sample/AspNetCore31/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Quartz; -using Quartzmin; +using SilkierQuartz; namespace AspNetCore31 { @@ -27,7 +27,7 @@ namespace AspNetCore31 public void ConfigureServices(IServiceCollection services) { services.AddRazorPages(); - services.AddQuartzmin(); + services.AddSilkierQuartz(); services.AddOptions(); services.Configure(Configuration); services.Configure(options => { options.WriteText = "This is inject string"; }); @@ -54,7 +54,7 @@ namespace AspNetCore31 app.UseStaticFiles(); app.UseRouting(); app.UseAuthorization(); - app.UseQuartzmin(new QuartzminOptions() { Scheduler = scheduler, VirtualPathRoot = "/Quartzmin" , UseLocalTime =true, DefaultDateFormat="yyyy-MM-dd", DefaultTimeFormat="HH:mm:ss" }); + app.UseSilkierQuartz(new SilkierQuartzOptions() { Scheduler = scheduler, VirtualPathRoot = "/SilkierQuartz" , UseLocalTime =true, DefaultDateFormat="yyyy-MM-dd", DefaultTimeFormat="HH:mm:ss" }); app.UseEndpoints(endpoints => { endpoints.MapRazorPages(); diff --git a/src/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj b/src/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj index 7d006fd..2cc746b 100644 --- a/src/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj +++ b/src/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj @@ -11,15 +11,15 @@ Quartz.Plugins.RecentHistory Quartz.NET plugin to persist recent job execution history Jan Lucansky - https://github.com/jlucansky/Quartzmin - This is supporting package for Quartzmin + https://github.com/jlucansky/SilkierQuartz + This is supporting package for SilkierQuartz quartz;recent;history 1.0.0.0 1.0.0.0 LICENSE Copyright © 2018 Jan Lucansky git - https://github.com/jlucansky/Quartzmin + https://github.com/jlucansky/SilkierQuartz Quartz.Plugins.RecentHistoryFork diff --git a/src/Quartzmin/AppBuilderExtensions.cs b/src/Quartzmin/AppBuilderExtensions.cs index 4477559..b4ec451 100644 --- a/src/Quartzmin/AppBuilderExtensions.cs +++ b/src/Quartzmin/AppBuilderExtensions.cs @@ -7,7 +7,7 @@ using Microsoft.Owin.StaticFiles.ContentTypes; using MultipartDataMediaFormatter; using MultipartDataMediaFormatter.Infrastructure; using Owin; -using Quartzmin.Owin; +using SilkierQuartz.Owin; using System; using System.Globalization; using System.Net; @@ -23,11 +23,11 @@ using System.Web.Http.Hosting; using System.Web.Http.Results; using System.Web.Management; -namespace Quartzmin +namespace SilkierQuartz { public static class AppBuilderExtensions { - public static void UseQuartzmin(this IAppBuilder app, QuartzminOptions options, Action configure = null) + public static void UseSilkierQuartz(this IAppBuilder app, SilkierQuartzOptions options, Action configure = null) { options = options ?? throw new ArgumentNullException(nameof(options)); @@ -45,7 +45,7 @@ namespace Quartzmin HttpConfiguration config = new HttpConfiguration(); config.Routes.MapHttpRoute( - name: nameof(Quartzmin), + name: nameof(SilkierQuartz), routeTemplate: "{controller}/{action}", defaults: new { controller = "Scheduler", action = "Index" } ); @@ -110,11 +110,11 @@ namespace Quartzmin bool IHostBufferPolicySelector.UseBufferedInputStream(object hostContext) => true; } - private static void UseFileServer(this IAppBuilder app, QuartzminOptions options) + private static void UseFileServer(this IAppBuilder app, SilkierQuartzOptions options) { IFileSystem fs; if (string.IsNullOrEmpty(options.ContentRootDirectory)) - fs = new FixedEmbeddedResourceFileSystem(Assembly.GetExecutingAssembly(), nameof(Quartzmin) + ".Content"); + fs = new FixedEmbeddedResourceFileSystem(Assembly.GetExecutingAssembly(), nameof(SilkierQuartz) + ".Content"); else fs = new PhysicalFileSystem(options.ContentRootDirectory); diff --git a/src/Quartzmin/ApplicationBuilderExtensions.cs b/src/Quartzmin/ApplicationBuilderExtensions.cs index 58a1540..b9df508 100644 --- a/src/Quartzmin/ApplicationBuilderExtensions.cs +++ b/src/Quartzmin/ApplicationBuilderExtensions.cs @@ -9,11 +9,11 @@ using Microsoft.Extensions.FileProviders; using System; using System.Reflection; -namespace Quartzmin +namespace SilkierQuartz { public static class ApplicationBuilderExtensions { - public static void UseQuartzmin( this IApplicationBuilder app, QuartzminOptions options, Action configure = null ) + public static void UseSilkierQuartz( this IApplicationBuilder app, SilkierQuartzOptions options, Action configure = null ) { options = options ?? throw new ArgumentNullException( nameof( options ) ); @@ -32,19 +32,19 @@ namespace Quartzmin #if NETCOREAPP app.UseEndpoints( endpoints => { - endpoints.MapControllerRoute( nameof( Quartzmin ), $"{options.VirtualPathRoot}/{{controller=Scheduler}}/{{action=Index}}" ); + endpoints.MapControllerRoute( nameof( SilkierQuartz ), $"{options.VirtualPathRoot}/{{controller=Scheduler}}/{{action=Index}}" ); } ); #else app.UseMvc( routes => { routes.MapRoute( - name: nameof( Quartzmin ), + name: nameof( SilkierQuartz ), template: "{controller=Scheduler}/{action=Index}" ); } ); #endif } - private static void UseFileServer( this IApplicationBuilder app, QuartzminOptions options ) + private static void UseFileServer( this IApplicationBuilder app, SilkierQuartzOptions options ) { IFileProvider fs; if ( string.IsNullOrEmpty( options.ContentRootDirectory ) ) @@ -64,14 +64,14 @@ namespace Quartzmin } #if NETCOREAPP - public static void AddQuartzmin( this IServiceCollection services ) + public static void AddSilkierQuartz( this IServiceCollection services ) { services.AddControllers() .AddApplicationPart( Assembly.GetExecutingAssembly() ) .AddNewtonsoftJson(); } #else - public static void AddQuartzmin( this IServiceCollection services ) + public static void AddSilkierQuartz( this IServiceCollection services ) { services.AddMvcCore() .AddApplicationPart( Assembly.GetExecutingAssembly() ) diff --git a/src/Quartzmin/Cache.cs b/src/Quartzmin/Cache.cs index 13eb72e..8e8174f 100644 --- a/src/Quartzmin/Cache.cs +++ b/src/Quartzmin/Cache.cs @@ -3,7 +3,7 @@ using Quartz.Impl.Matchers; using System.Collections.Generic; using System.Linq; -namespace Quartzmin +namespace SilkierQuartz { internal class Cache { diff --git a/src/Quartzmin/Controllers/CalendarsController.cs b/src/Quartzmin/Controllers/CalendarsController.cs index 4b93833..1905f45 100644 --- a/src/Quartzmin/Controllers/CalendarsController.cs +++ b/src/Quartzmin/Controllers/CalendarsController.cs @@ -1,6 +1,6 @@ using Quartz; -using Quartzmin.Helpers; -using Quartzmin.Models; +using SilkierQuartz.Helpers; +using SilkierQuartz.Models; using System; using System.Collections.Generic; using System.Linq; @@ -16,7 +16,7 @@ using IActionResult = System.Web.Http.IHttpActionResult; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class CalendarsController : PageControllerBase { diff --git a/src/Quartzmin/Controllers/ExecutionsController.cs b/src/Quartzmin/Controllers/ExecutionsController.cs index 8a39e59..b5e9e0b 100644 --- a/src/Quartzmin/Controllers/ExecutionsController.cs +++ b/src/Quartzmin/Controllers/ExecutionsController.cs @@ -1,6 +1,6 @@ using Quartz; -using Quartzmin.Helpers; -using Quartzmin.Models; +using SilkierQuartz.Helpers; +using SilkierQuartz.Models; using Quartz.Plugins.RecentHistory; using Quartz.Impl.Matchers; using System; @@ -18,7 +18,7 @@ using IActionResult = System.Web.Http.IHttpActionResult; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class ExecutionsController : PageControllerBase { diff --git a/src/Quartzmin/Controllers/HistoryController.cs b/src/Quartzmin/Controllers/HistoryController.cs index 7be408b..94e2e1f 100644 --- a/src/Quartzmin/Controllers/HistoryController.cs +++ b/src/Quartzmin/Controllers/HistoryController.cs @@ -14,7 +14,7 @@ using IActionResult = System.Web.Http.IHttpActionResult; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class HistoryController : PageControllerBase { diff --git a/src/Quartzmin/Controllers/JobDataMapController.cs b/src/Quartzmin/Controllers/JobDataMapController.cs index ac4e71a..849b42c 100644 --- a/src/Quartzmin/Controllers/JobDataMapController.cs +++ b/src/Quartzmin/Controllers/JobDataMapController.cs @@ -1,6 +1,6 @@ -using Quartzmin.Helpers; -using Quartzmin.Models; -using Quartzmin.TypeHandlers; +using SilkierQuartz.Helpers; +using SilkierQuartz.Models; +using SilkierQuartz.TypeHandlers; using Newtonsoft.Json.Linq; using Newtonsoft.Json; using System.Linq; @@ -20,7 +20,7 @@ using System.Web.Http.Results; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class JobDataMapController : PageControllerBase { diff --git a/src/Quartzmin/Controllers/JobsController.cs b/src/Quartzmin/Controllers/JobsController.cs index f561c74..15a7dd4 100644 --- a/src/Quartzmin/Controllers/JobsController.cs +++ b/src/Quartzmin/Controllers/JobsController.cs @@ -1,7 +1,7 @@ using Quartz; using Quartz.Impl.Matchers; -using Quartzmin.Helpers; -using Quartzmin.Models; +using SilkierQuartz.Helpers; +using SilkierQuartz.Models; using Quartz.Plugins.RecentHistory; using System; using System.Collections.Generic; @@ -18,7 +18,7 @@ using IActionResult = System.Web.Http.IHttpActionResult; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class JobsController : PageControllerBase { diff --git a/src/Quartzmin/Controllers/PageControllerBase.cs b/src/Quartzmin/Controllers/PageControllerBase.cs index 14b40cb..17b7cb5 100644 --- a/src/Quartzmin/Controllers/PageControllerBase.cs +++ b/src/Quartzmin/Controllers/PageControllerBase.cs @@ -4,11 +4,11 @@ using System.Dynamic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Quartzmin.Models; -using Quartzmin.Helpers; +using SilkierQuartz.Models; +using SilkierQuartz.Helpers; using Quartz; -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { #region Target-Specific Directives diff --git a/src/Quartzmin/Controllers/SchedulerController.cs b/src/Quartzmin/Controllers/SchedulerController.cs index 9243382..a1fe84f 100644 --- a/src/Quartzmin/Controllers/SchedulerController.cs +++ b/src/Quartzmin/Controllers/SchedulerController.cs @@ -1,6 +1,6 @@ using Quartz; -using Quartzmin.Helpers; -using Quartzmin.Models; +using SilkierQuartz.Helpers; +using SilkierQuartz.Models; using Quartz.Plugins.RecentHistory; using Quartz.Impl.Matchers; using System; @@ -19,7 +19,7 @@ using IActionResult = System.Web.Http.IHttpActionResult; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class SchedulerController : PageControllerBase { diff --git a/src/Quartzmin/Controllers/TriggersController.cs b/src/Quartzmin/Controllers/TriggersController.cs index c69dbd0..48bfab0 100644 --- a/src/Quartzmin/Controllers/TriggersController.cs +++ b/src/Quartzmin/Controllers/TriggersController.cs @@ -1,7 +1,7 @@ using Quartz; using Quartz.Impl.Matchers; -using Quartzmin.Helpers; -using Quartzmin.Models; +using SilkierQuartz.Helpers; +using SilkierQuartz.Models; using Quartz.Plugins.RecentHistory; using System; using System.Collections.Generic; @@ -18,7 +18,7 @@ using IActionResult = System.Web.Http.IHttpActionResult; #endif #endregion -namespace Quartzmin.Controllers +namespace SilkierQuartz.Controllers { public class TriggersController : PageControllerBase { diff --git a/src/Quartzmin/DateTimeSettings.cs b/src/Quartzmin/DateTimeSettings.cs index 3faed13..090ebad 100644 --- a/src/Quartzmin/DateTimeSettings.cs +++ b/src/Quartzmin/DateTimeSettings.cs @@ -1,4 +1,4 @@ -namespace Quartzmin +namespace SilkierQuartz { internal static class DateTimeSettings { diff --git a/src/Quartzmin/Extensions.cs b/src/Quartzmin/Extensions.cs index 12edaa7..4e4045c 100644 --- a/src/Quartzmin/Extensions.cs +++ b/src/Quartzmin/Extensions.cs @@ -1,6 +1,6 @@ using Quartz; -using Quartzmin.Models; -using Quartzmin.TypeHandlers; +using SilkierQuartz.Models; +using SilkierQuartz.TypeHandlers; using System; using System.Collections.Generic; using System.Globalization; @@ -21,7 +21,7 @@ using HttpRequest = System.Net.Http.HttpRequestMessage; #endif #endregion -namespace Quartzmin +namespace SilkierQuartz { internal static class Extensions { diff --git a/src/Quartzmin/Helpers/FromFormAttribute.cs b/src/Quartzmin/Helpers/FromFormAttribute.cs index 0c27900..c69dc16 100644 --- a/src/Quartzmin/Helpers/FromFormAttribute.cs +++ b/src/Quartzmin/Helpers/FromFormAttribute.cs @@ -2,7 +2,7 @@ using System; -namespace Quartzmin.Helpers +namespace SilkierQuartz.Helpers { [AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)] public class FromFormAttribute : Attribute diff --git a/src/Quartzmin/Helpers/HandlebarsHelpers.cs b/src/Quartzmin/Helpers/HandlebarsHelpers.cs index 46b3f03..6e92267 100644 --- a/src/Quartzmin/Helpers/HandlebarsHelpers.cs +++ b/src/Quartzmin/Helpers/HandlebarsHelpers.cs @@ -1,6 +1,6 @@ using HandlebarsDotNet; -using Quartzmin.Models; -using Quartzmin.TypeHandlers; +using SilkierQuartz.Models; +using SilkierQuartz.TypeHandlers; using System; using System.Collections.Generic; using System.Globalization; @@ -10,9 +10,9 @@ using System.Reflection; using System.Text; using System.Web; -using static Quartzmin.Controllers.PageControllerBase; +using static SilkierQuartz.Controllers.PageControllerBase; -namespace Quartzmin.Helpers +namespace SilkierQuartz.Helpers { internal class HandlebarsHelpers { @@ -57,7 +57,7 @@ namespace Quartzmin.Helpers h.RegisterHelper(nameof(eachItems), eachItems); h.RegisterHelper(nameof(ToBase64), ToBase64); h.RegisterHelper(nameof(footer), footer); - h.RegisterHelper(nameof(QuartzminVersion), QuartzminVersion); + h.RegisterHelper(nameof(SilkierQuartzVersion), SilkierQuartzVersion); h.RegisterHelper(nameof(Logo), Logo); h.RegisterHelper(nameof(ProductName), ProductName); } @@ -258,7 +258,7 @@ namespace Quartzmin.Helpers options.Template(writer, (object)context); } } - void QuartzminVersion(TextWriter output, dynamic context, params object[] arguments) + void SilkierQuartzVersion(TextWriter output, dynamic context, params object[] arguments) { var v = GetType().Assembly.GetCustomAttributes().FirstOrDefault(); output.Write(v.InformationalVersion); diff --git a/src/Quartzmin/Helpers/JobDataMapRequest.cs b/src/Quartzmin/Helpers/JobDataMapRequest.cs index 044ff87..94973d9 100644 --- a/src/Quartzmin/Helpers/JobDataMapRequest.cs +++ b/src/Quartzmin/Helpers/JobDataMapRequest.cs @@ -1,4 +1,4 @@ -using Quartzmin.Models; +using SilkierQuartz.Models; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -13,7 +13,7 @@ using System.Net.Http; #endif #endregion -namespace Quartzmin.Helpers +namespace SilkierQuartz.Helpers { internal static class JobDataMapRequest { diff --git a/src/Quartzmin/Helpers/JsonErrorResponse.cs b/src/Quartzmin/Helpers/JsonErrorResponse.cs index ca167d1..59b897c 100644 --- a/src/Quartzmin/Helpers/JsonErrorResponse.cs +++ b/src/Quartzmin/Helpers/JsonErrorResponse.cs @@ -1,5 +1,5 @@  -namespace Quartzmin.Helpers +namespace SilkierQuartz.Helpers { #if (NETSTANDARD || NETCOREAPP) using Microsoft.AspNetCore.Mvc.Filters; diff --git a/src/Quartzmin/Helpers/JsonPascalCaseNamingPolicy.cs b/src/Quartzmin/Helpers/JsonPascalCaseNamingPolicy.cs index dc1f311..1dc49f6 100644 --- a/src/Quartzmin/Helpers/JsonPascalCaseNamingPolicy.cs +++ b/src/Quartzmin/Helpers/JsonPascalCaseNamingPolicy.cs @@ -2,7 +2,7 @@ using System; using System.Text.Json; -namespace Quartzmin.Helpers +namespace SilkierQuartz.Helpers { public class JsonPascalCaseNamingPolicy : JsonNamingPolicy { diff --git a/src/Quartzmin/Helpers/ModelValidator.cs b/src/Quartzmin/Helpers/ModelValidator.cs index c2a87d4..b5060d1 100644 --- a/src/Quartzmin/Helpers/ModelValidator.cs +++ b/src/Quartzmin/Helpers/ModelValidator.cs @@ -1,11 +1,11 @@ -using Quartzmin.Models; +using SilkierQuartz.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; -namespace Quartzmin.Helpers +namespace SilkierQuartz.Helpers { public static class ModelValidator { diff --git a/src/Quartzmin/HostedService/IJobRegistrator.cs b/src/Quartzmin/HostedService/IJobRegistrator.cs index ed1023f..be31c11 100644 --- a/src/Quartzmin/HostedService/IJobRegistrator.cs +++ b/src/Quartzmin/HostedService/IJobRegistrator.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { public interface IJobRegistrator { diff --git a/src/Quartzmin/HostedService/IJobRegistratorExtensions.cs b/src/Quartzmin/HostedService/IJobRegistratorExtensions.cs index 8d96dd8..a2b0d78 100644 --- a/src/Quartzmin/HostedService/IJobRegistratorExtensions.cs +++ b/src/Quartzmin/HostedService/IJobRegistratorExtensions.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { public static class IJobRegistratorExtensions { diff --git a/src/Quartzmin/HostedService/IScheduleJob.cs b/src/Quartzmin/HostedService/IScheduleJob.cs index 6e725b7..8c5b1ea 100644 --- a/src/Quartzmin/HostedService/IScheduleJob.cs +++ b/src/Quartzmin/HostedService/IScheduleJob.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Quartz; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { internal interface IScheduleJob { diff --git a/src/Quartzmin/HostedService/IServiceCollectionExtensions.cs b/src/Quartzmin/HostedService/IServiceCollectionExtensions.cs index dc6aab8..09246e5 100644 --- a/src/Quartzmin/HostedService/IServiceCollectionExtensions.cs +++ b/src/Quartzmin/HostedService/IServiceCollectionExtensions.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Text; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { public static class IServiceCollectionExtensions { diff --git a/src/Quartzmin/HostedService/JobOptions.cs b/src/Quartzmin/HostedService/JobOptions.cs index b40db9f..66955dc 100644 --- a/src/Quartzmin/HostedService/JobOptions.cs +++ b/src/Quartzmin/HostedService/JobOptions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { public class JobOptions { diff --git a/src/Quartzmin/HostedService/JobRegistrator.cs b/src/Quartzmin/HostedService/JobRegistrator.cs index 9681dc1..a199a2d 100644 --- a/src/Quartzmin/HostedService/JobRegistrator.cs +++ b/src/Quartzmin/HostedService/JobRegistrator.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { internal class JobRegistrator : IJobRegistrator { diff --git a/src/Quartzmin/HostedService/QuartzHostedService.cs b/src/Quartzmin/HostedService/QuartzHostedService.cs index 77bc939..1e074e5 100644 --- a/src/Quartzmin/HostedService/QuartzHostedService.cs +++ b/src/Quartzmin/HostedService/QuartzHostedService.cs @@ -10,7 +10,7 @@ using Quartz; using Quartz.Spi; using System.Linq; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { internal class QuartzHostedService : IHostedService { diff --git a/src/Quartzmin/HostedService/ScheduleJob.cs b/src/Quartzmin/HostedService/ScheduleJob.cs index 30d0bc3..abab36e 100644 --- a/src/Quartzmin/HostedService/ScheduleJob.cs +++ b/src/Quartzmin/HostedService/ScheduleJob.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { internal class ScheduleJob : IScheduleJob { diff --git a/src/Quartzmin/HostedService/ServiceCollectionJobFactory.cs b/src/Quartzmin/HostedService/ServiceCollectionJobFactory.cs index aa7134c..f18fb3a 100644 --- a/src/Quartzmin/HostedService/ServiceCollectionJobFactory.cs +++ b/src/Quartzmin/HostedService/ServiceCollectionJobFactory.cs @@ -6,7 +6,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Text; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { public class ServiceCollectionJobFactory : IJobFactory { diff --git a/src/Quartzmin/HostedService/TriggerOptions.cs b/src/Quartzmin/HostedService/TriggerOptions.cs index 9cb3201..64ee56a 100644 --- a/src/Quartzmin/HostedService/TriggerOptions.cs +++ b/src/Quartzmin/HostedService/TriggerOptions.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Quartzmin.HostedService +namespace SilkierQuartz.HostedService { public class TriggerOptions { diff --git a/src/Quartzmin/Models/CalendarListItem.cs b/src/Quartzmin/Models/CalendarListItem.cs index f141bb4..6929eb0 100644 --- a/src/Quartzmin/Models/CalendarListItem.cs +++ b/src/Quartzmin/Models/CalendarListItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class CalendarListItem { diff --git a/src/Quartzmin/Models/CalendarViewModel.cs b/src/Quartzmin/Models/CalendarViewModel.cs index 6a6b4d0..9347c8d 100644 --- a/src/Quartzmin/Models/CalendarViewModel.cs +++ b/src/Quartzmin/Models/CalendarViewModel.cs @@ -1,14 +1,14 @@ using Quartz; using Quartz.Impl.Calendar; -using Quartzmin.Helpers; -using Quartzmin.TypeHandlers; +using SilkierQuartz.Helpers; +using SilkierQuartz.TypeHandlers; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Globalization; using System.Linq; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class CalendarViewModel : IHasValidation { diff --git a/src/Quartzmin/Models/FormFile.cs b/src/Quartzmin/Models/FormFile.cs index 21c02d6..61348ee 100644 --- a/src/Quartzmin/Models/FormFile.cs +++ b/src/Quartzmin/Models/FormFile.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class FormFile { diff --git a/src/Quartzmin/Models/Histogram.cs b/src/Quartzmin/Models/Histogram.cs index 3640d80..bea9e3a 100644 --- a/src/Quartzmin/Models/Histogram.cs +++ b/src/Quartzmin/Models/Histogram.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class Histogram { diff --git a/src/Quartzmin/Models/IHasValidation.cs b/src/Quartzmin/Models/IHasValidation.cs index a00f9e4..d3908e6 100644 --- a/src/Quartzmin/Models/IHasValidation.cs +++ b/src/Quartzmin/Models/IHasValidation.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public interface IHasValidation { diff --git a/src/Quartzmin/Models/JobDataMapItem.cs b/src/Quartzmin/Models/JobDataMapItem.cs index e1644a7..24edb7e 100644 --- a/src/Quartzmin/Models/JobDataMapItem.cs +++ b/src/Quartzmin/Models/JobDataMapItem.cs @@ -1,6 +1,6 @@ -using Quartzmin.TypeHandlers; +using SilkierQuartz.TypeHandlers; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class JobDataMapItem : JobDataMapItemBase { diff --git a/src/Quartzmin/Models/JobDataMapItemBase.cs b/src/Quartzmin/Models/JobDataMapItemBase.cs index 1fb3d0f..f29e6b5 100644 --- a/src/Quartzmin/Models/JobDataMapItemBase.cs +++ b/src/Quartzmin/Models/JobDataMapItemBase.cs @@ -1,9 +1,9 @@ -using Quartzmin.TypeHandlers; +using SilkierQuartz.TypeHandlers; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class JobDataMapItemBase : IHasValidation { diff --git a/src/Quartzmin/Models/JobDataMapModel.cs b/src/Quartzmin/Models/JobDataMapModel.cs index 9001e7b..222b9a9 100644 --- a/src/Quartzmin/Models/JobDataMapModel.cs +++ b/src/Quartzmin/Models/JobDataMapModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class JobDataMapModel { diff --git a/src/Quartzmin/Models/JobListItem.cs b/src/Quartzmin/Models/JobListItem.cs index d797429..10fe2d7 100644 --- a/src/Quartzmin/Models/JobListItem.cs +++ b/src/Quartzmin/Models/JobListItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class JobListItem { diff --git a/src/Quartzmin/Models/JobViewModel.cs b/src/Quartzmin/Models/JobViewModel.cs index a6bf320..22f7f83 100644 --- a/src/Quartzmin/Models/JobViewModel.cs +++ b/src/Quartzmin/Models/JobViewModel.cs @@ -1,8 +1,8 @@ -using Quartzmin.Helpers; +using SilkierQuartz.Helpers; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class JobViewModel : IHasValidation { diff --git a/src/Quartzmin/Models/KeyModel.cs b/src/Quartzmin/Models/KeyModel.cs index 2623586..7609392 100644 --- a/src/Quartzmin/Models/KeyModel.cs +++ b/src/Quartzmin/Models/KeyModel.cs @@ -1,6 +1,6 @@ using Quartz; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class KeyModel { diff --git a/src/Quartzmin/Models/TriggerListItem.cs b/src/Quartzmin/Models/TriggerListItem.cs index 549dcb6..11b4915 100644 --- a/src/Quartzmin/Models/TriggerListItem.cs +++ b/src/Quartzmin/Models/TriggerListItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class TriggerListItem { diff --git a/src/Quartzmin/Models/TriggerViewModel.cs b/src/Quartzmin/Models/TriggerViewModel.cs index 74805a9..69c9e64 100644 --- a/src/Quartzmin/Models/TriggerViewModel.cs +++ b/src/Quartzmin/Models/TriggerViewModel.cs @@ -2,7 +2,7 @@ using Quartz; using Quartz.Impl.Matchers; using Quartz.Impl.Triggers; -using Quartzmin.Helpers; +using SilkierQuartz.Helpers; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -12,7 +12,7 @@ using System.Threading.Tasks; using static Quartz.MisfireInstruction; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class TriggerViewModel : IHasValidation { diff --git a/src/Quartzmin/Models/ValidationResult.cs b/src/Quartzmin/Models/ValidationResult.cs index 455e9ee..fd65ce6 100644 --- a/src/Quartzmin/Models/ValidationResult.cs +++ b/src/Quartzmin/Models/ValidationResult.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Quartzmin.Models +namespace SilkierQuartz.Models { public class ValidationResult { diff --git a/src/Quartzmin/Owin/FixedEmbeddedResourceFileSystem.cs b/src/Quartzmin/Owin/FixedEmbeddedResourceFileSystem.cs index dc41111..a8bdd0a 100644 --- a/src/Quartzmin/Owin/FixedEmbeddedResourceFileSystem.cs +++ b/src/Quartzmin/Owin/FixedEmbeddedResourceFileSystem.cs @@ -7,7 +7,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace Quartzmin.Owin +namespace SilkierQuartz.Owin { /// /// Looks up files using embedded resources in the specified assembly. diff --git a/src/Quartzmin/Owin/SeekableRequestMiddleware.cs b/src/Quartzmin/Owin/SeekableRequestMiddleware.cs index a325077..ec9ec8c 100644 --- a/src/Quartzmin/Owin/SeekableRequestMiddleware.cs +++ b/src/Quartzmin/Owin/SeekableRequestMiddleware.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Web; using System.Web.Management; -namespace Quartzmin.Owin +namespace SilkierQuartz.Owin { internal class SeekableRequestMiddleware : OwinMiddleware { diff --git a/src/Quartzmin/QuartzminOptions.cs b/src/Quartzmin/QuartzminOptions.cs index 422c689..d073cb8 100644 --- a/src/Quartzmin/QuartzminOptions.cs +++ b/src/Quartzmin/QuartzminOptions.cs @@ -1,18 +1,18 @@ using Quartz; -using Quartzmin.TypeHandlers; +using SilkierQuartz.TypeHandlers; using System.Collections.Generic; using System.IO; -using Number = Quartzmin.TypeHandlers.NumberHandler.UnderlyingType; +using Number = SilkierQuartz.TypeHandlers.NumberHandler.UnderlyingType; -namespace Quartzmin +namespace SilkierQuartz { - public class QuartzminOptions + public class SilkierQuartzOptions { /// /// Supports any value that is a viable as a img src attribute value: url, or base64 /// src='data:image/jpeg;base64, LzlqLzRBQ...[end of base64 data]' - /// Defaults to the quartzmin original logo + /// Defaults to the SilkierQuartz original logo /// public string Logo { get; set; } = "Content/Images/logo.png"; @@ -50,7 +50,7 @@ namespace Quartzmin set => DateTimeSettings.UseLocalTime = value; } - public QuartzminOptions() + public SilkierQuartzOptions() { DefaultSelectedType = new StringHandler() { Name = "String" }; diff --git a/src/Quartzmin/Services.cs b/src/Quartzmin/Services.cs index 3f14597..9efef04 100644 --- a/src/Quartzmin/Services.cs +++ b/src/Quartzmin/Services.cs @@ -1,14 +1,14 @@ using HandlebarsDotNet; using Quartz; -using Quartzmin.Helpers; +using SilkierQuartz.Helpers; -namespace Quartzmin +namespace SilkierQuartz { public class Services { - internal const string ContextKey = "quartzmin.services"; + internal const string ContextKey = "SilkierQuartz.services"; - public QuartzminOptions Options { get; set; } + public SilkierQuartzOptions Options { get; set; } public ViewEngine ViewEngine { get; set; } @@ -20,7 +20,7 @@ namespace Quartzmin internal Cache Cache { get; private set; } - public static Services Create(QuartzminOptions options) + public static Services Create(SilkierQuartzOptions options) { var handlebarsConfiguration = new HandlebarsConfiguration() { diff --git a/src/Quartzmin/Quartzmin.csproj b/src/Quartzmin/SilkierQuartz.csproj similarity index 94% rename from src/Quartzmin/Quartzmin.csproj rename to src/Quartzmin/SilkierQuartz.csproj index 2564177..acd9b25 100644 --- a/src/Quartzmin/Quartzmin.csproj +++ b/src/Quartzmin/SilkierQuartz.csproj @@ -9,10 +9,10 @@ true 1.0.5 - Quartzmin + SilkierQuartz Web management tool for Quartz.NET Jan Lucansky - https://github.com/jlucansky/Quartzmin + https://github.com/jlucansky/SilkierQuartz Powerful, easy to use web management tool for Quartz.NET quartz;web;ui @@ -21,11 +21,11 @@ LICENSE Copyright © 2020 Jan Lucansky git - https://github.com/jlucansky/Quartzmin + https://github.com/jlucansky/SilkierQuartz false true true - QuartzminFork + SilkierQuartzFork logo.png diff --git a/src/Quartzmin/TypeHandlerService.cs b/src/Quartzmin/TypeHandlerService.cs index ff0bdf6..22998e9 100644 --- a/src/Quartzmin/TypeHandlerService.cs +++ b/src/Quartzmin/TypeHandlerService.cs @@ -1,12 +1,12 @@ using JsonSubTypes; using Newtonsoft.Json; -using Quartzmin.TypeHandlers; +using SilkierQuartz.TypeHandlers; using System; using System.Collections.Generic; using System.Linq; using System.Text; -namespace Quartzmin +namespace SilkierQuartz { public class TypeHandlerService { diff --git a/src/Quartzmin/TypeHandlers/Attributes.cs b/src/Quartzmin/TypeHandlers/Attributes.cs index dad43fd..01f62c9 100644 --- a/src/Quartzmin/TypeHandlers/Attributes.cs +++ b/src/Quartzmin/TypeHandlers/Attributes.cs @@ -3,7 +3,7 @@ using System.IO; using System.Reflection; using System.Text; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)] public class TypeHandlerResourcesAttribute : Attribute diff --git a/src/Quartzmin/TypeHandlers/BooleanHandler.cs b/src/Quartzmin/TypeHandlers/BooleanHandler.cs index 5c29c1f..54482b2 100644 --- a/src/Quartzmin/TypeHandlers/BooleanHandler.cs +++ b/src/Quartzmin/TypeHandlers/BooleanHandler.cs @@ -1,4 +1,4 @@ -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(BooleanHandler))] public class BooleanHandler : TypeHandlerBase diff --git a/src/Quartzmin/TypeHandlers/DateTimeHandler.cs b/src/Quartzmin/TypeHandlers/DateTimeHandler.cs index 2807bac..e24bb20 100644 --- a/src/Quartzmin/TypeHandlers/DateTimeHandler.cs +++ b/src/Quartzmin/TypeHandlers/DateTimeHandler.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(DateTimeHandler))] public class DateTimeHandler : TypeHandlerBase diff --git a/src/Quartzmin/TypeHandlers/EnumHandler.cs b/src/Quartzmin/TypeHandlers/EnumHandler.cs index a68393f..6b089f9 100644 --- a/src/Quartzmin/TypeHandlers/EnumHandler.cs +++ b/src/Quartzmin/TypeHandlers/EnumHandler.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { public class EnumHandler : OptionSetHandler { diff --git a/src/Quartzmin/TypeHandlers/FileHandler.cs b/src/Quartzmin/TypeHandlers/FileHandler.cs index 1166cce..4f27a72 100644 --- a/src/Quartzmin/TypeHandlers/FileHandler.cs +++ b/src/Quartzmin/TypeHandlers/FileHandler.cs @@ -1,10 +1,10 @@ -using Quartzmin.Models; +using SilkierQuartz.Models; using System.Collections.Generic; using System.Linq; using System.Text; using System; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(FileHandler))] public class FileHandler : TypeHandlerBase diff --git a/src/Quartzmin/TypeHandlers/NumberHandler.cs b/src/Quartzmin/TypeHandlers/NumberHandler.cs index 98559a7..a9e3382 100644 --- a/src/Quartzmin/TypeHandlers/NumberHandler.cs +++ b/src/Quartzmin/TypeHandlers/NumberHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(NumberHandler), Script = "")] public class NumberHandler : TypeHandlerBase diff --git a/src/Quartzmin/TypeHandlers/OptionSetHandler.cs b/src/Quartzmin/TypeHandlers/OptionSetHandler.cs index 4217fac..94f32c5 100644 --- a/src/Quartzmin/TypeHandlers/OptionSetHandler.cs +++ b/src/Quartzmin/TypeHandlers/OptionSetHandler.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(OptionSetHandler))] public abstract class OptionSetHandler : TypeHandlerBase diff --git a/src/Quartzmin/TypeHandlers/StringHandler.cs b/src/Quartzmin/TypeHandlers/StringHandler.cs index f57e564..0fdd01b 100644 --- a/src/Quartzmin/TypeHandlers/StringHandler.cs +++ b/src/Quartzmin/TypeHandlers/StringHandler.cs @@ -1,6 +1,6 @@ using System; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(StringHandler))] public class StringHandler : TypeHandlerBase diff --git a/src/Quartzmin/TypeHandlers/TypeHandlerBase.cs b/src/Quartzmin/TypeHandlers/TypeHandlerBase.cs index f5062fa..5d538bb 100644 --- a/src/Quartzmin/TypeHandlers/TypeHandlerBase.cs +++ b/src/Quartzmin/TypeHandlers/TypeHandlerBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { public abstract class TypeHandlerBase { @@ -17,7 +17,7 @@ namespace Quartzmin.TypeHandlers internal static string GetTypeId(Type type) => type.FullName; /// - /// Unique name across + /// Unique name across /// public string Name { diff --git a/src/Quartzmin/TypeHandlers/UnsupportedTypeHandler.cs b/src/Quartzmin/TypeHandlers/UnsupportedTypeHandler.cs index 15aa69a..d528095 100644 --- a/src/Quartzmin/TypeHandlers/UnsupportedTypeHandler.cs +++ b/src/Quartzmin/TypeHandlers/UnsupportedTypeHandler.cs @@ -1,4 +1,4 @@ -namespace Quartzmin.TypeHandlers +namespace SilkierQuartz.TypeHandlers { [EmbeddedTypeHandlerResources(nameof(UnsupportedTypeHandler), Script = "")] public class UnsupportedTypeHandler : TypeHandlerBase diff --git a/src/Quartzmin/ViewEngine.cs b/src/Quartzmin/ViewEngine.cs index b6a5a3f..fb850ba 100644 --- a/src/Quartzmin/ViewEngine.cs +++ b/src/Quartzmin/ViewEngine.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Quartzmin +namespace SilkierQuartz { public class ViewEngine { diff --git a/src/Quartzmin/ViewFileSystemFactory.cs b/src/Quartzmin/ViewFileSystemFactory.cs index e84b7cd..a2833a9 100644 --- a/src/Quartzmin/ViewFileSystemFactory.cs +++ b/src/Quartzmin/ViewFileSystemFactory.cs @@ -3,11 +3,11 @@ using System.IO; using System.Reflection; using System.Text; -namespace Quartzmin +namespace SilkierQuartz { public static class ViewFileSystemFactory { - public static ViewEngineFileSystem Create(QuartzminOptions options) + public static ViewEngineFileSystem Create(SilkierQuartzOptions options) { ViewEngineFileSystem fs; @@ -81,7 +81,7 @@ namespace Quartzmin string GetFullPath(string filePath) { - return Path.Combine(nameof(Quartzmin) + ".Views", filePath.Replace("partials/", "Partials/")).Replace('/', '.').Replace('\\', '.'); + return Path.Combine(nameof(SilkierQuartz) + ".Views", filePath.Replace("partials/", "Partials/")).Replace('/', '.').Replace('\\', '.'); } } diff --git a/src/Quartzmin/Views/Layout.hbs b/src/Quartzmin/Views/Layout.hbs index 7a0422c..5d6283a 100644 --- a/src/Quartzmin/Views/Layout.hbs +++ b/src/Quartzmin/Views/Layout.hbs @@ -7,7 +7,7 @@ - {{ViewBag.Title}} - Quartzmin + {{ViewBag.Title}} - SilkierQuartz @@ -37,7 +37,7 @@
    - {{ProductName}} Quartzmin + {{ProductName}} SilkierQuartz
    @@ -77,7 +77,7 @@ {{#footer}} {{/footer}} diff --git a/test/QuartzHostedService.Test/IServiceCollectionExtensionsUnitTest.cs b/test/QuartzHostedService.Test/IServiceCollectionExtensionsUnitTest.cs index b0ab906..d2a5828 100644 --- a/test/QuartzHostedService.Test/IServiceCollectionExtensionsUnitTest.cs +++ b/test/QuartzHostedService.Test/IServiceCollectionExtensionsUnitTest.cs @@ -4,8 +4,8 @@ using Microsoft.Extensions.Hosting; using Quartz; using Quartz.Impl; using Quartz.Spi; -using Quartzmin; -using Quartzmin.HostedService; +using SilkierQuartz; +using SilkierQuartz.HostedService; using System; using Xunit; @@ -22,7 +22,7 @@ namespace SilkierQuartz.Test var testClass = serviceCollection.BuildServiceProvider().GetRequiredService(); testClass.Should() .NotBeNull() - .And.BeOfType(); + .And.BeOfType(); } [Fact(DisplayName = "«арегистрировали IJobFactory (дл¤ DI в Job'ах)")] diff --git a/test/QuartzHostedService.Test/QuartzHostedServiceUnitTest.cs b/test/QuartzHostedService.Test/QuartzHostedServiceUnitTest.cs index cd7c9de..1807369 100644 --- a/test/QuartzHostedService.Test/QuartzHostedServiceUnitTest.cs +++ b/test/QuartzHostedService.Test/QuartzHostedServiceUnitTest.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Xunit; -using Quartzmin.HostedService; +using SilkierQuartz.HostedService; namespace SilkierQuartz.Test { public class QuartzHostedServiceUnitTest diff --git a/test/QuartzHostedService.Test/SilkierQuartz.Test.csproj b/test/QuartzHostedService.Test/SilkierQuartz.Test.csproj index a4588c9..65a5cec 100644 --- a/test/QuartzHostedService.Test/SilkierQuartz.Test.csproj +++ b/test/QuartzHostedService.Test/SilkierQuartz.Test.csproj @@ -21,7 +21,7 @@ - +