From b97c0f06667a8cbd4f60d71c23916e12c75358a3 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Sat, 28 May 2011 20:45:51 -0700 Subject: [PATCH] Rename class to be more consistent with similar components --HG-- branch : 1.x rename : src/Orchard/FileSystems/Dependencies/DefaultModuleDependenciesManager.cs => src/Orchard/FileSystems/Dependencies/DefaultExtensionDependenciesManager.cs rename : src/Orchard/FileSystems/Dependencies/IModuleDependenciesManager.cs => src/Orchard/FileSystems/Dependencies/IExtensionDependenciesManager.cs --- .../Environment/Extensions/ExtensionLoaderCoordinator.cs | 8 ++++---- src/Orchard/Environment/OrchardStarter.cs | 2 +- ...sManager.cs => DefaultExtensionDependenciesManager.cs} | 4 ++-- ...denciesManager.cs => IExtensionDependenciesManager.cs} | 2 +- .../Dependencies/WebFormsExtensionsVirtualPathProvider.cs | 8 ++++---- .../Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs | 8 ++++---- src/Orchard/Orchard.Framework.csproj | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) rename src/Orchard/FileSystems/Dependencies/{DefaultModuleDependenciesManager.cs => DefaultExtensionDependenciesManager.cs} (94%) rename src/Orchard/FileSystems/Dependencies/{IModuleDependenciesManager.cs => IExtensionDependenciesManager.cs} (78%) diff --git a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs index 34c22c24f..5ce366676 100644 --- a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs +++ b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs @@ -14,7 +14,7 @@ using Orchard.Utility; namespace Orchard.Environment.Extensions { public class ExtensionLoaderCoordinator : IExtensionLoaderCoordinator { private readonly IDependenciesFolder _dependenciesFolder; - private readonly IModuleDependenciesManager _moduleDependenciesManager; + private readonly IExtensionDependenciesManager _extensionDependenciesManager; private readonly IExtensionManager _extensionManager; private readonly IVirtualPathProvider _virtualPathProvider; private readonly IVirtualPathMonitor _virtualPathMonitor; @@ -24,7 +24,7 @@ namespace Orchard.Environment.Extensions { public ExtensionLoaderCoordinator( IDependenciesFolder dependenciesFolder, - IModuleDependenciesManager moduleDependenciesManager, + IExtensionDependenciesManager extensionDependenciesManager, IExtensionManager extensionManager, IVirtualPathProvider virtualPathProvider, IVirtualPathMonitor virtualPathMonitor, @@ -33,7 +33,7 @@ namespace Orchard.Environment.Extensions { IBuildManager buildManager) { _dependenciesFolder = dependenciesFolder; - _moduleDependenciesManager = moduleDependenciesManager; + _extensionDependenciesManager = extensionDependenciesManager; _extensionManager = extensionManager; _virtualPathProvider = virtualPathProvider; _virtualPathMonitor = virtualPathMonitor; @@ -74,7 +74,7 @@ namespace Orchard.Environment.Extensions { // And finally save the new entries in the dependencies folder _dependenciesFolder.StoreDescriptors(context.NewDependencies); - _moduleDependenciesManager.StoreDependencies(context.NewDependencies); + _extensionDependenciesManager.StoreDependencies(context.NewDependencies); Logger.Information("Done loading extensions..."); diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs index 4f4d1c53e..6e94ae1bf 100644 --- a/src/Orchard/Environment/OrchardStarter.cs +++ b/src/Orchard/Environment/OrchardStarter.cs @@ -60,7 +60,7 @@ namespace Orchard.Environment { RegisterVolatileProvider(builder); RegisterVolatileProvider(builder); RegisterVolatileProvider(builder); - RegisterVolatileProvider(builder); + RegisterVolatileProvider(builder); RegisterVolatileProvider(builder); RegisterVolatileProvider(builder); RegisterVolatileProvider(builder); diff --git a/src/Orchard/FileSystems/Dependencies/DefaultModuleDependenciesManager.cs b/src/Orchard/FileSystems/Dependencies/DefaultExtensionDependenciesManager.cs similarity index 94% rename from src/Orchard/FileSystems/Dependencies/DefaultModuleDependenciesManager.cs rename to src/Orchard/FileSystems/Dependencies/DefaultExtensionDependenciesManager.cs index eb1907cf0..c8a646da1 100644 --- a/src/Orchard/FileSystems/Dependencies/DefaultModuleDependenciesManager.cs +++ b/src/Orchard/FileSystems/Dependencies/DefaultExtensionDependenciesManager.cs @@ -13,13 +13,13 @@ namespace Orchard.FileSystems.Dependencies { /// VirtualPath entry. This is so that if any virtual path reference in the file changes, /// the file stored by this component will also change. /// - public class DefaultModuleDependenciesManager : IModuleDependenciesManager { + public class DefaultExtensionDependenciesManager : IExtensionDependenciesManager { private readonly IAppDataFolder _appDataFolder; private readonly IVirtualPathProvider _virtualPathProvider; private const string BasePath = "Dependencies"; private const string FileName = "Dependencies.ModuleCompilation.xml"; - public DefaultModuleDependenciesManager(IAppDataFolder appDataFolder, IVirtualPathProvider virtualPathProvider) { + public DefaultExtensionDependenciesManager(IAppDataFolder appDataFolder, IVirtualPathProvider virtualPathProvider) { _appDataFolder = appDataFolder; _virtualPathProvider = virtualPathProvider; Logger = NullLogger.Instance; diff --git a/src/Orchard/FileSystems/Dependencies/IModuleDependenciesManager.cs b/src/Orchard/FileSystems/Dependencies/IExtensionDependenciesManager.cs similarity index 78% rename from src/Orchard/FileSystems/Dependencies/IModuleDependenciesManager.cs rename to src/Orchard/FileSystems/Dependencies/IExtensionDependenciesManager.cs index b183aebbe..403ab9a28 100644 --- a/src/Orchard/FileSystems/Dependencies/IModuleDependenciesManager.cs +++ b/src/Orchard/FileSystems/Dependencies/IExtensionDependenciesManager.cs @@ -2,7 +2,7 @@ using Orchard.Caching; namespace Orchard.FileSystems.Dependencies { - public interface IModuleDependenciesManager : IVolatileProvider { + public interface IExtensionDependenciesManager : IVolatileProvider { void StoreDependencies(IEnumerable dependencyDescriptors); IEnumerable GetVirtualPathDependencies(DependencyDescriptor descriptor); } diff --git a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs index a02a3cf5d..cb6045fe7 100644 --- a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs +++ b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs @@ -21,15 +21,15 @@ namespace Orchard.FileSystems.Dependencies { /// public class WebFormVirtualPathProvider : VirtualPathProvider, ICustomVirtualPathProvider { private readonly IDependenciesFolder _dependenciesFolder; - private readonly IModuleDependenciesManager _moduleDependenciesManager; + private readonly IExtensionDependenciesManager _extensionDependenciesManager; private readonly IEnumerable _loaders; private readonly string[] _modulesPrefixes = { "~/Modules/" }; private readonly string[] _themesPrefixes = { "~/Themes/" }; private readonly string[] _extensions = { ".ascx", ".aspx", ".master" }; - public WebFormVirtualPathProvider(IDependenciesFolder dependenciesFolder, IModuleDependenciesManager moduleDependenciesManager, IEnumerable loaders) { + public WebFormVirtualPathProvider(IDependenciesFolder dependenciesFolder, IExtensionDependenciesManager extensionDependenciesManager, IEnumerable loaders) { _dependenciesFolder = dependenciesFolder; - _moduleDependenciesManager = moduleDependenciesManager; + _extensionDependenciesManager = extensionDependenciesManager; _loaders = loaders; Logger = NullLogger.Instance; } @@ -62,7 +62,7 @@ namespace Orchard.FileSystems.Dependencies { var dependencies = virtualPathDependencies .OfType() - .Concat(file.Loaders.SelectMany(dl => _moduleDependenciesManager.GetVirtualPathDependencies(dl.Descriptor))) + .Concat(file.Loaders.SelectMany(dl => _extensionDependenciesManager.GetVirtualPathDependencies(dl.Descriptor))) .Distinct(StringComparer.OrdinalIgnoreCase) .ToList(); diff --git a/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs b/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs index 573b3b9db..5577285ab 100644 --- a/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs +++ b/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs @@ -27,20 +27,20 @@ namespace Orchard.Mvc.ViewEngines.Razor { /// public class DefaultRazorCompilationEvents : IRazorCompilationEvents { private readonly IDependenciesFolder _dependenciesFolder; - private readonly IModuleDependenciesManager _moduleDependenciesManager; + private readonly IExtensionDependenciesManager _extensionDependenciesManager; private readonly IBuildManager _buildManager; private readonly IEnumerable _loaders; private readonly IAssemblyLoader _assemblyLoader; public DefaultRazorCompilationEvents( IDependenciesFolder dependenciesFolder, - IModuleDependenciesManager moduleDependenciesManager, + IExtensionDependenciesManager extensionDependenciesManager, IBuildManager buildManager, IEnumerable loaders, IAssemblyLoader assemblyLoader) { _dependenciesFolder = dependenciesFolder; - _moduleDependenciesManager = moduleDependenciesManager; + _extensionDependenciesManager = extensionDependenciesManager; _buildManager = buildManager; _loaders = loaders; _assemblyLoader = assemblyLoader; @@ -77,7 +77,7 @@ namespace Orchard.Mvc.ViewEngines.Razor { loader, descriptor, references = loader.GetCompilationReferences(descriptor), - dependencies = _moduleDependenciesManager.GetVirtualPathDependencies(descriptor) + dependencies = _extensionDependenciesManager.GetVirtualPathDependencies(descriptor) })); // Add assemblies diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 379e3a4ac..885e238a8 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -193,8 +193,8 @@ - - + +