From cd0fcadaa1750b3c5603a7910f5d85f746bcce9c Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Fri, 7 Sep 2012 13:39:50 -0700 Subject: [PATCH] Renaming and packaging Katana.Server.HttpListener becomes Microsoft.HttpListener.Owin Adding ASL2 license and readme --- Katana.sln | 9 +- LICENSE.txt | 177 ++++++++++++++ NOTICE.txt | 5 + README.md | 3 + .../Katana.Sample.HelloWorld.csproj | 4 +- .../Katana.Sample.SelfhostWebSockets.csproj | 4 +- ... Microsoft.HttpListener.Owin.Tests.csproj} | 230 +++++++++--------- .../OwinHttpListenerRequestTests.cs | 3 +- .../OwinHttpListenerResponseTests.cs | 3 +- .../OwinHttpListenerTests.cs | 3 +- .../OwinWebSocketTests.cs | 3 +- .../Constants.cs | 2 +- .../ExceptionFilterStream.cs | 2 +- .../HeadersDictionaryBase.cs | 2 +- .../HttpListenerExtensions.cs | 4 +- .../HttpListenerStreamWrapper.cs | 2 +- .../Katana.Server.HttpListener.nuspec | 20 -- ...roj => Microsoft.HttpListener.Owin.csproj} | 150 ++++++------ .../Microsoft.HttpListener.Owin.nuspec | 20 ++ .../OwinHttpListener.cs | 2 +- .../OwinHttpListenerRequest.cs | 2 +- .../OwinHttpListenerResponse.cs | 2 +- .../RequestHeadersDictionary.cs | 2 +- .../RequestLifetimeMonitor.cs | 2 +- .../ResponseHeadersDictionary.cs | 2 +- .../ServerFactory.cs | 4 +- .../Microsoft.AspNet.Owin.nuspec | 14 +- 27 files changed, 431 insertions(+), 245 deletions(-) create mode 100644 LICENSE.txt create mode 100644 NOTICE.txt create mode 100644 README.md rename src/Katana.Server.HttpListener.Tests/{Katana.Server.HttpListener.Tests.csproj => Microsoft.HttpListener.Owin.Tests.csproj} (94%) delete mode 100644 src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.nuspec rename src/Katana.Server.HttpListenerWrapper/{Katana.Server.HttpListener.csproj => Microsoft.HttpListener.Owin.csproj} (92%) create mode 100644 src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.nuspec diff --git a/Katana.sln b/Katana.sln index a97f711b..b664a54f 100644 --- a/Katana.sln +++ b/Katana.sln @@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{D425FDFA-90FC-4276-8CBD-2850E8D78656}" + ProjectSection(SolutionItems) = preProject + LICENSE.txt = LICENSE.txt + NOTICE.txt = NOTICE.txt + README.md = README.md + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{69D0ABFE-1C8A-4CFD-AF3A-D71445AEE6BF}" ProjectSection(SolutionItems) = preProject @@ -24,11 +29,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.WebApi.Owi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.WebApi.Owin.Tests", "src\Microsoft.AspNet.WebApi.Owin.Tests\Microsoft.AspNet.WebApi.Owin.Tests.csproj", "{311DF219-244B-4A21-AF09-F594E8235877}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katana.Server.HttpListener", "src\Katana.Server.HttpListenerWrapper\Katana.Server.HttpListener.csproj", "{452C45C7-57A5-4161-BF7D-C1CD5AD4BB84}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.HttpListener.Owin", "src\Katana.Server.HttpListenerWrapper\Microsoft.HttpListener.Owin.csproj", "{452C45C7-57A5-4161-BF7D-C1CD5AD4BB84}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katana.Sample.HelloWorld", "src\Katana.Sample.HelloWorld\Katana.Sample.HelloWorld.csproj", "{94023771-3B1D-4157-B2A4-E27930445F67}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katana.Server.HttpListener.Tests", "src\Katana.Server.HttpListener.Tests\Katana.Server.HttpListener.Tests.csproj", "{A8FB7DCB-3370-4D2F-B41A-63C89D281A51}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.HttpListener.Owin.Tests", "src\Katana.Server.HttpListener.Tests\Microsoft.HttpListener.Owin.Tests.csproj", "{A8FB7DCB-3370-4D2F-B41A-63C89D281A51}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katana.Server.DotNetWebSockets", "src\Katana.Server.DotNetWebSockets\Katana.Server.DotNetWebSockets.csproj", "{1FBD6DF1-9794-48F3-A7F9-1FDDE580240B}" EndProject diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..f433b1a5 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 00000000..98d936d0 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,5 @@ +Katana - Tools for .NET web development (http://katanaproject.codeplex.com/) +Copyright 2012 Katana Contributors + +[[The remainder of the NOTICE file is to be used for required third-party notices.]] + diff --git a/README.md b/README.md new file mode 100644 index 00000000..98a33fc7 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Katana + +Tools for .NET web development. diff --git a/src/Katana.Sample.HelloWorld/Katana.Sample.HelloWorld.csproj b/src/Katana.Sample.HelloWorld/Katana.Sample.HelloWorld.csproj index cc31f8a2..8d60f15d 100644 --- a/src/Katana.Sample.HelloWorld/Katana.Sample.HelloWorld.csproj +++ b/src/Katana.Sample.HelloWorld/Katana.Sample.HelloWorld.csproj @@ -90,9 +90,9 @@ {c225eb2e-e7a7-463f-b058-1705f204978e} Katana.Engine - + {452c45c7-57a5-4161-bf7d-c1cd5ad4bb84} - Katana.Server.HttpListener + Microsoft.HttpListener.Owin {80d03986-6128-4614-8715-c7e86bd16513} diff --git a/src/Katana.Sample.SelfhostWebSockets/Katana.Sample.SelfhostWebSockets.csproj b/src/Katana.Sample.SelfhostWebSockets/Katana.Sample.SelfhostWebSockets.csproj index 79b498b7..f95299f3 100644 --- a/src/Katana.Sample.SelfhostWebSockets/Katana.Sample.SelfhostWebSockets.csproj +++ b/src/Katana.Sample.SelfhostWebSockets/Katana.Sample.SelfhostWebSockets.csproj @@ -79,9 +79,9 @@ {1fbd6df1-9794-48f3-a7f9-1fdde580240b} Katana.Server.DotNetWebSockets - + {452c45c7-57a5-4161-bf7d-c1cd5ad4bb84} - Katana.Server.HttpListener + Microsoft.HttpListener.Owin diff --git a/src/Katana.Server.HttpListener.Tests/Katana.Server.HttpListener.Tests.csproj b/src/Katana.Server.HttpListener.Tests/Microsoft.HttpListener.Owin.Tests.csproj similarity index 94% rename from src/Katana.Server.HttpListener.Tests/Katana.Server.HttpListener.Tests.csproj rename to src/Katana.Server.HttpListener.Tests/Microsoft.HttpListener.Owin.Tests.csproj index d9fe25f4..9a7e659b 100644 --- a/src/Katana.Server.HttpListener.Tests/Katana.Server.HttpListener.Tests.csproj +++ b/src/Katana.Server.HttpListener.Tests/Microsoft.HttpListener.Owin.Tests.csproj @@ -1,116 +1,116 @@ - - - - Debug - AnyCPU - {A8FB7DCB-3370-4D2F-B41A-63C89D281A51} - Library - Properties - Katana.Server.HttpListener.Tests - Katana.Server.HttpListener.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - ..\..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll - - - - - - False - ..\..\packages\xunit.1.9.1\lib\net20\xunit.dll - - - - - - - - - - - - - - - - - DictionaryExtensions.cs - - - - - - - - - - - - {1fbd6df1-9794-48f3-a7f9-1fdde580240b} - Katana.Server.DotNetWebSockets - - - {452c45c7-57a5-4161-bf7d-c1cd5ad4bb84} - Katana.Server.HttpListener - - - - - - - - - - False - - - False - - - False - - - False - - - - - - - - + + + + Debug + AnyCPU + {A8FB7DCB-3370-4D2F-B41A-63C89D281A51} + Library + Properties + Microsoft.HttpListener.Owin.Tests + Microsoft.HttpListener.Owin.Tests + v4.5 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + ..\..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll + + + + + + False + ..\..\packages\xunit.1.9.1\lib\net20\xunit.dll + + + + + + + + + + + + + + + + + DictionaryExtensions.cs + + + + + + + + + + + + {1fbd6df1-9794-48f3-a7f9-1fdde580240b} + Katana.Server.DotNetWebSockets + + + {452c45c7-57a5-4161-bf7d-c1cd5ad4bb84} + Microsoft.HttpListener.Owin + + + + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file diff --git a/src/Katana.Server.HttpListener.Tests/OwinHttpListenerRequestTests.cs b/src/Katana.Server.HttpListener.Tests/OwinHttpListenerRequestTests.cs index 276f3872..3b1b7aed 100644 --- a/src/Katana.Server.HttpListener.Tests/OwinHttpListenerRequestTests.cs +++ b/src/Katana.Server.HttpListener.Tests/OwinHttpListenerRequestTests.cs @@ -4,14 +4,13 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListener.Tests +namespace Microsoft.HttpListener.Owin.Tests { using System; using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Threading.Tasks; - using Katana.Server.HttpListenerWrapper; using Microsoft.VisualStudio.TestTools.UnitTesting; // TODO: Convert to XUnit? diff --git a/src/Katana.Server.HttpListener.Tests/OwinHttpListenerResponseTests.cs b/src/Katana.Server.HttpListener.Tests/OwinHttpListenerResponseTests.cs index 237cb945..b5b9a347 100644 --- a/src/Katana.Server.HttpListener.Tests/OwinHttpListenerResponseTests.cs +++ b/src/Katana.Server.HttpListener.Tests/OwinHttpListenerResponseTests.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListener.Tests +namespace Microsoft.HttpListener.Owin.Tests { using System; using System.Collections.Generic; @@ -12,7 +12,6 @@ namespace Katana.Server.HttpListener.Tests using System.Net; using System.Net.Http; using System.Threading.Tasks; - using Katana.Server.HttpListenerWrapper; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.IO; diff --git a/src/Katana.Server.HttpListener.Tests/OwinHttpListenerTests.cs b/src/Katana.Server.HttpListener.Tests/OwinHttpListenerTests.cs index b45d7aab..d2de084b 100644 --- a/src/Katana.Server.HttpListener.Tests/OwinHttpListenerTests.cs +++ b/src/Katana.Server.HttpListener.Tests/OwinHttpListenerTests.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListener.Tests +namespace Microsoft.HttpListener.Owin.Tests { using System; using System.Collections.Generic; @@ -13,7 +13,6 @@ namespace Katana.Server.HttpListener.Tests using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; - using Katana.Server.HttpListenerWrapper; using Microsoft.VisualStudio.TestTools.UnitTesting; using AppFunc = System.Func, System.Threading.Tasks.Task>; diff --git a/src/Katana.Server.HttpListener.Tests/OwinWebSocketTests.cs b/src/Katana.Server.HttpListener.Tests/OwinWebSocketTests.cs index a8cf528b..dfadf776 100644 --- a/src/Katana.Server.HttpListener.Tests/OwinWebSocketTests.cs +++ b/src/Katana.Server.HttpListener.Tests/OwinWebSocketTests.cs @@ -4,12 +4,11 @@ using System.Net.WebSockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Katana.Server.HttpListenerWrapper; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Linq; using Katana.Server.DotNetWebSockets; -namespace Katana.Server.HttpListener.Tests +namespace Microsoft.HttpListener.Owin.Tests { using WebSocketFunc = Func diff --git a/src/Katana.Server.HttpListenerWrapper/Constants.cs b/src/Katana.Server.HttpListenerWrapper/Constants.cs index 97bc3937..3cab00e2 100644 --- a/src/Katana.Server.HttpListenerWrapper/Constants.cs +++ b/src/Katana.Server.HttpListenerWrapper/Constants.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { /// /// Standard keys and values for use within the OWIN interfaces diff --git a/src/Katana.Server.HttpListenerWrapper/ExceptionFilterStream.cs b/src/Katana.Server.HttpListenerWrapper/ExceptionFilterStream.cs index 428e61e0..1aede96d 100644 --- a/src/Katana.Server.HttpListenerWrapper/ExceptionFilterStream.cs +++ b/src/Katana.Server.HttpListenerWrapper/ExceptionFilterStream.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Diagnostics.Contracts; diff --git a/src/Katana.Server.HttpListenerWrapper/HeadersDictionaryBase.cs b/src/Katana.Server.HttpListenerWrapper/HeadersDictionaryBase.cs index 74cc8793..f332a772 100644 --- a/src/Katana.Server.HttpListenerWrapper/HeadersDictionaryBase.cs +++ b/src/Katana.Server.HttpListenerWrapper/HeadersDictionaryBase.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Net; using System.Text; -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { internal abstract class HeadersDictionaryBase : IDictionary { diff --git a/src/Katana.Server.HttpListenerWrapper/HttpListenerExtensions.cs b/src/Katana.Server.HttpListenerWrapper/HttpListenerExtensions.cs index 588724a5..e1cd7c38 100644 --- a/src/Katana.Server.HttpListenerWrapper/HttpListenerExtensions.cs +++ b/src/Katana.Server.HttpListenerWrapper/HttpListenerExtensions.cs @@ -6,11 +6,11 @@ using System.Text; using System.Threading.Tasks; using System.Security.Cryptography.X509Certificates; -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { public static class HttpListenerExtensions { - public static Task GetContextAsync(this HttpListener listener) + public static Task GetContextAsync(this System.Net.HttpListener listener) { return Task.Factory.FromAsync(listener.BeginGetContext, listener.EndGetContext, null); } diff --git a/src/Katana.Server.HttpListenerWrapper/HttpListenerStreamWrapper.cs b/src/Katana.Server.HttpListenerWrapper/HttpListenerStreamWrapper.cs index 7d26d694..a822fe4f 100644 --- a/src/Katana.Server.HttpListenerWrapper/HttpListenerStreamWrapper.cs +++ b/src/Katana.Server.HttpListenerWrapper/HttpListenerStreamWrapper.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.IO; diff --git a/src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.nuspec b/src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.nuspec deleted file mode 100644 index 5dfe57c0..00000000 --- a/src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.nuspec +++ /dev/null @@ -1,20 +0,0 @@ - - - - $id$ - $version$ - $authors$ - $authors$ - - false - OWIN HttpListener - - - - - - \ No newline at end of file diff --git a/src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.csproj b/src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.csproj similarity index 92% rename from src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.csproj rename to src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.csproj index 6bd45e4a..bb89a715 100644 --- a/src/Katana.Server.HttpListenerWrapper/Katana.Server.HttpListener.csproj +++ b/src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.csproj @@ -1,76 +1,76 @@ - - - - - Debug - AnyCPU - {452C45C7-57A5-4161-BF7D-C1CD5AD4BB84} - Library - Properties - Katana.Server.HttpListenerWrapper - Katana.Server.HttpListener - v4.0 - 512 - ..\..\ - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {452C45C7-57A5-4161-BF7D-C1CD5AD4BB84} + Library + Properties + Microsoft.HttpListener.Owin + Microsoft.HttpListener.Owin + v4.0 + 512 + ..\..\ + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.nuspec b/src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.nuspec new file mode 100644 index 00000000..4ef6e051 --- /dev/null +++ b/src/Katana.Server.HttpListenerWrapper/Microsoft.HttpListener.Owin.nuspec @@ -0,0 +1,20 @@ + + + + $id$ + $version$ + $authors$ + $authors$ + http://katanaproject.codeplex.com/license + http://katanaproject.codeplex.com/ + + false + OWIN HttpListener + + Copyright 2012 Katana Contributors + + + + + + \ No newline at end of file diff --git a/src/Katana.Server.HttpListenerWrapper/OwinHttpListener.cs b/src/Katana.Server.HttpListenerWrapper/OwinHttpListener.cs index 80fdca16..d01d11e3 100644 --- a/src/Katana.Server.HttpListenerWrapper/OwinHttpListener.cs +++ b/src/Katana.Server.HttpListenerWrapper/OwinHttpListener.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Collections.Generic; diff --git a/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerRequest.cs b/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerRequest.cs index 965fa74f..a5681cd7 100644 --- a/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerRequest.cs +++ b/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerRequest.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Collections.Generic; diff --git a/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerResponse.cs b/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerResponse.cs index 7bd0bbe5..9eeea1fb 100644 --- a/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerResponse.cs +++ b/src/Katana.Server.HttpListenerWrapper/OwinHttpListenerResponse.cs @@ -5,7 +5,7 @@ //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Collections.Generic; diff --git a/src/Katana.Server.HttpListenerWrapper/RequestHeadersDictionary.cs b/src/Katana.Server.HttpListenerWrapper/RequestHeadersDictionary.cs index 1a7228dc..c76b9136 100644 --- a/src/Katana.Server.HttpListenerWrapper/RequestHeadersDictionary.cs +++ b/src/Katana.Server.HttpListenerWrapper/RequestHeadersDictionary.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Collections; diff --git a/src/Katana.Server.HttpListenerWrapper/RequestLifetimeMonitor.cs b/src/Katana.Server.HttpListenerWrapper/RequestLifetimeMonitor.cs index 1d17fa7e..2870618e 100644 --- a/src/Katana.Server.HttpListenerWrapper/RequestLifetimeMonitor.cs +++ b/src/Katana.Server.HttpListenerWrapper/RequestLifetimeMonitor.cs @@ -4,7 +4,7 @@ // //----------------------------------------------------------------------- -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Diagnostics; diff --git a/src/Katana.Server.HttpListenerWrapper/ResponseHeadersDictionary.cs b/src/Katana.Server.HttpListenerWrapper/ResponseHeadersDictionary.cs index b1d6d675..5be90d0c 100644 --- a/src/Katana.Server.HttpListenerWrapper/ResponseHeadersDictionary.cs +++ b/src/Katana.Server.HttpListenerWrapper/ResponseHeadersDictionary.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Net; using System.Text; -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { // This class exposes the response headers collection as a mutable dictionary, and re-maps restricted headers // to their associated properties. diff --git a/src/Katana.Server.HttpListenerWrapper/ServerFactory.cs b/src/Katana.Server.HttpListenerWrapper/ServerFactory.cs index aaeea721..2c90a63f 100644 --- a/src/Katana.Server.HttpListenerWrapper/ServerFactory.cs +++ b/src/Katana.Server.HttpListenerWrapper/ServerFactory.cs @@ -4,9 +4,9 @@ // //----------------------------------------------------------------------- -[assembly: Katana.Server.HttpListenerWrapper.ServerFactory] +[assembly: Microsoft.HttpListener.Owin.ServerFactory] -namespace Katana.Server.HttpListenerWrapper +namespace Microsoft.HttpListener.Owin { using System; using System.Collections.Generic; diff --git a/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.nuspec b/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.nuspec index 1a33fb3e..9b49e3cb 100644 --- a/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.nuspec +++ b/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.nuspec @@ -5,16 +5,16 @@ $version$ $authors$ $authors$ - + http://katanaproject.codeplex.com/license + http://katanaproject.codeplex.com/ + false Microsoft ASP.NET hosting for OWIN - + + Copyright 2012 Katana Contributors + - +