From b24d808b584f4e9b55c6588f83349b198fcd0877 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Mon, 30 Jun 2014 12:22:16 -0700
Subject: [PATCH] #10 - Rename Middleware package to Server.

---
 WebSockets.sln                                             | 4 ++--
 .../Microsoft.AspNet.WebSockets.Server.kproj}              | 0
 .../WebSocketMiddleware.cs                                 | 7 +++++--
 .../WebSocketMiddlewareExtensions.cs                       | 5 ++++-
 .../project.json                                           | 0
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename src/{Microsoft.AspNet.WebSockets.Middleware/Microsoft.AspNet.WebSockets.Middleware.kproj => Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.kproj} (100%)
 rename src/{Microsoft.AspNet.WebSockets.Middleware => Microsoft.AspNet.WebSockets.Server}/WebSocketMiddleware.cs (94%)
 rename src/{Microsoft.AspNet.WebSockets.Middleware => Microsoft.AspNet.WebSockets.Server}/WebSocketMiddlewareExtensions.cs (53%)
 rename src/{Microsoft.AspNet.WebSockets.Middleware => Microsoft.AspNet.WebSockets.Server}/project.json (100%)

diff --git a/WebSockets.sln b/WebSockets.sln
index fcae05ecd2..d17c4c30fe 100644
--- a/WebSockets.sln
+++ b/WebSockets.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.21730.1
+VisualStudioVersion = 14.0.21813.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "test\TestServer\TestServer.csproj", "{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}"
 EndProject
@@ -21,7 +21,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Client.Test", "test\Microsoft.AspNet.WebSockets.Client.Test\Microsoft.AspNet.WebSockets.Client.Test.kproj", "{6604D154-817F-4BC5-BE95-FF7E851179D9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Middleware", "src\Microsoft.AspNet.WebSockets.Middleware\Microsoft.AspNet.WebSockets.Middleware.kproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Server", "src\Microsoft.AspNet.WebSockets.Server\Microsoft.AspNet.WebSockets.Server.kproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Microsoft.AspNet.WebSockets.Middleware/Microsoft.AspNet.WebSockets.Middleware.kproj b/src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.kproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Middleware/Microsoft.AspNet.WebSockets.Middleware.kproj
rename to src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.kproj
diff --git a/src/Microsoft.AspNet.WebSockets.Middleware/WebSocketMiddleware.cs b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddleware.cs
similarity index 94%
rename from src/Microsoft.AspNet.WebSockets.Middleware/WebSocketMiddleware.cs
rename to src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddleware.cs
index 4407194370..44825a9897 100644
--- a/src/Microsoft.AspNet.WebSockets.Middleware/WebSocketMiddleware.cs
+++ b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddleware.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.WebSockets;
@@ -8,7 +11,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.WebSockets.Protocol;
 
-namespace Microsoft.AspNet.WebSockets.Middleware
+namespace Microsoft.AspNet.WebSockets.Server
 {
     public class WebSocketMiddleware
     {
diff --git a/src/Microsoft.AspNet.WebSockets.Middleware/WebSocketMiddlewareExtensions.cs b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs
similarity index 53%
rename from src/Microsoft.AspNet.WebSockets.Middleware/WebSocketMiddlewareExtensions.cs
rename to src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs
index ee0e3eb764..584ca3abc1 100644
--- a/src/Microsoft.AspNet.WebSockets.Middleware/WebSocketMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs
@@ -1,4 +1,7 @@
-using Microsoft.AspNet.WebSockets.Middleware;
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNet.WebSockets.Server;
 
 namespace Microsoft.AspNet.Builder
 {
diff --git a/src/Microsoft.AspNet.WebSockets.Middleware/project.json b/src/Microsoft.AspNet.WebSockets.Server/project.json
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Middleware/project.json
rename to src/Microsoft.AspNet.WebSockets.Server/project.json