lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Renames...

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-03 12:28:23 -07:00
parent 23521a1d5b
commit 0fa27bb6d6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard/Environment/OrchardStarter.cs
View File

@@ -36,7 +36,7 @@ namespace Orchard.Environment {
builder.RegisterType<DefaultCacheHolder>().As<ICacheHolder>().SingleInstance();
builder.RegisterType<DefaultHostEnvironment>().As<IHostEnvironment>().SingleInstance();
builder.RegisterType<DefaultBuildManager>().As<IBuildManager>().SingleInstance();
builder.RegisterType<WebFormsExtensionsVirtualPathProvider>().As<ICustomVirtualPathProvider>().SingleInstance();
builder.RegisterType<WebFormVirtualPathProvider>().As<ICustomVirtualPathProvider>().SingleInstance();
builder.RegisterType<AppDataFolderRoot>().As<IAppDataFolderRoot>().SingleInstance();
builder.RegisterType<DefaultExtensionCompiler>().As<IExtensionCompiler>().SingleInstance();
builder.RegisterType<DefaultProjectFileParser>().As<IProjectFileParser>().SingleInstance();

6
src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualFile.cs
View File

@@ -1,12 +1,12 @@
using System.IO;
using System.IO;
using System.Web.Hosting;
namespace Orchard.FileSystems.Dependencies {
public class WebFormsExtensionsVirtualFile : VirtualFile {
public class WebFormVirtualFile : VirtualFile {
private readonly VirtualFile _actualFile;
private readonly string _assemblyDirective;
public WebFormsExtensionsVirtualFile(string virtualPath, VirtualFile actualFile, string assemblyDirective)
public WebFormVirtualFile(string virtualPath, VirtualFile actualFile, string assemblyDirective)
: base(virtualPath) {
_actualFile = actualFile;
_assemblyDirective = assemblyDirective;

10
src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs
View File

@@ -8,14 +8,14 @@ using Orchard.FileSystems.VirtualPath;
using Orchard.Logging;
namespace Orchard.FileSystems.Dependencies {
public class WebFormsExtensionsVirtualPathProvider : VirtualPathProvider, ICustomVirtualPathProvider {
public class WebFormVirtualPathProvider : VirtualPathProvider, ICustomVirtualPathProvider {
private readonly IDependenciesFolder _dependenciesFolder;
private readonly IEnumerable<IExtensionLoader> _loaders;
private readonly string[] _modulesPrefixes = { "~/Modules/", "/Modules/" };
private readonly string[] _themesPrefixes = { "~/Themes/", "/Themes/" };
private readonly string[] _extensions = { ".ascx", ".aspx", ".master" };
public WebFormsExtensionsVirtualPathProvider(IDependenciesFolder dependenciesFolder, IEnumerable<IExtensionLoader> loaders) {
public WebFormVirtualPathProvider(IDependenciesFolder dependenciesFolder, IEnumerable<IExtensionLoader> loaders) {
_dependenciesFolder = dependenciesFolder;
_loaders = loaders;
Logger = NullLogger.Instance;
@@ -31,7 +31,7 @@ namespace Orchard.FileSystems.Dependencies {
return Previous.FileExists(virtualPath);
}
public override string GetFileHash(string virtualPath, System.Collections.IEnumerable virtualPathDependencies) {
public override string GetFileHash(string virtualPath, IEnumerable virtualPathDependencies) {
var result = GetFileHashWorker(virtualPath, virtualPathDependencies);
Logger.Information("GetFileHash(\"{0}\"): {1}", virtualPath, result);
return result;
@@ -80,7 +80,7 @@ namespace Orchard.FileSystems.Dependencies {
Logger.Debug(" Assembly directive: {0}", file.Directive);
}
return new WebFormsExtensionsVirtualFile(virtualPath, actualFile, file.Directive);
return new WebFormVirtualFile(virtualPath, actualFile, file.Directive);
}
private VirtualFile GetThemeCustomVirtualFile(string virtualPath, VirtualFile actualFile) {
@@ -94,7 +94,7 @@ namespace Orchard.FileSystems.Dependencies {
Logger.Debug(" Assembly directive: {0}", file.Directive);
}
return new WebFormsExtensionsVirtualFile(virtualPath, actualFile, file.Directive);
return new WebFormVirtualFile(virtualPath, actualFile, file.Directive);
}
private VirtualFileOverride GetModuleVirtualOverride(string virtualPath) {