diff --git a/README.md b/README.md index 19177af..87686f7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![WebExpress](https://raw.githubusercontent.com/ReneSchwarzer/WebExpress.Doc/main/assets/banner.png) +![WebExpress](https://raw.githubusercontent.com/ReneSchwarzer/WebExpress/main/assets/banner.png) # WebExpress WebExpress is a lightweight web server optimized for use in low-performance environments (e.g. Rasperry PI). By providing @@ -12,17 +12,23 @@ language (e.g. C#). Some advantages of WebExpress are: The WebExpress family includes the following projects: -- [WebExpress (core)](https://github.com/ReneSchwarzer/WebExpress#readme) - This project. The core for WebExpress applications. +- [WebExpress](https://github.com/ReneSchwarzer/WebExpress#readme) - The web server for WebExpress applications and the documentation. +- [WebExpress.WebCore](https://github.com/ReneSchwarzer/WebExpress.WebCore#readme) - The core for WebExpress applications. - [WebExpress.WebUI](https://github.com/ReneSchwarzer/WebExpress.WebUI#readme) - Common templates and controls for WebExpress applications. - [WebExpress.WebIndex](https://github.com/ReneSchwarzer/WebExpress.WebIndex#readme) - Reverse index for WebExpress applications. - [WebExpress.WebApp](https://github.com/ReneSchwarzer/WebExpress.WebApp#readme) - Business application template for WebExpress applications. -- [WebExpress.Server](https://github.com/ReneSchwarzer/WebExpress.Server#readme) - The web server for WebExpress applications. + +# WebExpress.Core +WebCore is part of the Webexpres family and includes the basic elements of a WebExpress application. + +# Download +The current binaries are available for download [here](https://github.com/ReneSchwarzer/WebExpress/releases). # Start To get started with WebExpress, use the following links and tutorials. -- [installation guide](https://github.com/ReneSchwarzer/WebExpress.Doc/blob/main/doc/installation_guide.md) -- [development guide](https://github.com/ReneSchwarzer/WebExpress.Doc/blob/main/doc/development_guide.md) +- [installation guide](https://github.com/ReneSchwarzer/WebExpress/blob/main/doc/installation_guide.md) +- [development guide](https://github.com/ReneSchwarzer/WebExpress/blob/main/doc/development_guide.md) ## Tutorials - [HelloWorld](https://github.com/ReneSchwarzer/WebExpress.Tutorial.HelloWorld#readme) diff --git a/src/WebExpress.Test/GlobalUsings.cs b/src/WebExpress.Core.Test/GlobalUsings.cs similarity index 100% rename from src/WebExpress.Test/GlobalUsings.cs rename to src/WebExpress.Core.Test/GlobalUsings.cs diff --git a/src/WebExpress.Test/Message/UnitTestGetRequest.cs b/src/WebExpress.Core.Test/Message/UnitTestGetRequest.cs similarity index 98% rename from src/WebExpress.Test/Message/UnitTestGetRequest.cs rename to src/WebExpress.Core.Test/Message/UnitTestGetRequest.cs index e688332..771b642 100644 --- a/src/WebExpress.Test/Message/UnitTestGetRequest.cs +++ b/src/WebExpress.Core.Test/Message/UnitTestGetRequest.cs @@ -2,7 +2,7 @@ using System.Net.Http; using Xunit; -namespace WebExpress.Test.Message +namespace WebExpress.Core.Test.Message { public class UnitTestGetRequest { diff --git a/src/WebExpress.Test/Message/UnitTestPostRequest.cs b/src/WebExpress.Core.Test/Message/UnitTestPostRequest.cs similarity index 99% rename from src/WebExpress.Test/Message/UnitTestPostRequest.cs rename to src/WebExpress.Core.Test/Message/UnitTestPostRequest.cs index f61b203..2c23f72 100644 --- a/src/WebExpress.Test/Message/UnitTestPostRequest.cs +++ b/src/WebExpress.Core.Test/Message/UnitTestPostRequest.cs @@ -1,4 +1,4 @@ -namespace WebExpress.Test.Message +namespace WebExpress.Core.Test.Message { public class UnitTestPostRequest : UnitTestRequest { diff --git a/src/WebExpress.Test/Message/UnitTestRequest.cs b/src/WebExpress.Core.Test/Message/UnitTestRequest.cs similarity index 97% rename from src/WebExpress.Test/Message/UnitTestRequest.cs rename to src/WebExpress.Core.Test/Message/UnitTestRequest.cs index b073b04..2d057d5 100644 --- a/src/WebExpress.Test/Message/UnitTestRequest.cs +++ b/src/WebExpress.Core.Test/Message/UnitTestRequest.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Session; using System.IO; using System.Net; -using WebExpress.WebMessage; +using WebExpress.Core.WebMessage; -namespace WebExpress.Test.Message +namespace WebExpress.Core.Test.Message { public class UnitTestRequest { diff --git a/src/WebExpress.Test/Request/Request.cs b/src/WebExpress.Core.Test/Request/Request.cs similarity index 83% rename from src/WebExpress.Test/Request/Request.cs rename to src/WebExpress.Core.Test/Request/Request.cs index 8e7f3c5..7695e8f 100644 --- a/src/WebExpress.Test/Request/Request.cs +++ b/src/WebExpress.Core.Test/Request/Request.cs @@ -1,6 +1,6 @@ using Xunit; -namespace WebExpress.Test.Request +namespace WebExpress.Core.Test.Request { public class Request diff --git a/src/WebExpress.Test/Schedule/UnitTestClock.cs b/src/WebExpress.Core.Test/Schedule/UnitTestClock.cs similarity index 97% rename from src/WebExpress.Test/Schedule/UnitTestClock.cs rename to src/WebExpress.Core.Test/Schedule/UnitTestClock.cs index 3729f22..8a05dde 100644 --- a/src/WebExpress.Test/Schedule/UnitTestClock.cs +++ b/src/WebExpress.Core.Test/Schedule/UnitTestClock.cs @@ -1,9 +1,6 @@ -using System; -using System.Linq; -using WebExpress.WebJob; -using Xunit; +using WebExpress.Core.WebJob; -namespace WebExpress.Test.Schedule +namespace WebExpress.Core.Test.Schedule { /// /// Tests the scheduler's clock. @@ -215,7 +212,6 @@ public void Carry_1() var clock2 = new Clock(new DateTime(2021, 1, 1, 0, 0, 0)); clock1.Tick(); - Assert.True ( clock1 == clock2 @@ -229,7 +225,6 @@ public void Carry_2() var clock2 = new Clock(new DateTime(2021, 3, 1, 0, 0, 0)); clock1.Tick(); - Assert.True ( clock1 == clock2 diff --git a/src/WebExpress.Test/Schedule/UnitTestCron.cs b/src/WebExpress.Core.Test/Schedule/UnitTestCron.cs similarity index 98% rename from src/WebExpress.Test/Schedule/UnitTestCron.cs rename to src/WebExpress.Core.Test/Schedule/UnitTestCron.cs index 7bacdfa..8c0557c 100644 --- a/src/WebExpress.Test/Schedule/UnitTestCron.cs +++ b/src/WebExpress.Core.Test/Schedule/UnitTestCron.cs @@ -1,10 +1,10 @@ using System; using System.Globalization; -using WebExpress.WebComponent; -using WebExpress.WebJob; +using WebExpress.Core.WebComponent; +using WebExpress.Core.WebJob; using Xunit; -namespace WebExpress.Test.Schedule +namespace WebExpress.Core.Test.Schedule { /// /// Test the cron job of the scheduler. diff --git a/src/WebExpress.Test/Uri/UnitTestUriAbsolute.cs b/src/WebExpress.Core.Test/Uri/UnitTestUriAbsolute.cs similarity index 98% rename from src/WebExpress.Test/Uri/UnitTestUriAbsolute.cs rename to src/WebExpress.Core.Test/Uri/UnitTestUriAbsolute.cs index e3aa560..09fd329 100644 --- a/src/WebExpress.Test/Uri/UnitTestUriAbsolute.cs +++ b/src/WebExpress.Core.Test/Uri/UnitTestUriAbsolute.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; using Xunit; -namespace WebExpress.Test.Uri +namespace WebExpress.Core.Test.Uri { /// /// Tests an absolute Uri. diff --git a/src/WebExpress.Test/Uri/UnitTestUriRelative.cs b/src/WebExpress.Core.Test/Uri/UnitTestUriRelative.cs similarity index 97% rename from src/WebExpress.Test/Uri/UnitTestUriRelative.cs rename to src/WebExpress.Core.Test/Uri/UnitTestUriRelative.cs index 9034d6e..0ffd7ab 100644 --- a/src/WebExpress.Test/Uri/UnitTestUriRelative.cs +++ b/src/WebExpress.Core.Test/Uri/UnitTestUriRelative.cs @@ -1,8 +1,8 @@ using System.Linq; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; using Xunit; -namespace WebExpress.Test.Uri +namespace WebExpress.Core.Test.Uri { /// /// Tests an relative Uri. diff --git a/src/WebExpress.Test/Uri/UnitTestUriRelativeAppend.cs b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeAppend.cs similarity index 93% rename from src/WebExpress.Test/Uri/UnitTestUriRelativeAppend.cs rename to src/WebExpress.Core.Test/Uri/UnitTestUriRelativeAppend.cs index 66c559c..0ce9836 100644 --- a/src/WebExpress.Test/Uri/UnitTestUriRelativeAppend.cs +++ b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeAppend.cs @@ -1,7 +1,7 @@ -using WebExpress.WebUri; +using WebExpress.Core.WebUri; using Xunit; -namespace WebExpress.Test.Uri +namespace WebExpress.Core.Test.Uri { /// /// Tests the append method. diff --git a/src/WebExpress.Test/Uri/UnitTestUriRelativeExtendedPath.cs b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeExtendedPath.cs similarity index 96% rename from src/WebExpress.Test/Uri/UnitTestUriRelativeExtendedPath.cs rename to src/WebExpress.Core.Test/Uri/UnitTestUriRelativeExtendedPath.cs index 5e2453f..d823b06 100644 --- a/src/WebExpress.Test/Uri/UnitTestUriRelativeExtendedPath.cs +++ b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeExtendedPath.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; using Xunit; -namespace WebExpress.Test.Uri +namespace WebExpress.Core.Test.Uri { /// /// Tests the extended path property. diff --git a/src/WebExpress.Test/Uri/UnitTestUriRelativeSkip.cs b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeSkip.cs similarity index 95% rename from src/WebExpress.Test/Uri/UnitTestUriRelativeSkip.cs rename to src/WebExpress.Core.Test/Uri/UnitTestUriRelativeSkip.cs index 89c1b2c..6972fc5 100644 --- a/src/WebExpress.Test/Uri/UnitTestUriRelativeSkip.cs +++ b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeSkip.cs @@ -1,7 +1,7 @@ -using WebExpress.WebUri; +using WebExpress.Core.WebUri; using Xunit; -namespace WebExpress.Test.Uri +namespace WebExpress.Core.Test.Uri { /// /// Tests the skip method. diff --git a/src/WebExpress.Test/Uri/UnitTestUriRelativeTake.cs b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeTake.cs similarity index 97% rename from src/WebExpress.Test/Uri/UnitTestUriRelativeTake.cs rename to src/WebExpress.Core.Test/Uri/UnitTestUriRelativeTake.cs index c63af8b..eac5a5b 100644 --- a/src/WebExpress.Test/Uri/UnitTestUriRelativeTake.cs +++ b/src/WebExpress.Core.Test/Uri/UnitTestUriRelativeTake.cs @@ -1,7 +1,7 @@ -using WebExpress.WebUri; +using WebExpress.Core.WebUri; using Xunit; -namespace WebExpress.Test.Uri +namespace WebExpress.Core.Test.Uri { /// /// Tests the take method. diff --git a/src/WebExpress.Test/WebExpress.Test.csproj b/src/WebExpress.Core.Test/WebExpress.Core.Test.csproj similarity index 90% rename from src/WebExpress.Test/WebExpress.Test.csproj rename to src/WebExpress.Core.Test/WebExpress.Core.Test.csproj index a4bc854..4234b1e 100644 --- a/src/WebExpress.Test/WebExpress.Test.csproj +++ b/src/WebExpress.Core.Test/WebExpress.Core.Test.csproj @@ -23,7 +23,8 @@ - + + diff --git a/src/WebExpress.Test/test/contentTypeMultipartFormData1.post b/src/WebExpress.Core.Test/test/contentTypeMultipartFormData1.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeMultipartFormData1.post rename to src/WebExpress.Core.Test/test/contentTypeMultipartFormData1.post diff --git a/src/WebExpress.Test/test/contentTypeMultipartFormData2.post b/src/WebExpress.Core.Test/test/contentTypeMultipartFormData2.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeMultipartFormData2.post rename to src/WebExpress.Core.Test/test/contentTypeMultipartFormData2.post diff --git a/src/WebExpress.Test/test/contentTypeMultipartFormData3.post b/src/WebExpress.Core.Test/test/contentTypeMultipartFormData3.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeMultipartFormData3.post rename to src/WebExpress.Core.Test/test/contentTypeMultipartFormData3.post diff --git a/src/WebExpress.Test/test/contentTypeMultipartFormData4.post b/src/WebExpress.Core.Test/test/contentTypeMultipartFormData4.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeMultipartFormData4.post rename to src/WebExpress.Core.Test/test/contentTypeMultipartFormData4.post diff --git a/src/WebExpress.Test/test/contentTypeMultipartFormData_Umlaut.post b/src/WebExpress.Core.Test/test/contentTypeMultipartFormData_Umlaut.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeMultipartFormData_Umlaut.post rename to src/WebExpress.Core.Test/test/contentTypeMultipartFormData_Umlaut.post diff --git a/src/WebExpress.Test/test/contentTypeTextPlain.post b/src/WebExpress.Core.Test/test/contentTypeTextPlain.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeTextPlain.post rename to src/WebExpress.Core.Test/test/contentTypeTextPlain.post diff --git a/src/WebExpress.Test/test/contentTypeTextPlain_Umlaut.post b/src/WebExpress.Core.Test/test/contentTypeTextPlain_Umlaut.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeTextPlain_Umlaut.post rename to src/WebExpress.Core.Test/test/contentTypeTextPlain_Umlaut.post diff --git a/src/WebExpress.Test/test/contentTypeXwwwFormUrlencoded.post b/src/WebExpress.Core.Test/test/contentTypeXwwwFormUrlencoded.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeXwwwFormUrlencoded.post rename to src/WebExpress.Core.Test/test/contentTypeXwwwFormUrlencoded.post diff --git a/src/WebExpress.Test/test/contentTypeXwwwFormUrlencoded_umlaut.post b/src/WebExpress.Core.Test/test/contentTypeXwwwFormUrlencoded_umlaut.post similarity index 100% rename from src/WebExpress.Test/test/contentTypeXwwwFormUrlencoded_umlaut.post rename to src/WebExpress.Core.Test/test/contentTypeXwwwFormUrlencoded_umlaut.post diff --git a/src/WebExpress.Test/test/general.get b/src/WebExpress.Core.Test/test/general.get similarity index 100% rename from src/WebExpress.Test/test/general.get rename to src/WebExpress.Core.Test/test/general.get diff --git a/src/WebExpress.Test/test/less.get b/src/WebExpress.Core.Test/test/less.get similarity index 100% rename from src/WebExpress.Test/test/less.get rename to src/WebExpress.Core.Test/test/less.get diff --git a/src/WebExpress.Test/test/massive.get b/src/WebExpress.Core.Test/test/massive.get similarity index 100% rename from src/WebExpress.Test/test/massive.get rename to src/WebExpress.Core.Test/test/massive.get diff --git a/src/WebExpress.Test/test/param.get b/src/WebExpress.Core.Test/test/param.get similarity index 100% rename from src/WebExpress.Test/test/param.get rename to src/WebExpress.Core.Test/test/param.get diff --git a/src/WebExpress.Test/test/param_umlaut.get b/src/WebExpress.Core.Test/test/param_umlaut.get similarity index 100% rename from src/WebExpress.Test/test/param_umlaut.get rename to src/WebExpress.Core.Test/test/param_umlaut.get diff --git a/src/WebExpress.sln b/src/WebExpress.Core.sln similarity index 84% rename from src/WebExpress.sln rename to src/WebExpress.Core.sln index f6601b8..c1f91cb 100644 --- a/src/WebExpress.sln +++ b/src/WebExpress.Core.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34221.43 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebExpress", "WebExpress\WebExpress.csproj", "{FA4AD06F-77C5-410E-B03C-3FABF00E692D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebExpress.Core", "WebExpress.Core\WebExpress.Core.csproj", "{FA4AD06F-77C5-410E-B03C-3FABF00E692D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebExpress.Test", "WebExpress.Test\WebExpress.Test.csproj", "{135F043D-1881-4C4A-8120-5FE11498E1A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebExpress.Core.Test", "WebExpress.Core.Test\WebExpress.Core.Test.csproj", "{135F043D-1881-4C4A-8120-5FE11498E1A4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/WebExpress/ArguemtParserResult.cs b/src/WebExpress.Core/ArguemtParserResult.cs similarity index 88% rename from src/WebExpress/ArguemtParserResult.cs rename to src/WebExpress.Core/ArguemtParserResult.cs index ad49af4..bf42351 100644 --- a/src/WebExpress/ArguemtParserResult.cs +++ b/src/WebExpress.Core/ArguemtParserResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace WebExpress +namespace WebExpress.Core { /// /// List with the prepared program arguments. diff --git a/src/WebExpress/ArgumentParser.cs b/src/WebExpress.Core/ArgumentParser.cs similarity index 99% rename from src/WebExpress/ArgumentParser.cs rename to src/WebExpress.Core/ArgumentParser.cs index 411482b..0b25b30 100644 --- a/src/WebExpress/ArgumentParser.cs +++ b/src/WebExpress.Core/ArgumentParser.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace WebExpress +namespace WebExpress.Core { /// /// Parse the handoff arguments. diff --git a/src/WebExpress/ArgumentParserCommand.cs b/src/WebExpress.Core/ArgumentParserCommand.cs similarity index 93% rename from src/WebExpress/ArgumentParserCommand.cs rename to src/WebExpress.Core/ArgumentParserCommand.cs index 59d70f3..183cfd0 100644 --- a/src/WebExpress/ArgumentParserCommand.cs +++ b/src/WebExpress.Core/ArgumentParserCommand.cs @@ -1,4 +1,4 @@ -namespace WebExpress +namespace WebExpress.Core { /// /// A command which is controlled by the program arguments. diff --git a/src/WebExpress/Config/EndpointConfig.cs b/src/WebExpress.Core/Config/EndpointConfig.cs similarity index 96% rename from src/WebExpress/Config/EndpointConfig.cs rename to src/WebExpress.Core/Config/EndpointConfig.cs index 435986a..da19630 100644 --- a/src/WebExpress/Config/EndpointConfig.cs +++ b/src/WebExpress.Core/Config/EndpointConfig.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace WebExpress.Config +namespace WebExpress.Core.Config { /// /// Class for reading certificate properties. diff --git a/src/WebExpress/Config/HttpServerConfig.cs b/src/WebExpress.Core/Config/HttpServerConfig.cs similarity index 96% rename from src/WebExpress/Config/HttpServerConfig.cs rename to src/WebExpress.Core/Config/HttpServerConfig.cs index 4e520d3..03becd5 100644 --- a/src/WebExpress/Config/HttpServerConfig.cs +++ b/src/WebExpress.Core/Config/HttpServerConfig.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Xml.Serialization; -using WebExpress.Setting; +using WebExpress.Core.Setting; -namespace WebExpress.Config +namespace WebExpress.Core.Config { /// /// Class for reading the configuration file. diff --git a/src/WebExpress/Config/LimitConfig.cs b/src/WebExpress.Core/Config/LimitConfig.cs similarity index 95% rename from src/WebExpress/Config/LimitConfig.cs rename to src/WebExpress.Core/Config/LimitConfig.cs index cfccadc..95d87c1 100644 --- a/src/WebExpress/Config/LimitConfig.cs +++ b/src/WebExpress.Core/Config/LimitConfig.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace WebExpress.Config +namespace WebExpress.Core.Config { /// /// Class for reading the limitations. diff --git a/src/WebExpress/Config/PluginConfig.cs b/src/WebExpress.Core/Config/PluginConfig.cs similarity index 95% rename from src/WebExpress/Config/PluginConfig.cs rename to src/WebExpress.Core/Config/PluginConfig.cs index bad6c70..2dcc9b2 100644 --- a/src/WebExpress/Config/PluginConfig.cs +++ b/src/WebExpress.Core/Config/PluginConfig.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace WebExpress.Config +namespace WebExpress.Core.Config { /// /// Class for reading the configuration file. diff --git a/src/WebExpress/HttpServer.cs b/src/WebExpress.Core/HttpServer.cs similarity index 98% rename from src/WebExpress/HttpServer.cs rename to src/WebExpress.Core/HttpServer.cs index 9d0fbca..70e15ea 100644 --- a/src/WebExpress/HttpServer.cs +++ b/src/WebExpress.Core/HttpServer.cs @@ -15,19 +15,19 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using WebExpress.Config; -using WebExpress.Internationalization; -using WebExpress.WebApplication; -using WebExpress.WebComponent; -using WebExpress.WebHtml; -using WebExpress.WebMessage; -using WebExpress.WebModule; -using WebExpress.WebPage; -using WebExpress.WebResource; -using WebExpress.WebSitemap; -using WebExpress.WebUri; - -namespace WebExpress +using WebExpress.Core.Config; +using WebExpress.Core.Internationalization; +using WebExpress.Core.WebApplication; +using WebExpress.Core.WebComponent; +using WebExpress.Core.WebHtml; +using WebExpress.Core.WebMessage; +using WebExpress.Core.WebModule; +using WebExpress.Core.WebPage; +using WebExpress.Core.WebResource; +using WebExpress.Core.WebSitemap; +using WebExpress.Core.WebUri; + +namespace WebExpress.Core { /// /// The web server for processing http requests (see RFC 2616). The web server uses Kestrel internally. diff --git a/src/WebExpress/HttpServerContext.cs b/src/WebExpress.Core/HttpServerContext.cs similarity index 97% rename from src/WebExpress/HttpServerContext.cs rename to src/WebExpress.Core/HttpServerContext.cs index eb4f588..c0c558e 100644 --- a/src/WebExpress/HttpServerContext.cs +++ b/src/WebExpress.Core/HttpServerContext.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Globalization; using System.Reflection; -using WebExpress.Config; -using WebExpress.WebUri; +using WebExpress.Core.Config; +using WebExpress.Core.WebUri; -namespace WebExpress +namespace WebExpress.Core { /// /// The context of the http server. diff --git a/src/WebExpress/IHost.cs b/src/WebExpress.Core/IHost.cs similarity index 94% rename from src/WebExpress/IHost.cs rename to src/WebExpress.Core/IHost.cs index 72e4eed..ef15dff 100644 --- a/src/WebExpress/IHost.cs +++ b/src/WebExpress.Core/IHost.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress +namespace WebExpress.Core { /// /// The host interface. diff --git a/src/WebExpress/IHttpServerContext.cs b/src/WebExpress.Core/IHttpServerContext.cs similarity index 95% rename from src/WebExpress/IHttpServerContext.cs rename to src/WebExpress.Core/IHttpServerContext.cs index 7728ad1..933ef57 100644 --- a/src/WebExpress/IHttpServerContext.cs +++ b/src/WebExpress.Core/IHttpServerContext.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Globalization; -using WebExpress.Config; -using WebExpress.WebUri; +using WebExpress.Core.Config; +using WebExpress.Core.WebUri; -namespace WebExpress +namespace WebExpress.Core { /// /// The context interface of the http server. diff --git a/src/WebExpress/Internationalization/II18N.cs b/src/WebExpress.Core/Internationalization/II18N.cs similarity index 81% rename from src/WebExpress/Internationalization/II18N.cs rename to src/WebExpress.Core/Internationalization/II18N.cs index 978d6bb..abafa2f 100644 --- a/src/WebExpress/Internationalization/II18N.cs +++ b/src/WebExpress.Core/Internationalization/II18N.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace WebExpress.Internationalization +namespace WebExpress.Core.Internationalization { public interface II18N { diff --git a/src/WebExpress/Internationalization/InternationalizationDictionary.cs b/src/WebExpress.Core/Internationalization/InternationalizationDictionary.cs similarity index 85% rename from src/WebExpress/Internationalization/InternationalizationDictionary.cs rename to src/WebExpress.Core/Internationalization/InternationalizationDictionary.cs index 0a8f5d8..362191e 100644 --- a/src/WebExpress/Internationalization/InternationalizationDictionary.cs +++ b/src/WebExpress.Core/Internationalization/InternationalizationDictionary.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace WebExpress.Internationalization +namespace WebExpress.Core.Internationalization { /// /// key = language (ISO 639-1 two-letter) diff --git a/src/WebExpress/Internationalization/InternationalizationExtensions.cs b/src/WebExpress.Core/Internationalization/InternationalizationExtensions.cs similarity index 95% rename from src/WebExpress/Internationalization/InternationalizationExtensions.cs rename to src/WebExpress.Core/Internationalization/InternationalizationExtensions.cs index 5c0473d..4965709 100644 --- a/src/WebExpress/Internationalization/InternationalizationExtensions.cs +++ b/src/WebExpress.Core/Internationalization/InternationalizationExtensions.cs @@ -1,6 +1,6 @@ -using WebExpress.WebApplication; +using WebExpress.Core.WebApplication; -namespace WebExpress.Internationalization +namespace WebExpress.Core.Internationalization { public static class InternationalizationExtensions { diff --git a/src/WebExpress/Internationalization/InternationalizationItem.cs b/src/WebExpress.Core/Internationalization/InternationalizationItem.cs similarity index 72% rename from src/WebExpress/Internationalization/InternationalizationItem.cs rename to src/WebExpress.Core/Internationalization/InternationalizationItem.cs index 75687c1..3c54b16 100644 --- a/src/WebExpress/Internationalization/InternationalizationItem.cs +++ b/src/WebExpress.Core/Internationalization/InternationalizationItem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace WebExpress.Internationalization +namespace WebExpress.Core.Internationalization { internal class InternationalizationItem : Dictionary { diff --git a/src/WebExpress/Internationalization/InternationalizationManager.cs b/src/WebExpress.Core/Internationalization/InternationalizationManager.cs similarity index 98% rename from src/WebExpress/Internationalization/InternationalizationManager.cs rename to src/WebExpress.Core/Internationalization/InternationalizationManager.cs index 49250a1..e64e639 100644 --- a/src/WebExpress/Internationalization/InternationalizationManager.cs +++ b/src/WebExpress.Core/Internationalization/InternationalizationManager.cs @@ -3,11 +3,11 @@ using System.IO; using System.Linq; using System.Reflection; -using WebExpress.WebMessage; -using WebExpress.WebComponent; -using WebExpress.WebPlugin; +using WebExpress.Core.WebMessage; +using WebExpress.Core.WebComponent; +using WebExpress.Core.WebPlugin; -namespace WebExpress.Internationalization +namespace WebExpress.Core.Internationalization { /// /// Internationalization diff --git a/src/WebExpress/Internationalization/de b/src/WebExpress.Core/Internationalization/de similarity index 100% rename from src/WebExpress/Internationalization/de rename to src/WebExpress.Core/Internationalization/de diff --git a/src/WebExpress/Internationalization/en b/src/WebExpress.Core/Internationalization/en similarity index 100% rename from src/WebExpress/Internationalization/en rename to src/WebExpress.Core/Internationalization/en diff --git a/src/WebExpress/Log.cs b/src/WebExpress.Core/Log.cs similarity index 99% rename from src/WebExpress/Log.cs rename to src/WebExpress.Core/Log.cs index 87cb420..16e5590 100644 --- a/src/WebExpress/Log.cs +++ b/src/WebExpress.Core/Log.cs @@ -6,9 +6,9 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading; -using WebExpress.Setting; +using WebExpress.Core.Setting; -namespace WebExpress +namespace WebExpress.Core { /// /// Class for logging events to your log file diff --git a/src/WebExpress/LogFactory.cs b/src/WebExpress.Core/LogFactory.cs similarity index 97% rename from src/WebExpress/LogFactory.cs rename to src/WebExpress.Core/LogFactory.cs index 84711e2..de2f9d4 100644 --- a/src/WebExpress/LogFactory.cs +++ b/src/WebExpress.Core/LogFactory.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; -namespace WebExpress +namespace WebExpress.Core { public class LogFactory : ILoggerFactory, ILoggerProvider { diff --git a/src/WebExpress/LogFrame.cs b/src/WebExpress.Core/LogFrame.cs similarity index 99% rename from src/WebExpress/LogFrame.cs rename to src/WebExpress.Core/LogFrame.cs index c50fbd6..c96e957 100644 --- a/src/WebExpress/LogFrame.cs +++ b/src/WebExpress.Core/LogFrame.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.CompilerServices; -namespace WebExpress +namespace WebExpress.Core { /// /// Creates a frame of log entries. diff --git a/src/WebExpress/LogFrameSimple.cs b/src/WebExpress.Core/LogFrameSimple.cs similarity index 98% rename from src/WebExpress/LogFrameSimple.cs rename to src/WebExpress.Core/LogFrameSimple.cs index 7cb8a19..8f436ca 100644 --- a/src/WebExpress/LogFrameSimple.cs +++ b/src/WebExpress.Core/LogFrameSimple.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.CompilerServices; -namespace WebExpress +namespace WebExpress.Core { /// /// Creates a frame of log entries. diff --git a/src/WebExpress/LogItem.cs b/src/WebExpress.Core/LogItem.cs similarity index 97% rename from src/WebExpress/LogItem.cs rename to src/WebExpress.Core/LogItem.cs index 44e681a..6f9381f 100644 --- a/src/WebExpress/LogItem.cs +++ b/src/WebExpress.Core/LogItem.cs @@ -1,7 +1,7 @@ using System; -using static WebExpress.Log; +using static WebExpress.Core.Log; -namespace WebExpress +namespace WebExpress.Core { /// /// Log entry diff --git a/src/WebExpress/Properties/launchSettings.json b/src/WebExpress.Core/Properties/launchSettings.json similarity index 100% rename from src/WebExpress/Properties/launchSettings.json rename to src/WebExpress.Core/Properties/launchSettings.json diff --git a/src/WebExpress/Rocket.ico b/src/WebExpress.Core/Rocket.ico similarity index 100% rename from src/WebExpress/Rocket.ico rename to src/WebExpress.Core/Rocket.ico diff --git a/src/WebExpress/Setting/ISettingItem.cs b/src/WebExpress.Core/Setting/ISettingItem.cs similarity index 57% rename from src/WebExpress/Setting/ISettingItem.cs rename to src/WebExpress.Core/Setting/ISettingItem.cs index 4ef1571..195377d 100644 --- a/src/WebExpress/Setting/ISettingItem.cs +++ b/src/WebExpress.Core/Setting/ISettingItem.cs @@ -1,4 +1,4 @@ -namespace WebExpress.Setting +namespace WebExpress.Core.Setting { public interface ISettingItem { diff --git a/src/WebExpress/Setting/SettingLogItem.cs b/src/WebExpress.Core/Setting/SettingLogItem.cs similarity index 97% rename from src/WebExpress/Setting/SettingLogItem.cs rename to src/WebExpress.Core/Setting/SettingLogItem.cs index 993bcb0..077158e 100644 --- a/src/WebExpress/Setting/SettingLogItem.cs +++ b/src/WebExpress.Core/Setting/SettingLogItem.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace WebExpress.Setting +namespace WebExpress.Core.Setting { /// /// Class for managing log settings. diff --git a/src/WebExpress/WebApplication/ApplicationContext.cs b/src/WebExpress.Core/WebApplication/ApplicationContext.cs similarity index 95% rename from src/WebExpress/WebApplication/ApplicationContext.cs rename to src/WebExpress.Core/WebApplication/ApplicationContext.cs index c48fac4..8716c79 100644 --- a/src/WebExpress/WebApplication/ApplicationContext.cs +++ b/src/WebExpress.Core/WebApplication/ApplicationContext.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using WebExpress.WebPlugin; -using WebExpress.WebUri; +using WebExpress.Core.WebPlugin; +using WebExpress.Core.WebUri; -namespace WebExpress.WebApplication +namespace WebExpress.Core.WebApplication { public class ApplicationContext : IApplicationContext { diff --git a/src/WebExpress/WebApplication/ApplicationDictionary.cs b/src/WebExpress.Core/WebApplication/ApplicationDictionary.cs similarity index 79% rename from src/WebExpress/WebApplication/ApplicationDictionary.cs rename to src/WebExpress.Core/WebApplication/ApplicationDictionary.cs index 4f72375..1bb0670 100644 --- a/src/WebExpress/WebApplication/ApplicationDictionary.cs +++ b/src/WebExpress.Core/WebApplication/ApplicationDictionary.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using WebExpress.WebPlugin; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebApplication +namespace WebExpress.Core.WebApplication { /// /// Key = Plugin context diff --git a/src/WebExpress/WebApplication/ApplicationItem.cs b/src/WebExpress.Core/WebApplication/ApplicationItem.cs similarity index 94% rename from src/WebExpress/WebApplication/ApplicationItem.cs rename to src/WebExpress.Core/WebApplication/ApplicationItem.cs index e3a77c6..536ccc1 100644 --- a/src/WebExpress/WebApplication/ApplicationItem.cs +++ b/src/WebExpress.Core/WebApplication/ApplicationItem.cs @@ -1,6 +1,6 @@ using System.Threading; -namespace WebExpress.WebApplication +namespace WebExpress.Core.WebApplication { /// /// Represents an application entry in the application directory. diff --git a/src/WebExpress/WebApplication/ApplicationManager.cs b/src/WebExpress.Core/WebApplication/ApplicationManager.cs similarity index 98% rename from src/WebExpress/WebApplication/ApplicationManager.cs rename to src/WebExpress.Core/WebApplication/ApplicationManager.cs index d0f7fa6..664df0b 100644 --- a/src/WebExpress/WebApplication/ApplicationManager.cs +++ b/src/WebExpress.Core/WebApplication/ApplicationManager.cs @@ -4,13 +4,13 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using WebExpress.Internationalization; -using WebExpress.WebAttribute; -using WebExpress.WebComponent; -using WebExpress.WebPlugin; -using WebExpress.WebUri; +using WebExpress.Core.Internationalization; +using WebExpress.Core.WebAttribute; +using WebExpress.Core.WebComponent; +using WebExpress.Core.WebPlugin; +using WebExpress.Core.WebUri; -namespace WebExpress.WebApplication +namespace WebExpress.Core.WebApplication { /// /// Management of WebExpress applications. diff --git a/src/WebExpress/WebApplication/IApplication.cs b/src/WebExpress.Core/WebApplication/IApplication.cs similarity index 92% rename from src/WebExpress/WebApplication/IApplication.cs rename to src/WebExpress.Core/WebApplication/IApplication.cs index ebb59e0..8026ef0 100644 --- a/src/WebExpress/WebApplication/IApplication.cs +++ b/src/WebExpress.Core/WebApplication/IApplication.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebApplication +namespace WebExpress.Core.WebApplication { /// /// This interface represents an application. diff --git a/src/WebExpress/WebApplication/IApplicationContext.cs b/src/WebExpress.Core/WebApplication/IApplicationContext.cs similarity index 93% rename from src/WebExpress/WebApplication/IApplicationContext.cs rename to src/WebExpress.Core/WebApplication/IApplicationContext.cs index 55710e9..c78b698 100644 --- a/src/WebExpress/WebApplication/IApplicationContext.cs +++ b/src/WebExpress.Core/WebApplication/IApplicationContext.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using WebExpress.WebPlugin; -using WebExpress.WebUri; +using WebExpress.Core.WebPlugin; +using WebExpress.Core.WebUri; -namespace WebExpress.WebApplication +namespace WebExpress.Core.WebApplication { /// /// The application context. diff --git a/src/WebExpress/WebAttribute/ApplicationAttribute.cs b/src/WebExpress.Core/WebAttribute/ApplicationAttribute.cs similarity index 92% rename from src/WebExpress/WebAttribute/ApplicationAttribute.cs rename to src/WebExpress.Core/WebAttribute/ApplicationAttribute.cs index 814e0c0..a590ec2 100644 --- a/src/WebExpress/WebAttribute/ApplicationAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ApplicationAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebApplication; +using WebExpress.Core.WebApplication; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Application assignment attribute of the application ID. diff --git a/src/WebExpress/WebAttribute/AssetPathAttribute.cs b/src/WebExpress.Core/WebAttribute/AssetPathAttribute.cs similarity index 88% rename from src/WebExpress/WebAttribute/AssetPathAttribute.cs rename to src/WebExpress.Core/WebAttribute/AssetPathAttribute.cs index f7942ed..8a13fe9 100644 --- a/src/WebExpress/WebAttribute/AssetPathAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/AssetPathAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class AssetPathAttribute : System.Attribute, IApplicationAttribute, IModuleAttribute { diff --git a/src/WebExpress/WebAttribute/CacheAttribute.cs b/src/WebExpress.Core/WebAttribute/CacheAttribute.cs similarity index 90% rename from src/WebExpress/WebAttribute/CacheAttribute.cs rename to src/WebExpress.Core/WebAttribute/CacheAttribute.cs index c9771b0..178ce23 100644 --- a/src/WebExpress/WebAttribute/CacheAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/CacheAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Indicates that a page or component can be reused diff --git a/src/WebExpress/WebAttribute/ConditionAttribute.cs b/src/WebExpress.Core/WebAttribute/ConditionAttribute.cs similarity index 85% rename from src/WebExpress/WebAttribute/ConditionAttribute.cs rename to src/WebExpress.Core/WebAttribute/ConditionAttribute.cs index a28e9a2..2e5d41a 100644 --- a/src/WebExpress/WebAttribute/ConditionAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ConditionAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebCondition; +using WebExpress.Core.WebCondition; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Activation of options (e.g. WebEx.WebApp.Setting.SystemInformation for displaying system information). diff --git a/src/WebExpress/WebAttribute/ContextPathAttribute.cs b/src/WebExpress.Core/WebAttribute/ContextPathAttribute.cs similarity index 91% rename from src/WebExpress/WebAttribute/ContextPathAttribute.cs rename to src/WebExpress.Core/WebAttribute/ContextPathAttribute.cs index c37be5c..1ee7f13 100644 --- a/src/WebExpress/WebAttribute/ContextPathAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ContextPathAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { [AttributeUsage(AttributeTargets.All, AllowMultiple = false)] public class ContextPathAttribute : Attribute, IApplicationAttribute, IModuleAttribute, IResourceAttribute diff --git a/src/WebExpress/WebAttribute/DataPathAttribute.cs b/src/WebExpress.Core/WebAttribute/DataPathAttribute.cs similarity index 88% rename from src/WebExpress/WebAttribute/DataPathAttribute.cs rename to src/WebExpress.Core/WebAttribute/DataPathAttribute.cs index 8fac4ab..d07eb92 100644 --- a/src/WebExpress/WebAttribute/DataPathAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/DataPathAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class DataPathAttribute : System.Attribute, IApplicationAttribute, IModuleAttribute { diff --git a/src/WebExpress/WebAttribute/DefaultAttribute.cs b/src/WebExpress.Core/WebAttribute/DefaultAttribute.cs similarity index 90% rename from src/WebExpress/WebAttribute/DefaultAttribute.cs rename to src/WebExpress.Core/WebAttribute/DefaultAttribute.cs index 5023d08..45c620b 100644 --- a/src/WebExpress/WebAttribute/DefaultAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/DefaultAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Indicates that a status page ist default diff --git a/src/WebExpress/WebAttribute/DependencyAttribute.cs b/src/WebExpress.Core/WebAttribute/DependencyAttribute.cs similarity index 92% rename from src/WebExpress/WebAttribute/DependencyAttribute.cs rename to src/WebExpress.Core/WebAttribute/DependencyAttribute.cs index 3a91320..fac7b2f 100644 --- a/src/WebExpress/WebAttribute/DependencyAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/DependencyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Marks a plugin as dependent on another plugin. diff --git a/src/WebExpress/WebAttribute/DescriptionAttribute.cs b/src/WebExpress.Core/WebAttribute/DescriptionAttribute.cs similarity index 89% rename from src/WebExpress/WebAttribute/DescriptionAttribute.cs rename to src/WebExpress.Core/WebAttribute/DescriptionAttribute.cs index 70694de..58ef381 100644 --- a/src/WebExpress/WebAttribute/DescriptionAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/DescriptionAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class DescriptionAttribute : System.Attribute, IPluginAttribute, IApplicationAttribute, IModuleAttribute { diff --git a/src/WebExpress/WebAttribute/IApplicationAttribute.cs b/src/WebExpress.Core/WebAttribute/IApplicationAttribute.cs similarity index 78% rename from src/WebExpress/WebAttribute/IApplicationAttribute.cs rename to src/WebExpress.Core/WebAttribute/IApplicationAttribute.cs index 69dc939..3dc253b 100644 --- a/src/WebExpress/WebAttribute/IApplicationAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IApplicationAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Interface of a application assignment attribute. diff --git a/src/WebExpress/WebAttribute/IModuleAttribute.cs b/src/WebExpress.Core/WebAttribute/IModuleAttribute.cs similarity index 77% rename from src/WebExpress/WebAttribute/IModuleAttribute.cs rename to src/WebExpress.Core/WebAttribute/IModuleAttribute.cs index 46d40e5..46f075f 100644 --- a/src/WebExpress/WebAttribute/IModuleAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IModuleAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Interface of a module assignment attribute. diff --git a/src/WebExpress/WebAttribute/IPluginAttribute.cs b/src/WebExpress.Core/WebAttribute/IPluginAttribute.cs similarity index 77% rename from src/WebExpress/WebAttribute/IPluginAttribute.cs rename to src/WebExpress.Core/WebAttribute/IPluginAttribute.cs index 773c8af..db10e33 100644 --- a/src/WebExpress/WebAttribute/IPluginAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IPluginAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Identifies a class as a plug-in component. diff --git a/src/WebExpress/WebAttribute/IResourceAttribute.cs b/src/WebExpress.Core/WebAttribute/IResourceAttribute.cs similarity index 77% rename from src/WebExpress/WebAttribute/IResourceAttribute.cs rename to src/WebExpress.Core/WebAttribute/IResourceAttribute.cs index 1c1ed0b..0fae21f 100644 --- a/src/WebExpress/WebAttribute/IResourceAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IResourceAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Interface of a resource assignment attribute. diff --git a/src/WebExpress/WebAttribute/ISegmentAttribute.cs b/src/WebExpress.Core/WebAttribute/ISegmentAttribute.cs similarity index 76% rename from src/WebExpress/WebAttribute/ISegmentAttribute.cs rename to src/WebExpress.Core/WebAttribute/ISegmentAttribute.cs index 7ed925d..6279263 100644 --- a/src/WebExpress/WebAttribute/ISegmentAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ISegmentAttribute.cs @@ -1,6 +1,6 @@ -using WebExpress.WebUri; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public interface ISegmentAttribute { diff --git a/src/WebExpress/WebAttribute/IStatusPageAttribute.cs b/src/WebExpress.Core/WebAttribute/IStatusPageAttribute.cs similarity index 78% rename from src/WebExpress/WebAttribute/IStatusPageAttribute.cs rename to src/WebExpress.Core/WebAttribute/IStatusPageAttribute.cs index c8e16f2..7229103 100644 --- a/src/WebExpress/WebAttribute/IStatusPageAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IStatusPageAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Identifies a class as a status page attribute. diff --git a/src/WebExpress/WebAttribute/IconAttribute.cs b/src/WebExpress.Core/WebAttribute/IconAttribute.cs similarity index 87% rename from src/WebExpress/WebAttribute/IconAttribute.cs rename to src/WebExpress.Core/WebAttribute/IconAttribute.cs index 157c1aa..ce046c3 100644 --- a/src/WebExpress/WebAttribute/IconAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IconAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class IconAttribute : System.Attribute, IPluginAttribute, IApplicationAttribute, IModuleAttribute { diff --git a/src/WebExpress/WebAttribute/IncludeSubPathsAttribute.cs b/src/WebExpress.Core/WebAttribute/IncludeSubPathsAttribute.cs similarity index 91% rename from src/WebExpress/WebAttribute/IncludeSubPathsAttribute.cs rename to src/WebExpress.Core/WebAttribute/IncludeSubPathsAttribute.cs index f72ddfa..ab2c4fc 100644 --- a/src/WebExpress/WebAttribute/IncludeSubPathsAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/IncludeSubPathsAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Determines whether all resources below the specified path (including segment) are also processed. diff --git a/src/WebExpress/WebAttribute/JobAttribute.cs b/src/WebExpress.Core/WebAttribute/JobAttribute.cs similarity index 95% rename from src/WebExpress/WebAttribute/JobAttribute.cs rename to src/WebExpress.Core/WebAttribute/JobAttribute.cs index b5dbe52..742f10a 100644 --- a/src/WebExpress/WebAttribute/JobAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/JobAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class JobAttribute : System.Attribute { diff --git a/src/WebExpress/WebAttribute/ModuleAttribute.cs b/src/WebExpress.Core/WebAttribute/ModuleAttribute.cs similarity index 86% rename from src/WebExpress/WebAttribute/ModuleAttribute.cs rename to src/WebExpress.Core/WebAttribute/ModuleAttribute.cs index 7822288..4cd07ee 100644 --- a/src/WebExpress/WebAttribute/ModuleAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ModuleAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebModule; +using WebExpress.Core.WebModule; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Specifying a module. diff --git a/src/WebExpress/WebAttribute/NameAttribute.cs b/src/WebExpress.Core/WebAttribute/NameAttribute.cs similarity index 73% rename from src/WebExpress/WebAttribute/NameAttribute.cs rename to src/WebExpress.Core/WebAttribute/NameAttribute.cs index b3c858d..05fef2a 100644 --- a/src/WebExpress/WebAttribute/NameAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/NameAttribute.cs @@ -1,11 +1,11 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class NameAttribute : System.Attribute, IPluginAttribute, IApplicationAttribute, IModuleAttribute { /// /// Constructor /// - /// Der Name + /// The name. public NameAttribute(string name) { diff --git a/src/WebExpress/WebAttribute/OptionAttribute.cs b/src/WebExpress.Core/WebAttribute/OptionAttribute.cs similarity index 92% rename from src/WebExpress/WebAttribute/OptionAttribute.cs rename to src/WebExpress.Core/WebAttribute/OptionAttribute.cs index 276a706..1f61f75 100644 --- a/src/WebExpress/WebAttribute/OptionAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/OptionAttribute.cs @@ -1,8 +1,8 @@ using System; -using WebExpress.WebModule; -using WebExpress.WebResource; +using WebExpress.Core.WebModule; +using WebExpress.Core.WebResource; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Activation of options (e.g. 'webexpress.webapp.settinglog' or 'webexpress.webapp.*'). diff --git a/src/WebExpress/WebAttribute/OptionalAttribute.cs b/src/WebExpress.Core/WebAttribute/OptionalAttribute.cs similarity index 91% rename from src/WebExpress/WebAttribute/OptionalAttribute.cs rename to src/WebExpress.Core/WebAttribute/OptionalAttribute.cs index ad320f0..e0e016b 100644 --- a/src/WebExpress/WebAttribute/OptionalAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/OptionalAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Marks a ressorce as optional. This becomes active when the option is specified in the application. diff --git a/src/WebExpress/WebAttribute/ParentAttribute.cs b/src/WebExpress.Core/WebAttribute/ParentAttribute.cs similarity index 81% rename from src/WebExpress/WebAttribute/ParentAttribute.cs rename to src/WebExpress.Core/WebAttribute/ParentAttribute.cs index 9f0a332..d85074e 100644 --- a/src/WebExpress/WebAttribute/ParentAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ParentAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebResource; +using WebExpress.Core.WebResource; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)] public class ParentAttribute : Attribute, IResourceAttribute where T : class, IResource diff --git a/src/WebExpress/WebAttribute/ScopeAttribute.cs b/src/WebExpress.Core/WebAttribute/ScopeAttribute.cs similarity index 84% rename from src/WebExpress/WebAttribute/ScopeAttribute.cs rename to src/WebExpress.Core/WebAttribute/ScopeAttribute.cs index d80a049..5f79345 100644 --- a/src/WebExpress/WebAttribute/ScopeAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/ScopeAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebScope; +using WebExpress.Core.WebScope; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// The range in which the component is valid. diff --git a/src/WebExpress/WebAttribute/SegmentAttribute.cs b/src/WebExpress.Core/WebAttribute/SegmentAttribute.cs similarity index 94% rename from src/WebExpress/WebAttribute/SegmentAttribute.cs rename to src/WebExpress.Core/WebAttribute/SegmentAttribute.cs index 3a70053..95c97db 100644 --- a/src/WebExpress/WebAttribute/SegmentAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SegmentAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// A static path segment. diff --git a/src/WebExpress/WebAttribute/SegmentDoubleAttribute.cs b/src/WebExpress.Core/WebAttribute/SegmentDoubleAttribute.cs similarity index 95% rename from src/WebExpress/WebAttribute/SegmentDoubleAttribute.cs rename to src/WebExpress.Core/WebAttribute/SegmentDoubleAttribute.cs index 349cc6d..b8a1c3b 100644 --- a/src/WebExpress/WebAttribute/SegmentDoubleAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SegmentDoubleAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class SegmentDoubleAttribute : Attribute, IResourceAttribute, ISegmentAttribute { diff --git a/src/WebExpress/WebAttribute/SegmentGuidAttribute.cs b/src/WebExpress.Core/WebAttribute/SegmentGuidAttribute.cs similarity index 94% rename from src/WebExpress/WebAttribute/SegmentGuidAttribute.cs rename to src/WebExpress.Core/WebAttribute/SegmentGuidAttribute.cs index adc9faf..d92e62a 100644 --- a/src/WebExpress/WebAttribute/SegmentGuidAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SegmentGuidAttribute.cs @@ -1,8 +1,8 @@ using System; -using WebExpress.WebMessage; -using WebExpress.WebUri; +using WebExpress.Core.WebMessage; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// A dynamic path segment of type guid. diff --git a/src/WebExpress/WebAttribute/SegmentIntAttribute.cs b/src/WebExpress.Core/WebAttribute/SegmentIntAttribute.cs similarity index 93% rename from src/WebExpress/WebAttribute/SegmentIntAttribute.cs rename to src/WebExpress.Core/WebAttribute/SegmentIntAttribute.cs index 52129d6..8fe3a9f 100644 --- a/src/WebExpress/WebAttribute/SegmentIntAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SegmentIntAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class SegmentIntAttribute : Attribute, IResourceAttribute, ISegmentAttribute { diff --git a/src/WebExpress/WebAttribute/SegmentStringAttribute.cs b/src/WebExpress.Core/WebAttribute/SegmentStringAttribute.cs similarity index 95% rename from src/WebExpress/WebAttribute/SegmentStringAttribute.cs rename to src/WebExpress.Core/WebAttribute/SegmentStringAttribute.cs index 0232e46..2abd394 100644 --- a/src/WebExpress/WebAttribute/SegmentStringAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SegmentStringAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class SegmentStringAttribute : Attribute, IResourceAttribute, ISegmentAttribute { diff --git a/src/WebExpress/WebAttribute/SegmentUIntAttribute.cs b/src/WebExpress.Core/WebAttribute/SegmentUIntAttribute.cs similarity index 95% rename from src/WebExpress/WebAttribute/SegmentUIntAttribute.cs rename to src/WebExpress.Core/WebAttribute/SegmentUIntAttribute.cs index d6c6dfc..b6479b2 100644 --- a/src/WebExpress/WebAttribute/SegmentUIntAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SegmentUIntAttribute.cs @@ -1,7 +1,7 @@ using System; -using WebExpress.WebUri; +using WebExpress.Core.WebUri; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class SegmentUIntAttribute : Attribute, IResourceAttribute, ISegmentAttribute { diff --git a/src/WebExpress/WebAttribute/StatusCodeAttribute.cs b/src/WebExpress.Core/WebAttribute/StatusCodeAttribute.cs similarity index 90% rename from src/WebExpress/WebAttribute/StatusCodeAttribute.cs rename to src/WebExpress.Core/WebAttribute/StatusCodeAttribute.cs index ec9c926..b9bc022 100644 --- a/src/WebExpress/WebAttribute/StatusCodeAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/StatusCodeAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)] public class StatusCodeAttribute : System.Attribute, IApplicationAttribute diff --git a/src/WebExpress/WebAttribute/SystemPluginAttribute.cs b/src/WebExpress.Core/WebAttribute/SystemPluginAttribute.cs similarity index 90% rename from src/WebExpress/WebAttribute/SystemPluginAttribute.cs rename to src/WebExpress.Core/WebAttribute/SystemPluginAttribute.cs index 7354721..0406c2b 100644 --- a/src/WebExpress/WebAttribute/SystemPluginAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/SystemPluginAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { /// /// Marks an assembly as systemically relevant. diff --git a/src/WebExpress/WebAttribute/TitleAttribute.cs b/src/WebExpress.Core/WebAttribute/TitleAttribute.cs similarity index 87% rename from src/WebExpress/WebAttribute/TitleAttribute.cs rename to src/WebExpress.Core/WebAttribute/TitleAttribute.cs index 830bb2f..d862ed2 100644 --- a/src/WebExpress/WebAttribute/TitleAttribute.cs +++ b/src/WebExpress.Core/WebAttribute/TitleAttribute.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebAttribute +namespace WebExpress.Core.WebAttribute { public class TitleAttribute : System.Attribute, IResourceAttribute { diff --git a/src/WebExpress/WebComponent/ComponentDictionary.cs b/src/WebExpress.Core/WebComponent/ComponentDictionary.cs similarity index 79% rename from src/WebExpress/WebComponent/ComponentDictionary.cs rename to src/WebExpress.Core/WebComponent/ComponentDictionary.cs index 99c0da5..687a211 100644 --- a/src/WebExpress/WebComponent/ComponentDictionary.cs +++ b/src/WebExpress.Core/WebComponent/ComponentDictionary.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using WebExpress.WebPlugin; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebComponent +namespace WebExpress.Core.WebComponent { /// /// Internal management of components. diff --git a/src/WebExpress/WebComponent/ComponentItem.cs b/src/WebExpress.Core/WebComponent/ComponentItem.cs similarity index 94% rename from src/WebExpress/WebComponent/ComponentItem.cs rename to src/WebExpress.Core/WebComponent/ComponentItem.cs index e5f1d98..0f62705 100644 --- a/src/WebExpress/WebComponent/ComponentItem.cs +++ b/src/WebExpress.Core/WebComponent/ComponentItem.cs @@ -1,6 +1,6 @@ using System; -namespace WebExpress.WebComponent +namespace WebExpress.Core.WebComponent { public class ComponentItem { diff --git a/src/WebExpress/WebComponent/ComponentManager.cs b/src/WebExpress.Core/WebComponent/ComponentManager.cs similarity index 97% rename from src/WebExpress/WebComponent/ComponentManager.cs rename to src/WebExpress.Core/WebComponent/ComponentManager.cs index 69e7c1c..ae41df1 100644 --- a/src/WebExpress/WebComponent/ComponentManager.cs +++ b/src/WebExpress.Core/WebComponent/ComponentManager.cs @@ -2,20 +2,20 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using WebExpress.Internationalization; -using WebExpress.WebApplication; -using WebExpress.WebEvent; -using WebExpress.WebJob; -using WebExpress.WebModule; -using WebExpress.WebPackage; -using WebExpress.WebPlugin; -using WebExpress.WebResource; -using WebExpress.WebSession; -using WebExpress.WebSitemap; -using WebExpress.WebStatusPage; -using WebExpress.WebTask; - -namespace WebExpress.WebComponent +using WebExpress.Core.Internationalization; +using WebExpress.Core.WebApplication; +using WebExpress.Core.WebEvent; +using WebExpress.Core.WebJob; +using WebExpress.Core.WebModule; +using WebExpress.Core.WebPackage; +using WebExpress.Core.WebPlugin; +using WebExpress.Core.WebResource; +using WebExpress.Core.WebSession; +using WebExpress.Core.WebSitemap; +using WebExpress.Core.WebStatusPage; +using WebExpress.Core.WebTask; + +namespace WebExpress.Core.WebComponent { /// /// Central management of components. diff --git a/src/WebExpress/WebComponent/IComponent.cs b/src/WebExpress.Core/WebComponent/IComponent.cs similarity index 93% rename from src/WebExpress/WebComponent/IComponent.cs rename to src/WebExpress.Core/WebComponent/IComponent.cs index 6ca4d05..c206653 100644 --- a/src/WebExpress/WebComponent/IComponent.cs +++ b/src/WebExpress.Core/WebComponent/IComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using WebExpress.WebPlugin; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebComponent +namespace WebExpress.Core.WebComponent { /// /// Interface of the manager classes. diff --git a/src/WebExpress/WebComponent/IComponentPlugin.cs b/src/WebExpress.Core/WebComponent/IComponentPlugin.cs similarity index 93% rename from src/WebExpress/WebComponent/IComponentPlugin.cs rename to src/WebExpress.Core/WebComponent/IComponentPlugin.cs index b86304e..fbfa859 100644 --- a/src/WebExpress/WebComponent/IComponentPlugin.cs +++ b/src/WebExpress.Core/WebComponent/IComponentPlugin.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using WebExpress.WebPlugin; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebComponent +namespace WebExpress.Core.WebComponent { /// /// Interface of the manager classes. diff --git a/src/WebExpress/WebComponent/IExecutableElements.cs b/src/WebExpress.Core/WebComponent/IExecutableElements.cs similarity index 90% rename from src/WebExpress/WebComponent/IExecutableElements.cs rename to src/WebExpress.Core/WebComponent/IExecutableElements.cs index a298abb..76ace93 100644 --- a/src/WebExpress/WebComponent/IExecutableElements.cs +++ b/src/WebExpress.Core/WebComponent/IExecutableElements.cs @@ -1,6 +1,6 @@ -using WebExpress.WebPlugin; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebComponent +namespace WebExpress.Core.WebComponent { /// /// Indicates that a manager manages executable elements. diff --git a/src/WebExpress/WebComponent/ISystemComponent.cs b/src/WebExpress.Core/WebComponent/ISystemComponent.cs similarity index 77% rename from src/WebExpress/WebComponent/ISystemComponent.cs rename to src/WebExpress.Core/WebComponent/ISystemComponent.cs index 5e686b6..a15e147 100644 --- a/src/WebExpress/WebComponent/ISystemComponent.cs +++ b/src/WebExpress.Core/WebComponent/ISystemComponent.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebComponent +namespace WebExpress.Core.WebComponent { /// /// Marks a manager as systemically relevant. diff --git a/src/WebExpress.Core/WebCondition/ICondition.cs b/src/WebExpress.Core/WebCondition/ICondition.cs new file mode 100644 index 0000000..5350757 --- /dev/null +++ b/src/WebExpress.Core/WebCondition/ICondition.cs @@ -0,0 +1,17 @@ +using WebExpress.Core.WebMessage; + +namespace WebExpress.Core.WebCondition +{ + /// + /// Represents a condition that must be met. + /// + public interface ICondition + { + /// + /// Verifies that the condition is met. + /// + /// The request. + /// True if the condition is met, false otherwise. + bool Fulfillment(Request request); + } +} diff --git a/src/WebExpress/WebEvent/EventDictionary.cs b/src/WebExpress.Core/WebEvent/EventDictionary.cs similarity index 70% rename from src/WebExpress/WebEvent/EventDictionary.cs rename to src/WebExpress.Core/WebEvent/EventDictionary.cs index a579885..e7e5f5f 100644 --- a/src/WebExpress/WebEvent/EventDictionary.cs +++ b/src/WebExpress.Core/WebEvent/EventDictionary.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using WebExpress.WebEvent; -using WebExpress.WebPlugin; +using WebExpress.Core.WebEvent; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebJob +namespace WebExpress.Core.WebJob { /// /// key = plugin context diff --git a/src/WebExpress/WebEvent/EventManager.cs b/src/WebExpress.Core/WebEvent/EventManager.cs similarity index 96% rename from src/WebExpress/WebEvent/EventManager.cs rename to src/WebExpress.Core/WebEvent/EventManager.cs index 1446b8c..77a9036 100644 --- a/src/WebExpress/WebEvent/EventManager.cs +++ b/src/WebExpress.Core/WebEvent/EventManager.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Linq; -using WebExpress.Internationalization; -using WebExpress.WebComponent; -using WebExpress.WebJob; -using WebExpress.WebModule; -using WebExpress.WebPlugin; +using WebExpress.Core.Internationalization; +using WebExpress.Core.WebComponent; +using WebExpress.Core.WebJob; +using WebExpress.Core.WebModule; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebEvent +namespace WebExpress.Core.WebEvent { /// /// The event manager. diff --git a/src/WebExpress/WebEvent/IEventContext.cs b/src/WebExpress.Core/WebEvent/IEventContext.cs similarity index 76% rename from src/WebExpress/WebEvent/IEventContext.cs rename to src/WebExpress.Core/WebEvent/IEventContext.cs index 7008149..92efe37 100644 --- a/src/WebExpress/WebEvent/IEventContext.cs +++ b/src/WebExpress.Core/WebEvent/IEventContext.cs @@ -1,7 +1,7 @@ -using WebExpress.WebModule; -using WebExpress.WebPlugin; +using WebExpress.Core.WebModule; +using WebExpress.Core.WebPlugin; -namespace WebExpress.WebEvent +namespace WebExpress.Core.WebEvent { public interface IEventContext { diff --git a/src/WebExpress/WebEvent/IEventHandler.cs b/src/WebExpress.Core/WebEvent/IEventHandler.cs similarity index 57% rename from src/WebExpress/WebEvent/IEventHandler.cs rename to src/WebExpress.Core/WebEvent/IEventHandler.cs index 4abe972..8823463 100644 --- a/src/WebExpress/WebEvent/IEventHandler.cs +++ b/src/WebExpress.Core/WebEvent/IEventHandler.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebEvent +namespace WebExpress.Core.WebEvent { public interface IEventHandler { diff --git a/src/WebExpress/WebEx.cs b/src/WebExpress.Core/WebEx.cs similarity index 77% rename from src/WebExpress/WebEx.cs rename to src/WebExpress.Core/WebEx.cs index 1d5f6ab..b85fa0b 100644 --- a/src/WebExpress/WebEx.cs +++ b/src/WebExpress.Core/WebEx.cs @@ -2,14 +2,17 @@ using System.Globalization; using System.IO; using System.Reflection; +using System.Runtime.CompilerServices; using System.Threading; using System.Xml.Serialization; -using WebExpress.Config; -using WebExpress.WebComponent; -using WebExpress.WebUri; -using static WebExpress.Internationalization.InternationalizationManager; +using WebExpress.Core.Config; +using WebExpress.Core.Internationalization; +using WebExpress.Core.WebComponent; +using WebExpress.Core.WebUri; -namespace WebExpress +[assembly: InternalsVisibleTo("WebExpress.Core.Test")] + +namespace WebExpress.Core { public class WebEx { @@ -207,21 +210,21 @@ private void Initialization(string args, string configFile) // log program start HttpServer.HttpServerContext.Log.Seperator('/'); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.startup")); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.startup")); HttpServer.HttpServerContext.Log.Info(message: "".PadRight(80, '-')); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.version"), args: Version); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.arguments"), args: args); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.workingdirectory"), args: Environment.CurrentDirectory); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.packagebase"), args: config.PackageBase); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.assetbase"), args: config.AssetBase); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.database"), args: config.DataBase); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.configurationdirectory"), args: Path.GetDirectoryName(configFile)); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.configuration"), args: Path.GetFileName(configFile)); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.logdirectory"), args: Path.GetDirectoryName(HttpServer.HttpServerContext.Log.Filename)); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.log"), args: Path.GetFileName(HttpServer.HttpServerContext.Log.Filename)); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.version"), args: Version); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.arguments"), args: args); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.workingdirectory"), args: Environment.CurrentDirectory); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.packagebase"), args: config.PackageBase); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.assetbase"), args: config.AssetBase); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.database"), args: config.DataBase); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.configurationdirectory"), args: Path.GetDirectoryName(configFile)); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.configuration"), args: Path.GetFileName(configFile)); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.logdirectory"), args: Path.GetDirectoryName(HttpServer.HttpServerContext.Log.Filename)); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.log"), args: Path.GetFileName(HttpServer.HttpServerContext.Log.Filename)); foreach (var v in config.Endpoints) { - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.uri"), args: v.Uri); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.uri"), args: v.Uri); } HttpServer.HttpServerContext.Log.Seperator('='); @@ -263,9 +266,9 @@ private void Exit() // end of program log HttpServer.HttpServerContext.Log.Seperator('='); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.errors"), args: HttpServer.HttpServerContext.Log.ErrorCount); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.warnings"), args: HttpServer.HttpServerContext.Log.WarningCount); - HttpServer.HttpServerContext.Log.Info(message: I18N("webexpress:app.done")); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.errors"), args: HttpServer.HttpServerContext.Log.ErrorCount); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.warnings"), args: HttpServer.HttpServerContext.Log.WarningCount); + HttpServer.HttpServerContext.Log.Info(message: InternationalizationManager.I18N("webexpress:app.done")); HttpServer.HttpServerContext.Log.Seperator('/'); // stop logging diff --git a/src/WebExpress/WebExpress.csproj b/src/WebExpress.Core/WebExpress.Core.csproj similarity index 91% rename from src/WebExpress/WebExpress.csproj rename to src/WebExpress.Core/WebExpress.Core.csproj index ce8ec0d..a13978f 100644 --- a/src/WebExpress/WebExpress.csproj +++ b/src/WebExpress.Core/WebExpress.Core.csproj @@ -2,9 +2,9 @@ Library - WebExpress - 0.0.3.0 - 0.0.3.0 + WebExpress.Core + 0.0.4.0 + 0.0.4.0 net7.0 any https://github.com/ReneSchwarzer/WebExpress.git @@ -14,7 +14,7 @@ true True Core library of the WebExpress web server. - 0.0.3-alpha + 0.0.4-alpha https://github.com/ReneSchwarzer/WebExpress icon.png README.md diff --git a/src/WebExpress/WebHtml/Css.cs b/src/WebExpress.Core/WebHtml/Css.cs similarity index 50% rename from src/WebExpress/WebHtml/Css.cs rename to src/WebExpress.Core/WebHtml/Css.cs index 233e9a1..8a89d5a 100644 --- a/src/WebExpress/WebHtml/Css.cs +++ b/src/WebExpress.Core/WebHtml/Css.cs @@ -1,25 +1,25 @@ using System.Linq; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { public static class Css { /// - /// Verbindet die angebenen CSS-Klassen zu einem String + /// Joins the specifying css classes into a string. /// - /// Die einzelnen CSS-Klassen - /// Die Css-Klassen als String + /// The individual css classes. + /// The css classes as a string. public static string Concatenate(params string[] items) { return string.Join(' ', items.Where(x => !string.IsNullOrWhiteSpace(x)).Distinct()); } /// - /// Entfernt die angegebenen CSS-Klassen aus dem Gesammtsring + /// Removes the specified css classes from the string. /// - /// Die in einem gemeinsamen String verbundenen CSS-Klassen - /// Die zu entfernenden CSS-Klassen - /// Die Css-Klassen als String + /// The css classes connected in a common string. + /// The css classes to remove. + /// The css classes as a string. public static string Remove(string css, params string[] remove) { return string.Join(' ', css.Split(' ').Where(x => !remove.Contains(x))); diff --git a/src/WebExpress/WebHtml/Favicon.cs b/src/WebExpress.Core/WebHtml/Favicon.cs similarity index 98% rename from src/WebExpress/WebHtml/Favicon.cs rename to src/WebExpress.Core/WebHtml/Favicon.cs index 65e89c7..f8392be 100644 --- a/src/WebExpress/WebHtml/Favicon.cs +++ b/src/WebExpress.Core/WebHtml/Favicon.cs @@ -1,4 +1,4 @@ -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { public class Favicon { diff --git a/src/WebExpress/WebHtml/HTMLElementExtension.cs b/src/WebExpress.Core/WebHtml/HTMLElementExtension.cs similarity index 97% rename from src/WebExpress/WebHtml/HTMLElementExtension.cs rename to src/WebExpress.Core/WebHtml/HTMLElementExtension.cs index d3162cc..f688e6a 100644 --- a/src/WebExpress/WebHtml/HTMLElementExtension.cs +++ b/src/WebExpress.Core/WebHtml/HTMLElementExtension.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Extension methods for HTMLEelements. + /// Extension methods for html Eelements. /// public static class HTMLElementExtension { diff --git a/src/WebExpress/WebHtml/HtmlAttribute.cs b/src/WebExpress.Core/WebHtml/HtmlAttribute.cs similarity index 90% rename from src/WebExpress/WebHtml/HtmlAttribute.cs rename to src/WebExpress.Core/WebHtml/HtmlAttribute.cs index 6ca999a..c4fb661 100644 --- a/src/WebExpress/WebHtml/HtmlAttribute.cs +++ b/src/WebExpress.Core/WebHtml/HtmlAttribute.cs @@ -1,6 +1,6 @@ using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { public class HtmlAttribute : IHtmlAttribute { @@ -25,7 +25,7 @@ public HtmlAttribute() /// /// Constructor /// - /// Der Name + /// The name. public HtmlAttribute(string name) { Name = name; @@ -34,7 +34,7 @@ public HtmlAttribute(string name) /// /// Constructor /// - /// Der Name + /// The name. /// The value. public HtmlAttribute(string name, string value) { diff --git a/src/WebExpress/WebHtml/HtmlAttributeNoneValue.cs b/src/WebExpress.Core/WebHtml/HtmlAttributeNoneValue.cs similarity index 84% rename from src/WebExpress/WebHtml/HtmlAttributeNoneValue.cs rename to src/WebExpress.Core/WebHtml/HtmlAttributeNoneValue.cs index ee8b3cf..4ed44d2 100644 --- a/src/WebExpress/WebHtml/HtmlAttributeNoneValue.cs +++ b/src/WebExpress.Core/WebHtml/HtmlAttributeNoneValue.cs @@ -1,10 +1,10 @@ using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Ein Attribut ohne wert - /// z.B. required in input + /// An attribute without value. + /// e.g. required in input /// public class HtmlAttributeNoneValue : IHtmlAttribute { @@ -24,7 +24,7 @@ public HtmlAttributeNoneValue() /// /// Constructor /// - /// Der Name + /// The name. public HtmlAttributeNoneValue(string name) { Name = name; diff --git a/src/WebExpress/WebHtml/HtmlComment.cs b/src/WebExpress.Core/WebHtml/HtmlComment.cs similarity index 96% rename from src/WebExpress/WebHtml/HtmlComment.cs rename to src/WebExpress.Core/WebHtml/HtmlComment.cs index 4bbfc7f..f7160ca 100644 --- a/src/WebExpress/WebHtml/HtmlComment.cs +++ b/src/WebExpress.Core/WebHtml/HtmlComment.cs @@ -1,6 +1,6 @@ using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { public class HtmlComment : IHtmlNode { diff --git a/src/WebExpress/WebHtml/HtmlElement.cs b/src/WebExpress.Core/WebHtml/HtmlElement.cs similarity index 78% rename from src/WebExpress/WebHtml/HtmlElement.cs rename to src/WebExpress.Core/WebHtml/HtmlElement.cs index 5fb350c..981943d 100644 --- a/src/WebExpress/WebHtml/HtmlElement.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElement.cs @@ -2,8 +2,11 @@ using System.Linq; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { + /// + /// The basis of all html elements (see RfC 1866). + /// public class HtmlElement : IHtmlNode { /// @@ -12,12 +15,12 @@ public class HtmlElement : IHtmlNode protected string ElementName { get; set; } /// - /// Liefert oder setzt die Attribute + /// Returns or sets the attributes. /// protected List Attributes { get; private set; } /// - /// Liefert oder setzt die Attribute + /// Returns or sets the attributes. /// protected List Elements { get; private set; } @@ -31,7 +34,7 @@ public string Id } /// - /// Liefert oder setzt die Css-Klasse + /// Returns or sets the css class. /// public string Class { @@ -40,7 +43,7 @@ public string Class } /// - /// Liefert oder setzt die Css-Style + /// Returns or sets the css style. /// public string Style { @@ -49,7 +52,7 @@ public string Style } /// - /// Liefert oder setzt die Rolle + /// Returns or sets the role. /// public string Role { @@ -58,7 +61,7 @@ public string Role } /// - /// Liefert oder setzt das HTML5 Data-Attribut + /// Returns or sets the html5 data attribute. /// public string DataToggle { @@ -67,7 +70,7 @@ public string DataToggle } /// - /// Liefert oder setzt das HTML5 Data-Attribut + /// Returns or sets the html5 data attribute. /// public string DataProvide { @@ -76,7 +79,7 @@ public string DataProvide } /// - /// Liefert oder setzt die OnClick-Attribut + /// Returns or sets the on click attribute. /// public string OnClick { @@ -85,20 +88,20 @@ public string OnClick } /// - /// Bestimmt, ob das Element inline ist + /// Determines whether the element is inline. /// public bool Inline { get; set; } /// - /// Bestimmt ob das Element einen End-Tag benötigt - /// z.B.: true =
false =
+ /// Determines whether the element needs an end tag. + /// e.g.: true =
false =
/// public bool CloseTag { get; protected set; } /// - /// Konstruktr + /// Constructor /// - /// Der Name des Elements + /// The name of the item. public HtmlElement(string name, bool closeTag = true) { ElementName = name; @@ -108,9 +111,9 @@ public HtmlElement(string name, bool closeTag = true) } /// - /// Konstruktr + /// Constructor /// - /// Der Name des Elements + /// The name of the item. public HtmlElement(string name, bool closeTag, params IHtml[] nodes) : this(name, closeTag) { @@ -132,10 +135,10 @@ public HtmlElement(string name, bool closeTag, params IHtml[] nodes) } /// - /// Liefert den Wert eines Attributs + /// Returns the value of an attribute. /// - /// Der Attributname - /// Der Wert des Attributes + /// The attribute name. + /// The value of the attribute. protected string GetAttribute(string name) { var a = Attributes.Where(x => x.Name == name).FirstOrDefault(); @@ -149,10 +152,10 @@ protected string GetAttribute(string name) } /// - /// Prüft ob ein Attribut gesetzt ist + /// Checks whether an attribute is set. /// - /// Der Attributname - /// true wenn Attribut vorhanden, false sonst + /// The attribute name. + /// True if attribute exists, false otherwise. protected bool HasAttribute(string name) { var a = Attributes.Where(x => x.Name == name).FirstOrDefault(); @@ -161,10 +164,10 @@ protected bool HasAttribute(string name) } /// - /// Setzt den Wert eines Attributs + /// Sets the value of an attribute. /// - /// Der Attributname - /// Der Wert des Attributes + /// The attribute name. + /// The value of the attribute. protected void SetAttribute(string name, string value) { var a = Attributes.Where(x => x.Name == name).FirstOrDefault(); @@ -192,7 +195,7 @@ protected void SetAttribute(string name, string value) /// /// Setzt den Wert eines Attributs /// - /// Der Attributname + /// The attribute name. protected void SetAttribute(string name) { var a = Attributes.Where(x => x.Name == name).FirstOrDefault(); @@ -204,9 +207,9 @@ protected void SetAttribute(string name) } /// - /// Entfernt ein Attribut + /// Removes an attribute. /// - /// Der Attributname + /// The attribute name. protected void RemoveAttribute(string name) { var a = Attributes.Where(x => x.Name == name).FirstOrDefault(); @@ -218,10 +221,10 @@ protected void RemoveAttribute(string name) } /// - /// Liefert ein Element anhand seines Namens + /// Returns an element based on its name. /// - /// Der Elementname - /// Das Element + /// The element name. + /// The element. protected HtmlElement GetElement(string name) { var a = Elements.Where(x => x is HtmlElement && (x as HtmlElement).ElementName == name).FirstOrDefault(); @@ -230,9 +233,9 @@ protected HtmlElement GetElement(string name) } /// - /// Setzt ein Element anhand seines Namens + /// Sets an element. /// - /// Das Element + /// The element. protected void SetElement(HtmlElement element) { if (element != null) @@ -249,7 +252,7 @@ protected void SetElement(HtmlElement element) } /// - /// Liefert den Text + /// Returns the text. /// /// The text. protected string GetText() @@ -332,7 +335,7 @@ protected virtual void ToPreString(StringBuilder builder, int deep) /// /// The string builder. /// The call depth. - /// Abschlustag auf neuer Zeile beginnen + /// Start the closing tag on a new line. protected virtual void ToPostString(StringBuilder builder, int deep, bool nl = true) { if (!Inline && nl) @@ -347,48 +350,48 @@ protected virtual void ToPostString(StringBuilder builder, int deep, bool nl = t } /// - /// Setzt den Wert eines Attributs + /// Sets the value of an user-defined attribute. /// - /// Der Attributname - /// Der Wert des Attributes + /// The attribute name. + /// The value of the attribute. public void AddUserAttribute(string name, string value) { SetAttribute(name, value); } /// - /// Liefert den Wert eines Attributs + /// Returns the value of an user-defined attribute. /// - /// Der Attributname - /// Der Wert des Attributes + /// The attribute name. + /// The value of the attribute. public string GetUserAttribute(string name) { return GetAttribute(name); } /// - /// Prüft ob ein Attribut gesetzt ist + /// Checks if a user-defined attribute is set. /// - /// Der Attributname - /// true wenn Attribut vorhanden, false sonst + /// The attribute name. + /// True wenn Attribut vorhanden, false sonst public bool HasUserAttribute(string name) { return HasAttribute(name); } /// - /// Entfernt ein Attribut + /// Removes an user-defined attribute. /// - /// Der Attributname + /// The attribute name. protected void RemoveUserAttribute(string name) { RemoveAttribute(name); } /// - /// In String konvertieren + /// Convert to String. /// - /// Das Objekt als String + /// The object as a string. public override string ToString() { var builder = new StringBuilder(); diff --git a/src/WebExpress/WebHtml/HtmlElementEditDel.cs b/src/WebExpress.Core/WebHtml/HtmlElementEditDel.cs similarity index 80% rename from src/WebExpress/WebHtml/HtmlElementEditDel.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEditDel.cs index f069323..a0c7a96 100644 --- a/src/WebExpress/WebHtml/HtmlElementEditDel.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEditDel.cs @@ -1,10 +1,10 @@ using System.Linq; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Markiert einen aus dem Dokument entfernten Teil. + /// Selects a part that has been removed from the document. /// public class HtmlElementEditDel : HtmlElement, IHtmlElementEdit { @@ -18,7 +18,7 @@ public string Text } /// - /// Liefert oder setzt die URI einer Quelle, die die Änderung ausgelöst hat (z.B. eine Ticketnummer in einem Bugtrack-System). + /// Returns or sets the uri of a source that triggered the change (e.g. a ticket number in a bugtrack system). /// public string Cite { @@ -27,8 +27,8 @@ public string Cite } /// - /// Liefert oder setzt die indiziert das Datum und die Uhrzeit, wann The text. geändert wurde. - /// Wenn der Wert nicht als Datum mit optionaler Zeitangabe erkannt werden kann, hat dieses Element keinen Bezug zur Zeit. + /// Returns or sets the indexes the date and time when the text was modified.. + /// If the value cannot be recognized as a date with an optional time, this element has no relation to time. /// public string DateTime { diff --git a/src/WebExpress/WebHtml/HtmlElementEditIns.cs b/src/WebExpress.Core/WebHtml/HtmlElementEditIns.cs similarity index 80% rename from src/WebExpress/WebHtml/HtmlElementEditIns.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEditIns.cs index 370a405..a980b8a 100644 --- a/src/WebExpress/WebHtml/HtmlElementEditIns.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEditIns.cs @@ -1,10 +1,10 @@ using System.Linq; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Markiert einen zum Dokument hinzugefügten Teil. + /// Represents a part added to the document. /// public class HtmlElementEditIns : HtmlElement, IHtmlElementEdit { @@ -18,7 +18,7 @@ public string Text } /// - /// Liefert oder setzt die URI einer Quelle, die die Änderung ausgelöst hat (z.B. eine Ticketnummer in einem Bugtrack-System). + /// Returns or sets the uri of a source that triggered the change (e.g. a ticket number in a bugtrack system). /// public string Cite { @@ -27,8 +27,8 @@ public string Cite } /// - /// Liefert oder setzt die indiziert das Datum und die Uhrzeit, wann The text. geändert wurde. - /// Wenn der Wert nicht als Datum mit optionaler Zeitangabe erkannt werden kann, hat dieses Element keinen Bezug zur Zeit. + /// Returns or sets the indexes the date and time when the text was modified.. + /// If the value cannot be recognized as a date with an optional time, this element has no relation to time. /// public string DateTime { diff --git a/src/WebExpress/WebHtml/HtmlElementEmbeddedEmbed.cs b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedEmbed.cs similarity index 77% rename from src/WebExpress/WebHtml/HtmlElementEmbeddedEmbed.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEmbeddedEmbed.cs index 7dc7cc7..519cb11 100644 --- a/src/WebExpress/WebHtml/HtmlElementEmbeddedEmbed.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedEmbed.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Steht für einen Einbindungspunkt für externe Ressourcen. Dies sind typischerweise keine - /// HTML-Inhalte, sondern beispielsweise eine Applikation oder interaktiver Inhalt, - /// der mit Hilfe eines Plugins (anstatt nativ durch das Benutzerprogramms) dargestellt wird. + /// Represents an integration point for external resources. These are typically not + /// html content, but for example an application or interactive content, + /// which is represented with the help of a plugin(instead of natively by the user program). /// public class HtmlElementEmbeddedEmbed : HtmlElement, IHtmlElementEmbedded { diff --git a/src/WebExpress/WebHtml/HtmlElementEmbeddedIframe.cs b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedIframe.cs similarity index 86% rename from src/WebExpress/WebHtml/HtmlElementEmbeddedIframe.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEmbeddedIframe.cs index f8bfa7c..bce5832 100644 --- a/src/WebExpress/WebHtml/HtmlElementEmbeddedIframe.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedIframe.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Definiert einen Rahmen, mit dem ein HTML-Dokument in seinem eigenen Kontext in das aktuelle Dokument eingebettet werden kann. + /// Represents a frame that allows an html document to be embedded in the current + /// document in its own context. /// public class HtmlElementEmbeddedIframe : HtmlElement, IHtmlElementEmbedded { diff --git a/src/WebExpress/WebHtml/HtmlElementEmbeddedObject.cs b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedObject.cs similarity index 79% rename from src/WebExpress/WebHtml/HtmlElementEmbeddedObject.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEmbeddedObject.cs index 0fe5b31..a4dff16 100644 --- a/src/WebExpress/WebHtml/HtmlElementEmbeddedObject.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedObject.cs @@ -1,11 +1,12 @@ using System.Collections.Generic; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Steht für allgemeinen externen Inhalt, der je nach Kontext als Bild, - /// "verschachtelter Browsing-Kontext" (s. iframe), oder externer Inhalt - /// (der mit Hilfe eines Plugins darsgestellt wird) betrachtet wird. + /// Stands for general external content, which is considered an + /// image, "nested browsing context" (see iframe), or external + /// content (which is displayed with the help of a plugin), + /// depending on the context. /// public class HtmlElementEmbeddedObject : HtmlElement, IHtmlElementEmbedded { @@ -20,7 +21,6 @@ public class HtmlElementEmbeddedObject : HtmlElement, IHtmlElementEmbedded public HtmlElementEmbeddedObject() : base("object") { - } /// diff --git a/src/WebExpress/WebHtml/HtmlElementEmbeddedParam.cs b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedParam.cs similarity index 63% rename from src/WebExpress/WebHtml/HtmlElementEmbeddedParam.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEmbeddedParam.cs index 9335468..65942bd 100644 --- a/src/WebExpress/WebHtml/HtmlElementEmbeddedParam.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedParam.cs @@ -1,8 +1,8 @@ -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Definiert Parameter für ein Plugin, das für die Darstellung eines - /// mit eingebundenen Elements verwendet werden. + /// Represents a parameter for a plugin that can be used for the display + /// of an embedded element. /// public class HtmlElementEmbeddedParam : HtmlElement, IHtmlElementEmbedded { diff --git a/src/WebExpress/WebHtml/HtmlElementEmbeddedPicture.cs b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedPicture.cs similarity index 94% rename from src/WebExpress/WebHtml/HtmlElementEmbeddedPicture.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEmbeddedPicture.cs index 7eac29f..f85217d 100644 --- a/src/WebExpress/WebHtml/HtmlElementEmbeddedPicture.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedPicture.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// + /// Represents a picture. /// public class HtmlElementEmbeddedPicture : HtmlElement, IHtmlElementEmbedded { @@ -18,7 +18,6 @@ public class HtmlElementEmbeddedPicture : HtmlElement, IHtmlElementEmbedded public HtmlElementEmbeddedPicture() : base("picture") { - } /// diff --git a/src/WebExpress/WebHtml/HtmlElementEmbeddedSource.cs b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedSource.cs similarity index 59% rename from src/WebExpress/WebHtml/HtmlElementEmbeddedSource.cs rename to src/WebExpress.Core/WebHtml/HtmlElementEmbeddedSource.cs index 9fdbef3..20ed38c 100644 --- a/src/WebExpress/WebHtml/HtmlElementEmbeddedSource.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementEmbeddedSource.cs @@ -1,8 +1,8 @@ -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Ermöglicht es Autoren, alternative Medienressourcen (z.B. verschiedene Audio- oder Videoformate) - /// für Medienelemente wie public class HtmlElementEmbeddedSource : HtmlElement, IHtmlElementEmbedded { @@ -12,7 +12,6 @@ public class HtmlElementEmbeddedSource : HtmlElement, IHtmlElementEmbedded public HtmlElementEmbeddedSource() : base("source", false) { - } } } diff --git a/src/WebExpress/WebHtml/HtmlElementFieldButton.cs b/src/WebExpress.Core/WebHtml/HtmlElementFieldButton.cs similarity index 98% rename from src/WebExpress/WebHtml/HtmlElementFieldButton.cs rename to src/WebExpress.Core/WebHtml/HtmlElementFieldButton.cs index 96c756c..6e97337 100644 --- a/src/WebExpress/WebHtml/HtmlElementFieldButton.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementFieldButton.cs @@ -2,10 +2,10 @@ using System.Linq; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Html-Element Button. + /// Represents a button element. /// public class HtmlElementFieldButton : HtmlElement, IHtmlFormularItem { diff --git a/src/WebExpress/WebHtml/HtmlElementFieldInput.cs b/src/WebExpress.Core/WebHtml/HtmlElementFieldInput.cs similarity index 81% rename from src/WebExpress/WebHtml/HtmlElementFieldInput.cs rename to src/WebExpress.Core/WebHtml/HtmlElementFieldInput.cs index 96d4a3f..2ca3fe9 100644 --- a/src/WebExpress/WebHtml/HtmlElementFieldInput.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementFieldInput.cs @@ -1,9 +1,10 @@ using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Steht für ein Feld für Benutzereingaben eines bestimmten Typs. Der Typ (Radiobutton, Ankreuzfeld, Texteingabe, etc.) wird anhand des type-Attributs angegeben. + /// Represents a field for user input of a specific type. The type (radio button, checkbox, + /// text input, etc.) is specified using the type attribute. /// public class HtmlElementFieldInput : HtmlElement, IHtmlFormularItem { @@ -17,7 +18,7 @@ public string Name } /// - /// Liefert oder setzt den Mindestwert + /// Returns or sets the type. /// public string Type { @@ -26,7 +27,7 @@ public string Type } /// - /// Returns or sets the value. des Eingabefeldes + /// Returns or sets the value. /// public string Value { @@ -35,8 +36,8 @@ public string Value } /// - /// Liefert oder setzt die Zeichenlänge bei text, search, tel, url, email, oder password - /// Falls kein Wert angegeben wird, wird der Standardwert 20 verwendet. + /// Returns or sets the character length for text, search, tel, url, email, or password. + /// If no value is specified, the default value of 20 is used. /// public string Size { @@ -45,7 +46,7 @@ public string Size } /// - /// Liefert oder setzt ob das Felf schreibgeschützt ist + /// Returns or sets whether the field is read-only. /// public string Readonly { @@ -54,7 +55,7 @@ public string Readonly } /// - /// Liefert oder setzt ob das Eingabefeld verwendet werden kann + /// Returns or sets whether the input field can be used. /// public bool Disabled { @@ -63,7 +64,7 @@ public bool Disabled } /// - /// Liefert oder setzt den Mindestwert + /// Returns or sets the minimum value. /// public string Min { @@ -72,7 +73,7 @@ public string Min } /// - /// Liefert oder setzt den Maximalenwert + /// Returns or sets the maximum value. /// public string Max { @@ -81,7 +82,7 @@ public string Max } /// - /// Liefert oder setzt die Schrittweite bei numerische, Datums- oder Zeitangaben + /// Returns or sets the increment for numeric, date, or time indications. /// public string Step { @@ -90,7 +91,7 @@ public string Step } /// - /// Returns or sets the name. einer Liste (datalist) + /// Returns or sets the list (datalist). /// public string List { @@ -99,7 +100,7 @@ public string List } /// - /// Liefert oder setzt ob mehrfacheingaben von Datei-Uploads und Emaileingaben möglich sind + /// Returns or sets whether multiple entries of file uploads and email inputs are possible. /// public string Multiple { @@ -135,7 +136,7 @@ public bool Required } /// - /// Liefert oder setzt ob eine Auswahl erfolt (nur bei Radio- und Check) + /// Returns or sets whether a selection is made (only for radio and check). /// public bool Checked { @@ -162,7 +163,7 @@ public string Placeholder } /// - /// Liefert oder setzt die Eingabemethode (hilft mobilen Geräten, die richtige Tastatur-(belegung) zu wählen) + /// Provides or sets the input method (helps mobile devices choose the correct keyboard layout). /// public string Inputmode { diff --git a/src/WebExpress/WebHtml/HtmlElementFieldLabel.cs b/src/WebExpress.Core/WebHtml/HtmlElementFieldLabel.cs similarity index 88% rename from src/WebExpress/WebHtml/HtmlElementFieldLabel.cs rename to src/WebExpress.Core/WebHtml/HtmlElementFieldLabel.cs index c8cf593..1f94494 100644 --- a/src/WebExpress/WebHtml/HtmlElementFieldLabel.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementFieldLabel.cs @@ -1,12 +1,12 @@ using System.Linq; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Kennzeichnet die Beschriftung für ein Formular-Kontrollelement (z.B. Texteingabefelder). - /// - /// + /// Represents the label for a form control element (e.g. text input fields). + /// + /// /// public class HtmlElementFieldLabel : HtmlElement, IHtmlFormularItem { diff --git a/src/WebExpress/WebHtml/HtmlElementFieldLegend.cs b/src/WebExpress.Core/WebHtml/HtmlElementFieldLegend.cs similarity index 89% rename from src/WebExpress/WebHtml/HtmlElementFieldLegend.cs rename to src/WebExpress.Core/WebHtml/HtmlElementFieldLegend.cs index b00e32f..61b5e96 100644 --- a/src/WebExpress/WebHtml/HtmlElementFieldLegend.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementFieldLegend.cs @@ -1,9 +1,9 @@ using System.Linq; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Kennzeichnet eine Beschriftung für ein
-Element. + /// Represents a label for an
element. ///
public class HtmlElementFieldLegend : HtmlElement { diff --git a/src/WebExpress/WebHtml/HtmlElementFieldSelect.cs b/src/WebExpress.Core/WebHtml/HtmlElementFieldSelect.cs similarity index 95% rename from src/WebExpress/WebHtml/HtmlElementFieldSelect.cs rename to src/WebExpress.Core/WebHtml/HtmlElementFieldSelect.cs index 3306181..437c643 100644 --- a/src/WebExpress/WebHtml/HtmlElementFieldSelect.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementFieldSelect.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Kennzeichnet ein Kontrollelement, mit dem aus einer Reihe von Optionen ausgewählt werden kann. + /// Represents a control that can be used to select from a range of options. /// - /// + /// /// /// /// @@ -34,7 +34,6 @@ public string Label public HtmlElementFormOptgroup() : base("optgroup") { - } /// diff --git a/src/WebExpress/WebHtml/HtmlElementFormOption.cs b/src/WebExpress.Core/WebHtml/HtmlElementFormOption.cs similarity index 89% rename from src/WebExpress/WebHtml/HtmlElementFormOption.cs rename to src/WebExpress.Core/WebHtml/HtmlElementFormOption.cs index 7484cc9..425eb38 100644 --- a/src/WebExpress/WebHtml/HtmlElementFormOption.cs +++ b/src/WebExpress.Core/WebHtml/HtmlElementFormOption.cs @@ -1,10 +1,10 @@ using System.Linq; using System.Text; -namespace WebExpress.WebHtml +namespace WebExpress.Core.WebHtml { /// - /// Steht für eine Auswahloption innerhalb eines element, or a suggestion within an element. ///