diff --git a/Source/Maple.sln b/Source/Maple.sln index e80f765..12b5707 100644 --- a/Source/Maple.sln +++ b/Source/Maple.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33103.184 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.MapleClient", "Web.Maple.MapleClient", "{67A01185-F6CC-496A-813C-E1E7C73AA7E2}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.Client", "Web.Maple.Client", "{67A01185-F6CC-496A-813C-E1E7C73AA7E2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.MapleServer", "Web.Maple.MapleServer", "{F836AD65-6FA9-487B-9DFA-F88E58C09A87}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.Server", "Web.Maple.Server", "{F836AD65-6FA9-487B-9DFA-F88E58C09A87}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{FF9309D7-BA3D-4BC0-A487-3D20AA566838}" EndProject @@ -13,23 +13,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{27484B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{A9F48762-387E-4D1D-A610-A147FEE8F709}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{6409E93C-888B-40D9-BFC3-A2AA8E9330B5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{6409E93C-888B-40D9-BFC3-A2AA8E9330B5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D15389D9-AD11-4877-B130-9EDD0C5D2790}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{07308F3E-7D78-4E19-A98B-CC1EDB6E8644}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.MapleClient", "Web.Maple.MapleClient\Driver\Web.Maple.MapleClient.csproj", "{D8D1DD36-685D-4B55-9D91-0B65D07FA04E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Client", "Web.Maple.Client\Web.Maple.Client.csproj", "{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapleClient_Sample", "Web.Maple.MapleClient\Sample\MapleClient_Sample\MapleClient_Sample.csproj", "{4BCEE20A-9B50-4071-878D-B964CD8523DB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Client_Sample", "Web.Maple.Client_Sample\Web.Maple.Client_Sample.csproj", "{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.MapleServer", "Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj", "{C9E324F7-9757-4F96-8079-52072A322805}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Server", "Web.Maple.Server\Web.Maple.Server.csproj", "{0F05393E-8C90-42A9-9EA5-7BBC88F17368}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerConsole_Sample", "Web.Maple.MapleServer\Samples\ServerConsole_Sample\ServerConsole_Sample.csproj", "{4D68707E-6AB5-4716-86B8-3A1AF3893562}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Server_Sample", "Web.Maple.Server_Sample\Web.Maple.Server_Sample.csproj", "{4FA6FFE8-AF53-4E01-B32E-0CB659A89775}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Unit.Tests", "Web.Maple.MapleServer\Tests\Maple.Unit.Tests\Maple.Unit.Tests.csproj", "{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Unit.Tests", "Tests\Maple.Unit.Tests.csproj", "{3C38E17C-EF69-4AD1-87CB-0B1001D660B1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Server_UDP_Listener_Sample", "Web.Maple.MapleServer\Utilities\Maple.Server_UDP_Listener_Sample\Maple.Server_UDP_Listener_Sample.csproj", "{4212371D-B79B-4961-A868-BD8A95351449}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Server_UDP_Listener_Sample", "Utilities\Maple.Server_UDP_Listener_Sample.csproj", "{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -37,31 +37,32 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Release|Any CPU.Build.0 = Release|Any CPU - {4BCEE20A-9B50-4071-878D-B964CD8523DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BCEE20A-9B50-4071-878D-B964CD8523DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BCEE20A-9B50-4071-878D-B964CD8523DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BCEE20A-9B50-4071-878D-B964CD8523DB}.Release|Any CPU.Build.0 = Release|Any CPU - {C9E324F7-9757-4F96-8079-52072A322805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9E324F7-9757-4F96-8079-52072A322805}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9E324F7-9757-4F96-8079-52072A322805}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9E324F7-9757-4F96-8079-52072A322805}.Release|Any CPU.Build.0 = Release|Any CPU - {C9E324F7-9757-4F96-8079-52072A322805}.Release|Any CPU.Deploy.0 = Release|Any CPU - {4D68707E-6AB5-4716-86B8-3A1AF3893562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D68707E-6AB5-4716-86B8-3A1AF3893562}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D68707E-6AB5-4716-86B8-3A1AF3893562}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D68707E-6AB5-4716-86B8-3A1AF3893562}.Release|Any CPU.Build.0 = Release|Any CPU - {3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Release|Any CPU.Build.0 = Release|Any CPU - {4212371D-B79B-4961-A868-BD8A95351449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4212371D-B79B-4961-A868-BD8A95351449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4212371D-B79B-4961-A868-BD8A95351449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4212371D-B79B-4961-A868-BD8A95351449}.Release|Any CPU.Build.0 = Release|Any CPU + {FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Release|Any CPU.Build.0 = Release|Any CPU + {445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Release|Any CPU.Build.0 = Release|Any CPU + {0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Release|Any CPU.Build.0 = Release|Any CPU + {0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Release|Any CPU.Deploy.0 = Release|Any CPU + {4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Release|Any CPU.Build.0 = Release|Any CPU + {3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Release|Any CPU.Build.0 = Release|Any CPU + {24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -73,12 +74,12 @@ Global {6409E93C-888B-40D9-BFC3-A2AA8E9330B5} = {F836AD65-6FA9-487B-9DFA-F88E58C09A87} {D15389D9-AD11-4877-B130-9EDD0C5D2790} = {F836AD65-6FA9-487B-9DFA-F88E58C09A87} {07308F3E-7D78-4E19-A98B-CC1EDB6E8644} = {F836AD65-6FA9-487B-9DFA-F88E58C09A87} - {D8D1DD36-685D-4B55-9D91-0B65D07FA04E} = {FF9309D7-BA3D-4BC0-A487-3D20AA566838} - {4BCEE20A-9B50-4071-878D-B964CD8523DB} = {27484BCD-7E08-4554-BDC5-8FF1331346C9} - {C9E324F7-9757-4F96-8079-52072A322805} = {A9F48762-387E-4D1D-A610-A147FEE8F709} - {4D68707E-6AB5-4716-86B8-3A1AF3893562} = {6409E93C-888B-40D9-BFC3-A2AA8E9330B5} - {3DB04B8A-7FF4-42A1-8140-29E6BAB70A44} = {D15389D9-AD11-4877-B130-9EDD0C5D2790} - {4212371D-B79B-4961-A868-BD8A95351449} = {07308F3E-7D78-4E19-A98B-CC1EDB6E8644} + {FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8} = {FF9309D7-BA3D-4BC0-A487-3D20AA566838} + {445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0} = {27484BCD-7E08-4554-BDC5-8FF1331346C9} + {0F05393E-8C90-42A9-9EA5-7BBC88F17368} = {A9F48762-387E-4D1D-A610-A147FEE8F709} + {4FA6FFE8-AF53-4E01-B32E-0CB659A89775} = {6409E93C-888B-40D9-BFC3-A2AA8E9330B5} + {3C38E17C-EF69-4AD1-87CB-0B1001D660B1} = {D15389D9-AD11-4877-B130-9EDD0C5D2790} + {24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B} = {07308F3E-7D78-4E19-A98B-CC1EDB6E8644} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9C2393A8-C0F2-499C-B803-F63A421A359F} diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/AbsolutePathHandler.cs b/Source/Tests/AbsolutePathHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/AbsolutePathHandler.cs rename to Source/Tests/AbsolutePathHandler.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/FooHandler.cs b/Source/Tests/FooHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/FooHandler.cs rename to Source/Tests/FooHandler.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/Maple.Unit.Tests.csproj b/Source/Tests/Maple.Unit.Tests.csproj similarity index 87% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/Maple.Unit.Tests.csproj rename to Source/Tests/Maple.Unit.Tests.csproj index c35d9da..0a6f84d 100644 --- a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/Maple.Unit.Tests.csproj +++ b/Source/Tests/Maple.Unit.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/ParameterTests.cs b/Source/Tests/ParameterTests.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/ParameterTests.cs rename to Source/Tests/ParameterTests.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RequestMethodCacheAbsolutePathTests.cs b/Source/Tests/RequestMethodCacheAbsolutePathTests.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RequestMethodCacheAbsolutePathTests.cs rename to Source/Tests/RequestMethodCacheAbsolutePathTests.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RequestMethodCacheRelativePathTests.cs b/Source/Tests/RequestMethodCacheRelativePathTests.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RequestMethodCacheRelativePathTests.cs rename to Source/Tests/RequestMethodCacheRelativePathTests.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RootHandler.cs b/Source/Tests/RootHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RootHandler.cs rename to Source/Tests/RootHandler.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RootHandlerTests.cs b/Source/Tests/RootHandlerTests.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/RootHandlerTests.cs rename to Source/Tests/RootHandlerTests.cs diff --git a/Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/SensorHandler.cs b/Source/Tests/SensorHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Tests/Maple.Unit.Tests/SensorHandler.cs rename to Source/Tests/SensorHandler.cs diff --git a/Source/Web.Maple.MapleServer/Utilities/Maple.Server_UDP_Listener_Sample/Maple.Server_UDP_Listener_Sample.csproj b/Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj similarity index 97% rename from Source/Web.Maple.MapleServer/Utilities/Maple.Server_UDP_Listener_Sample/Maple.Server_UDP_Listener_Sample.csproj rename to Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj index a2cdec7..98f59bc 100644 --- a/Source/Web.Maple.MapleServer/Utilities/Maple.Server_UDP_Listener_Sample/Maple.Server_UDP_Listener_Sample.csproj +++ b/Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj @@ -1,15 +1,15 @@ - - - - Wilderness Labs, Inc - Wilderness Labs, Inc - true - Apache-2.0 - 10.0 - Exe - net7.0 - enable - enable - - - + + + + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 + Exe + net7.0 + enable + enable + + + diff --git a/Source/Web.Maple.MapleServer/Utilities/Maple.postman_collection.json b/Source/Utilities/Maple.postman_collection.json similarity index 100% rename from Source/Web.Maple.MapleServer/Utilities/Maple.postman_collection.json rename to Source/Utilities/Maple.postman_collection.json diff --git a/Source/Web.Maple.MapleServer/Utilities/Maple.Server_UDP_Listener_Sample/Program.cs b/Source/Utilities/Program.cs similarity index 96% rename from Source/Web.Maple.MapleServer/Utilities/Maple.Server_UDP_Listener_Sample/Program.cs rename to Source/Utilities/Program.cs index 08adb1a..70288ac 100644 --- a/Source/Web.Maple.MapleServer/Utilities/Maple.Server_UDP_Listener_Sample/Program.cs +++ b/Source/Utilities/Program.cs @@ -1,25 +1,25 @@ -using System.Net; -using System.Net.Sockets; -using System.Text; - -namespace Maple.Server_UDP_Listener_Sample -{ - class MainClass - { - const int MAPLE_SERVER_BROADCASTPORT = 17756; - - static void Main(string[] args) - { - UdpClient udpClient = new UdpClient(MAPLE_SERVER_BROADCASTPORT); - IPEndPoint RemoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0); - - while (true) - { - Byte[] receiveBytes = udpClient.Receive(ref RemoteIpEndPoint); - string returnData = Encoding.ASCII.GetString(receiveBytes); - Console.WriteLine(returnData); - } - - } - } +using System.Net; +using System.Net.Sockets; +using System.Text; + +namespace Maple.Server_UDP_Listener_Sample +{ + class MainClass + { + const int MAPLE_SERVER_BROADCASTPORT = 17756; + + static void Main(string[] args) + { + UdpClient udpClient = new UdpClient(MAPLE_SERVER_BROADCASTPORT); + IPEndPoint RemoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0); + + while (true) + { + Byte[] receiveBytes = udpClient.Receive(ref RemoteIpEndPoint); + string returnData = Encoding.ASCII.GetString(receiveBytes); + Console.WriteLine(returnData); + } + + } + } } \ No newline at end of file diff --git a/Source/Web.Maple.MapleClient/Driver/MapleClient.cs b/Source/Web.Maple.Client/MapleClient.cs similarity index 100% rename from Source/Web.Maple.MapleClient/Driver/MapleClient.cs rename to Source/Web.Maple.Client/MapleClient.cs diff --git a/Source/Web.Maple.MapleClient/Driver/ServerModel.cs b/Source/Web.Maple.Client/ServerModel.cs similarity index 100% rename from Source/Web.Maple.MapleClient/Driver/ServerModel.cs rename to Source/Web.Maple.Client/ServerModel.cs diff --git a/Source/Web.Maple.MapleClient/Driver/Web.Maple.MapleClient.csproj b/Source/Web.Maple.Client/Web.Maple.Client.csproj similarity index 92% rename from Source/Web.Maple.MapleClient/Driver/Web.Maple.MapleClient.csproj rename to Source/Web.Maple.Client/Web.Maple.Client.csproj index b9357ee..6291e6b 100644 --- a/Source/Web.Maple.MapleClient/Driver/Web.Maple.MapleClient.csproj +++ b/Source/Web.Maple.Client/Web.Maple.Client.csproj @@ -13,11 +13,11 @@ icon.png https://github.com/WildernessLabs/Meadow.Foundation Meadow, Meadow.Foundation, Web, Maple - 0.3.0 + 1.7.0 true Maple is an ultra-lightweight RESTful web API Server, built specifically for Meadow. It provides an easy to extend architecture, and has integrated JSON support via System.Text.Json. - + diff --git a/Source/Web.Maple.MapleClient/Sample/MapleClient_Sample/Program.cs b/Source/Web.Maple.Client_Sample/Program.cs similarity index 100% rename from Source/Web.Maple.MapleClient/Sample/MapleClient_Sample/Program.cs rename to Source/Web.Maple.Client_Sample/Program.cs diff --git a/Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/ServerConsole_Sample.csproj b/Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj similarity index 84% rename from Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/ServerConsole_Sample.csproj rename to Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj index 5f7e6ac..017ed1f 100644 --- a/Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/ServerConsole_Sample.csproj +++ b/Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj @@ -8,6 +8,6 @@ netcoreapp3.1 - + diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/ActionResult.cs b/Source/Web.Maple.Server/ActionResults/ActionResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/ActionResult.cs rename to Source/Web.Maple.Server/ActionResults/ActionResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/ContentResult.cs b/Source/Web.Maple.Server/ActionResults/ContentResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/ContentResult.cs rename to Source/Web.Maple.Server/ActionResults/ContentResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/FileContentResult.cs b/Source/Web.Maple.Server/ActionResults/FileContentResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/FileContentResult.cs rename to Source/Web.Maple.Server/ActionResults/FileContentResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/FileResult.cs b/Source/Web.Maple.Server/ActionResults/FileResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/FileResult.cs rename to Source/Web.Maple.Server/ActionResults/FileResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/FileStreamResult.cs b/Source/Web.Maple.Server/ActionResults/FileStreamResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/FileStreamResult.cs rename to Source/Web.Maple.Server/ActionResults/FileStreamResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/IActionResult.cs b/Source/Web.Maple.Server/ActionResults/IActionResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/IActionResult.cs rename to Source/Web.Maple.Server/ActionResults/IActionResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/IOutputFormatter.cs b/Source/Web.Maple.Server/ActionResults/IOutputFormatter.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/IOutputFormatter.cs rename to Source/Web.Maple.Server/ActionResults/IOutputFormatter.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/JsonOutputFormatter.cs b/Source/Web.Maple.Server/ActionResults/JsonOutputFormatter.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/JsonOutputFormatter.cs rename to Source/Web.Maple.Server/ActionResults/JsonOutputFormatter.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/JsonResult.cs b/Source/Web.Maple.Server/ActionResults/JsonResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/JsonResult.cs rename to Source/Web.Maple.Server/ActionResults/JsonResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/NotFoundResult.cs b/Source/Web.Maple.Server/ActionResults/NotFoundResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/NotFoundResult.cs rename to Source/Web.Maple.Server/ActionResults/NotFoundResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/ObjectResult.cs b/Source/Web.Maple.Server/ActionResults/ObjectResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/ObjectResult.cs rename to Source/Web.Maple.Server/ActionResults/ObjectResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/OkObjectResult.cs b/Source/Web.Maple.Server/ActionResults/OkObjectResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/OkObjectResult.cs rename to Source/Web.Maple.Server/ActionResults/OkObjectResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/OkResult.cs b/Source/Web.Maple.Server/ActionResults/OkResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/OkResult.cs rename to Source/Web.Maple.Server/ActionResults/OkResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/ServerErrorResult.cs b/Source/Web.Maple.Server/ActionResults/ServerErrorResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/ServerErrorResult.cs rename to Source/Web.Maple.Server/ActionResults/ServerErrorResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/StatusCodeResult.cs b/Source/Web.Maple.Server/ActionResults/StatusCodeResult.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/StatusCodeResult.cs rename to Source/Web.Maple.Server/ActionResults/StatusCodeResult.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ActionResults/TextOutputFormatter.cs b/Source/Web.Maple.Server/ActionResults/TextOutputFormatter.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ActionResults/TextOutputFormatter.cs rename to Source/Web.Maple.Server/ActionResults/TextOutputFormatter.cs diff --git a/Source/Web.Maple.MapleServer/Driver/AssemblyAttributes.cs b/Source/Web.Maple.Server/AssemblyAttributes.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/AssemblyAttributes.cs rename to Source/Web.Maple.Server/AssemblyAttributes.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Attributes/FromBody.cs b/Source/Web.Maple.Server/Attributes/FromBody.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Attributes/FromBody.cs rename to Source/Web.Maple.Server/Attributes/FromBody.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Attributes/FromQueryAttribute.cs b/Source/Web.Maple.Server/Attributes/FromQueryAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Attributes/FromQueryAttribute.cs rename to Source/Web.Maple.Server/Attributes/FromQueryAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ContentTypes.cs b/Source/Web.Maple.Server/ContentTypes.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ContentTypes.cs rename to Source/Web.Maple.Server/ContentTypes.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ErrorPageGenerator.cs b/Source/Web.Maple.Server/ErrorPageGenerator.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ErrorPageGenerator.cs rename to Source/Web.Maple.Server/ErrorPageGenerator.cs diff --git a/Source/Web.Maple.MapleServer/Driver/HttpUtility.cs b/Source/Web.Maple.Server/HttpUtility.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/HttpUtility.cs rename to Source/Web.Maple.Server/HttpUtility.cs diff --git a/Source/Web.Maple.MapleServer/Driver/IRequestHandler.cs b/Source/Web.Maple.Server/IRequestHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/IRequestHandler.cs rename to Source/Web.Maple.Server/IRequestHandler.cs diff --git a/Source/Web.Maple.MapleServer/Driver/MapleServer.cs b/Source/Web.Maple.Server/MapleServer.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/MapleServer.cs rename to Source/Web.Maple.Server/MapleServer.cs diff --git a/Source/Web.Maple.MapleServer/Driver/RequestHandlerBase.cs b/Source/Web.Maple.Server/RequestHandlerBase.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/RequestHandlerBase.cs rename to Source/Web.Maple.Server/RequestHandlerBase.cs diff --git a/Source/Web.Maple.MapleServer/Driver/RequestHandlerExtensions.cs b/Source/Web.Maple.Server/RequestHandlerExtensions.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/RequestHandlerExtensions.cs rename to Source/Web.Maple.Server/RequestHandlerExtensions.cs diff --git a/Source/Web.Maple.MapleServer/Driver/RequestMethodCache.cs b/Source/Web.Maple.Server/RequestMethodCache.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/RequestMethodCache.cs rename to Source/Web.Maple.Server/RequestMethodCache.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/HttpDeleteAttribute.cs b/Source/Web.Maple.Server/Routing/HttpDeleteAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/HttpDeleteAttribute.cs rename to Source/Web.Maple.Server/Routing/HttpDeleteAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/HttpGetAttribute.cs b/Source/Web.Maple.Server/Routing/HttpGetAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/HttpGetAttribute.cs rename to Source/Web.Maple.Server/Routing/HttpGetAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/HttpMethodAttribute.cs b/Source/Web.Maple.Server/Routing/HttpMethodAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/HttpMethodAttribute.cs rename to Source/Web.Maple.Server/Routing/HttpMethodAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/HttpPatchAttribute.cs b/Source/Web.Maple.Server/Routing/HttpPatchAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/HttpPatchAttribute.cs rename to Source/Web.Maple.Server/Routing/HttpPatchAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/HttpPostAttribute.cs b/Source/Web.Maple.Server/Routing/HttpPostAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/HttpPostAttribute.cs rename to Source/Web.Maple.Server/Routing/HttpPostAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/HttpPutAttribute.cs b/Source/Web.Maple.Server/Routing/HttpPutAttribute.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/HttpPutAttribute.cs rename to Source/Web.Maple.Server/Routing/HttpPutAttribute.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/IActionMethodHttpProvider.cs b/Source/Web.Maple.Server/Routing/IActionMethodHttpProvider.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/IActionMethodHttpProvider.cs rename to Source/Web.Maple.Server/Routing/IActionMethodHttpProvider.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Routing/IRouteTemplateProvider.cs b/Source/Web.Maple.Server/Routing/IRouteTemplateProvider.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/Routing/IRouteTemplateProvider.cs rename to Source/Web.Maple.Server/Routing/IRouteTemplateProvider.cs diff --git a/Source/Web.Maple.MapleServer/Driver/SimpleJson.cs b/Source/Web.Maple.Server/SimpleJson.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/SimpleJson.cs rename to Source/Web.Maple.Server/SimpleJson.cs diff --git a/Source/Web.Maple.MapleServer/Driver/ThreadingModeType.cs b/Source/Web.Maple.Server/ThreadingModeType.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Driver/ThreadingModeType.cs rename to Source/Web.Maple.Server/ThreadingModeType.cs diff --git a/Source/Web.Maple.MapleServer/Driver/Web.Maple.MapleServer.csproj b/Source/Web.Maple.Server/Web.Maple.Server.csproj similarity index 86% rename from Source/Web.Maple.MapleServer/Driver/Web.Maple.MapleServer.csproj rename to Source/Web.Maple.Server/Web.Maple.Server.csproj index 05c2693..f210516 100644 --- a/Source/Web.Maple.MapleServer/Driver/Web.Maple.MapleServer.csproj +++ b/Source/Web.Maple.Server/Web.Maple.Server.csproj @@ -10,10 +10,10 @@ icon.png https://github.com/WildernessLabs/Meadow.Foundation Meadow, Meadow.Foundation, Web, Maple, MapleServer - 1.0.0 + 1.7.0 true Maple is an ultra-lightweight RESTful web API Server, built specifically for embedded applications. It provides an easy-to-extend architecture based on ASP.NET Core and has integrated JSON support. - enable + enable Apache-2.0 @@ -21,9 +21,9 @@ 10.0 - + - + diff --git a/Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/Program.cs b/Source/Web.Maple.Server_Sample/Program.cs similarity index 96% rename from Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/Program.cs rename to Source/Web.Maple.Server_Sample/Program.cs index 3803679..7e8a1d6 100644 --- a/Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/Program.cs +++ b/Source/Web.Maple.Server_Sample/Program.cs @@ -32,7 +32,8 @@ public static void Main(string[] args) static IPAddress GetLocalIP() { IPAddress localIP; - using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0)) { + using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0)) + { socket.Connect("8.8.8.8", 65530); IPEndPoint endPoint = socket.LocalEndPoint as IPEndPoint; localIP = endPoint.Address; diff --git a/Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/RequestHandlers/HelloWorldRequestHandler.cs b/Source/Web.Maple.Server_Sample/RequestHandlers/HelloWorldRequestHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/RequestHandlers/HelloWorldRequestHandler.cs rename to Source/Web.Maple.Server_Sample/RequestHandlers/HelloWorldRequestHandler.cs diff --git a/Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/SensorHandler.cs b/Source/Web.Maple.Server_Sample/SensorHandler.cs similarity index 100% rename from Source/Web.Maple.MapleServer/Samples/ServerConsole_Sample/SensorHandler.cs rename to Source/Web.Maple.Server_Sample/SensorHandler.cs diff --git a/Source/Web.Maple.MapleClient/Sample/MapleClient_Sample/MapleClient_Sample.csproj b/Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj similarity index 84% rename from Source/Web.Maple.MapleClient/Sample/MapleClient_Sample/MapleClient_Sample.csproj rename to Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj index 1f0b025..98897a9 100644 --- a/Source/Web.Maple.MapleClient/Sample/MapleClient_Sample/MapleClient_Sample.csproj +++ b/Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj @@ -8,6 +8,6 @@ netcoreapp3.1 - +