From 91f14e3602df6a6503322dfd961ec84eb376f09b Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Wed, 30 Mar 2011 16:47:19 -0700
Subject: [PATCH] #17580: Looking for a new name for Orchard.Startup

Work Items: 17580

--HG--
branch : 1.x
---
 ...up.csproj => Orchard.WarmupStarter.csproj} |  4 ++--
 src/Orchard.Startup/Starter.cs                |  2 +-
 src/Orchard.Startup/WarmupHttpModule.cs       |  2 +-
 src/Orchard.Web/Global.asax.cs                |  2 +-
 src/Orchard.Web/Orchard.Web.csproj            | 22 ++++++-------------
 src/Orchard.Web/Web.config                    |  4 ++--
 src/Orchard.sln                               |  2 +-
 7 files changed, 15 insertions(+), 23 deletions(-)
 rename src/Orchard.Startup/{Orchard.Startup.csproj => Orchard.WarmupStarter.csproj} (93%)

diff --git a/src/Orchard.Startup/Orchard.Startup.csproj b/src/Orchard.Startup/Orchard.WarmupStarter.csproj
similarity index 93%
rename from src/Orchard.Startup/Orchard.Startup.csproj
rename to src/Orchard.Startup/Orchard.WarmupStarter.csproj
index 9bf053498..8a18085c4 100644
--- a/src/Orchard.Startup/Orchard.Startup.csproj
+++ b/src/Orchard.Startup/Orchard.WarmupStarter.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Startup</RootNamespace>
-    <AssemblyName>Orchard.Startup</AssemblyName>
+    <RootNamespace>Orchard.WarmupStarter</RootNamespace>
+    <AssemblyName>Orchard.WarmupStarter</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
diff --git a/src/Orchard.Startup/Starter.cs b/src/Orchard.Startup/Starter.cs
index cb8b4b3bc..6394e3459 100644
--- a/src/Orchard.Startup/Starter.cs
+++ b/src/Orchard.Startup/Starter.cs
@@ -4,7 +4,7 @@ using System.Web;
 using Autofac;
 using Orchard.Environment;
 
-namespace Orchard.Startup {
+namespace Orchard.WarmupStarter {
     public class Starter {
         private static IOrchardHost _host;
         private static Exception _error;
diff --git a/src/Orchard.Startup/WarmupHttpModule.cs b/src/Orchard.Startup/WarmupHttpModule.cs
index 89e6bea35..7106a7633 100644
--- a/src/Orchard.Startup/WarmupHttpModule.cs
+++ b/src/Orchard.Startup/WarmupHttpModule.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Web;
 using System.Web.Hosting;
 
-namespace Orchard.Startup {
+namespace Orchard.WarmupStarter {
     public class WarmupHttpModule : IHttpModule {
         private const string WarmupFilesPath = "~/App_Data/Warmup/";
         private HttpApplication _context;
diff --git a/src/Orchard.Web/Global.asax.cs b/src/Orchard.Web/Global.asax.cs
index 5340b164e..5a347f451 100644
--- a/src/Orchard.Web/Global.asax.cs
+++ b/src/Orchard.Web/Global.asax.cs
@@ -2,7 +2,7 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 using Autofac;
-using Orchard.Startup;
+using Orchard.WarmupStarter;
 
 namespace Orchard.Web {
     // Note: For instructions on enabling IIS6 or IIS7 classic mode, 
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 61dc56ef2..cbc73c759 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -144,9 +144,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Orchard.Startup\Orchard.Startup.csproj">
+    <ProjectReference Include="..\Orchard.Startup\Orchard.WarmupStarter.csproj">
       <Project>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</Project>
-      <Name>Orchard.Startup</Name>
+      <Name>Orchard.WarmupStarter</Name>
     </ProjectReference>
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
@@ -178,32 +178,24 @@
       CustomCollectFiles;    
       $(CopyAllFilesToSingleFolderForPackageDependsOn);  
     </CopyAllFilesToSingleFolderForPackageDependsOn>
-
   </PropertyGroup>
   <Target Name="CustomCollectFiles">
-     <ItemGroup>
-       <Orchard-Web-Bins Include="bin\*" />
-       <SqlCeBinariesx86 Include="..\..\lib\sqlce\x86\**\*" />
-       <SqlCeBinariesx64 Include="..\..\lib\sqlce\amd64\**\*" />  
-   
-      <_CustomFiles 
-        Include="Modules\**\*;Themes\**\*;Core\**\*;**\*.po" 
-        Exclude="**\obj\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;**\*.hg*" 
-        />
+    <ItemGroup>
+      <Orchard-Web-Bins Include="bin\*" />
+      <SqlCeBinariesx86 Include="..\..\lib\sqlce\x86\**\*" />
+      <SqlCeBinariesx64 Include="..\..\lib\sqlce\amd64\**\*" />
+      <_CustomFiles Include="Modules\**\*;Themes\**\*;Core\**\*;**\*.po" Exclude="**\obj\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;**\*.hg*" />
       <FilesForPackagingFromProject Include="%(_CustomFiles.Identity)">
         <DestinationRelativePath>%(RelativeDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
-      
       <_SqlCeBinariesx86Files Include="@(SqlCeBinariesx86);" />
       <FilesForPackagingFromProject Include="%(_SqlCeBinariesx86Files.Identity)">
         <DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
-
       <_SqlCeBinariesx64Files Include="@(SqlCeBinariesx64);" />
       <FilesForPackagingFromProject Include="%(_SqlCeBinariesx64Files.Identity)">
         <DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
-
     </ItemGroup>
   </Target>
   <Target Name="CopySqlCeBinaries">
diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config
index ef697fa7a..5bab3be97 100644
--- a/src/Orchard.Web/Web.config
+++ b/src/Orchard.Web/Web.config
@@ -122,7 +122,7 @@
     </httpHandlers>
 
     <httpModules>
-      <add name="WarmupHttpModule" type="Orchard.Startup.WarmupHttpModule, Orchard.Startup"/>
+      <add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.0.20, Culture=neutral"/>
     </httpModules>
   </system.web>
   <!-- 
@@ -134,7 +134,7 @@
     <validation validateIntegratedModeConfiguration="false" />
     <modules runAllManagedModulesForAllRequests="true">
       <remove name="WarmupHttpModule" />
-      <add name="WarmupHttpModule" type="Orchard.Startup.WarmupHttpModule, Orchard.Startup"/>
+      <add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.0.20, Culture=neutral"/>
     </modules>
     <handlers accessPolicy="Script">
       <!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
diff --git a/src/Orchard.sln b/src/Orchard.sln
index d3a5208d8..9faad6909 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -114,7 +114,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ImportExport", "Orc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Warmup", "Orchard.Web\Modules\Orchard.WarmUp\Orchard.Warmup.csproj", "{9CD5C81F-5828-4384-8474-2E2BE71D5EDD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Startup", "Orchard.Startup\Orchard.Startup.csproj", "{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.WarmupStarter", "Orchard.Startup\Orchard.WarmupStarter.csproj", "{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution