mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
#17580: Looking for a new name for Orchard.Startup
Work Items: 17580 --HG-- branch : 1.x
This commit is contained in:
@@ -8,8 +8,8 @@
|
|||||||
<ProjectGuid>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</ProjectGuid>
|
<ProjectGuid>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</ProjectGuid>
|
||||||
<OutputType>Library</OutputType>
|
<OutputType>Library</OutputType>
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Orchard.Startup</RootNamespace>
|
<RootNamespace>Orchard.WarmupStarter</RootNamespace>
|
||||||
<AssemblyName>Orchard.Startup</AssemblyName>
|
<AssemblyName>Orchard.WarmupStarter</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
@@ -4,7 +4,7 @@ using System.Web;
|
|||||||
using Autofac;
|
using Autofac;
|
||||||
using Orchard.Environment;
|
using Orchard.Environment;
|
||||||
|
|
||||||
namespace Orchard.Startup {
|
namespace Orchard.WarmupStarter {
|
||||||
public class Starter {
|
public class Starter {
|
||||||
private static IOrchardHost _host;
|
private static IOrchardHost _host;
|
||||||
private static Exception _error;
|
private static Exception _error;
|
||||||
|
@@ -6,7 +6,7 @@ using System.Threading;
|
|||||||
using System.Web;
|
using System.Web;
|
||||||
using System.Web.Hosting;
|
using System.Web.Hosting;
|
||||||
|
|
||||||
namespace Orchard.Startup {
|
namespace Orchard.WarmupStarter {
|
||||||
public class WarmupHttpModule : IHttpModule {
|
public class WarmupHttpModule : IHttpModule {
|
||||||
private const string WarmupFilesPath = "~/App_Data/Warmup/";
|
private const string WarmupFilesPath = "~/App_Data/Warmup/";
|
||||||
private HttpApplication _context;
|
private HttpApplication _context;
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
using System.Web.Mvc;
|
using System.Web.Mvc;
|
||||||
using System.Web.Routing;
|
using System.Web.Routing;
|
||||||
using Autofac;
|
using Autofac;
|
||||||
using Orchard.Startup;
|
using Orchard.WarmupStarter;
|
||||||
|
|
||||||
namespace Orchard.Web {
|
namespace Orchard.Web {
|
||||||
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
|
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
|
||||||
|
@@ -144,9 +144,9 @@
|
|||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Orchard.Startup\Orchard.Startup.csproj">
|
<ProjectReference Include="..\Orchard.Startup\Orchard.WarmupStarter.csproj">
|
||||||
<Project>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</Project>
|
<Project>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</Project>
|
||||||
<Name>Orchard.Startup</Name>
|
<Name>Orchard.WarmupStarter</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
|
<ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
|
||||||
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
|
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
|
||||||
@@ -178,32 +178,24 @@
|
|||||||
CustomCollectFiles;
|
CustomCollectFiles;
|
||||||
$(CopyAllFilesToSingleFolderForPackageDependsOn);
|
$(CopyAllFilesToSingleFolderForPackageDependsOn);
|
||||||
</CopyAllFilesToSingleFolderForPackageDependsOn>
|
</CopyAllFilesToSingleFolderForPackageDependsOn>
|
||||||
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Target Name="CustomCollectFiles">
|
<Target Name="CustomCollectFiles">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Orchard-Web-Bins Include="bin\*" />
|
<Orchard-Web-Bins Include="bin\*" />
|
||||||
<SqlCeBinariesx86 Include="..\..\lib\sqlce\x86\**\*" />
|
<SqlCeBinariesx86 Include="..\..\lib\sqlce\x86\**\*" />
|
||||||
<SqlCeBinariesx64 Include="..\..\lib\sqlce\amd64\**\*" />
|
<SqlCeBinariesx64 Include="..\..\lib\sqlce\amd64\**\*" />
|
||||||
|
<_CustomFiles Include="Modules\**\*;Themes\**\*;Core\**\*;**\*.po" Exclude="**\obj\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;**\*.hg*" />
|
||||||
<_CustomFiles
|
|
||||||
Include="Modules\**\*;Themes\**\*;Core\**\*;**\*.po"
|
|
||||||
Exclude="**\obj\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;**\*.hg*"
|
|
||||||
/>
|
|
||||||
<FilesForPackagingFromProject Include="%(_CustomFiles.Identity)">
|
<FilesForPackagingFromProject Include="%(_CustomFiles.Identity)">
|
||||||
<DestinationRelativePath>%(RelativeDir)%(Filename)%(Extension)</DestinationRelativePath>
|
<DestinationRelativePath>%(RelativeDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||||
</FilesForPackagingFromProject>
|
</FilesForPackagingFromProject>
|
||||||
|
|
||||||
<_SqlCeBinariesx86Files Include="@(SqlCeBinariesx86);" />
|
<_SqlCeBinariesx86Files Include="@(SqlCeBinariesx86);" />
|
||||||
<FilesForPackagingFromProject Include="%(_SqlCeBinariesx86Files.Identity)">
|
<FilesForPackagingFromProject Include="%(_SqlCeBinariesx86Files.Identity)">
|
||||||
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||||
</FilesForPackagingFromProject>
|
</FilesForPackagingFromProject>
|
||||||
|
|
||||||
<_SqlCeBinariesx64Files Include="@(SqlCeBinariesx64);" />
|
<_SqlCeBinariesx64Files Include="@(SqlCeBinariesx64);" />
|
||||||
<FilesForPackagingFromProject Include="%(_SqlCeBinariesx64Files.Identity)">
|
<FilesForPackagingFromProject Include="%(_SqlCeBinariesx64Files.Identity)">
|
||||||
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||||
</FilesForPackagingFromProject>
|
</FilesForPackagingFromProject>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="CopySqlCeBinaries">
|
<Target Name="CopySqlCeBinaries">
|
||||||
|
@@ -122,7 +122,7 @@
|
|||||||
</httpHandlers>
|
</httpHandlers>
|
||||||
|
|
||||||
<httpModules>
|
<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>
|
</httpModules>
|
||||||
</system.web>
|
</system.web>
|
||||||
<!--
|
<!--
|
||||||
@@ -134,7 +134,7 @@
|
|||||||
<validation validateIntegratedModeConfiguration="false" />
|
<validation validateIntegratedModeConfiguration="false" />
|
||||||
<modules runAllManagedModulesForAllRequests="true">
|
<modules runAllManagedModulesForAllRequests="true">
|
||||||
<remove name="WarmupHttpModule" />
|
<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>
|
</modules>
|
||||||
<handlers accessPolicy="Script">
|
<handlers accessPolicy="Script">
|
||||||
<!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
|
<!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
|
||||||
|
@@ -114,7 +114,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ImportExport", "Orc
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Warmup", "Orchard.Web\Modules\Orchard.WarmUp\Orchard.Warmup.csproj", "{9CD5C81F-5828-4384-8474-2E2BE71D5EDD}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Warmup", "Orchard.Web\Modules\Orchard.WarmUp\Orchard.Warmup.csproj", "{9CD5C81F-5828-4384-8474-2E2BE71D5EDD}"
|
||||||
EndProject
|
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
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Reference in New Issue
Block a user