lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#17580: Looking for a new name for Orchard.Startup

Browse Source 
Work Items: 17580

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-03-30 16:47:19 -07:00
parent f14193ccd4
commit 91f14e3602
7 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Startup/Orchard.Startup.csproj → src/Orchard.Startup/Orchard.WarmupStarter.csproj
View File

@@ -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>

2
src/Orchard.Startup/Starter.cs
View File

@@ -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;

2
src/Orchard.Startup/WarmupHttpModule.cs
View File

@@ -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;

2
src/Orchard.Web/Global.asax.cs
View File

@@ -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,

22
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -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">

4
src/Orchard.Web/Web.config
View File

@@ -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 -->

2
src/Orchard.sln
View File

@@ -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