lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename class to be more consistent with similar components

Browse Source 
--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
This commit is contained in:
Renaud Paquay
2011-05-28 20:45:51 -07:00
parent ec7e44db4f
commit b97c0f0666
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
View File

@@ -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...");

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

@@ -60,7 +60,7 @@ namespace Orchard.Environment {
RegisterVolatileProvider<DefaultLockFileManager, ILockFileManager>(builder);
RegisterVolatileProvider<Clock, IClock>(builder);
RegisterVolatileProvider<DefaultDependenciesFolder, IDependenciesFolder>(builder);
RegisterVolatileProvider<DefaultModuleDependenciesManager, IModuleDependenciesManager>(builder);
RegisterVolatileProvider<DefaultExtensionDependenciesManager, IExtensionDependenciesManager>(builder);
RegisterVolatileProvider<DefaultAssemblyProbingFolder, IAssemblyProbingFolder>(builder);
RegisterVolatileProvider<DefaultVirtualPathMonitor, IVirtualPathMonitor>(builder);
RegisterVolatileProvider<DefaultVirtualPathProvider, IVirtualPathProvider>(builder);

4
src/Orchard/FileSystems/Dependencies/DefaultModuleDependenciesManager.cs → src/Orchard/FileSystems/Dependencies/DefaultExtensionDependenciesManager.cs
View File

@@ -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.
/// </summary>
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;

2
src/Orchard/FileSystems/Dependencies/IModuleDependenciesManager.cs → src/Orchard/FileSystems/Dependencies/IExtensionDependenciesManager.cs
View File

@@ -2,7 +2,7 @@
using Orchard.Caching;
namespace Orchard.FileSystems.Dependencies {
public interface IModuleDependenciesManager : IVolatileProvider {
public interface IExtensionDependenciesManager : IVolatileProvider {
void StoreDependencies(IEnumerable<DependencyDescriptor> dependencyDescriptors);
IEnumerable<string> GetVirtualPathDependencies(DependencyDescriptor descriptor);
}

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

@@ -21,15 +21,15 @@ namespace Orchard.FileSystems.Dependencies {
/// </summary>
public class WebFormVirtualPathProvider : VirtualPathProvider, ICustomVirtualPathProvider {
private readonly IDependenciesFolder _dependenciesFolder;
private readonly IModuleDependenciesManager _moduleDependenciesManager;
private readonly IExtensionDependenciesManager _extensionDependenciesManager;
private readonly IEnumerable<IExtensionLoader> _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<IExtensionLoader> loaders) {
public WebFormVirtualPathProvider(IDependenciesFolder dependenciesFolder, IExtensionDependenciesManager extensionDependenciesManager, IEnumerable<IExtensionLoader> loaders) {
_dependenciesFolder = dependenciesFolder;
_moduleDependenciesManager = moduleDependenciesManager;
_extensionDependenciesManager = extensionDependenciesManager;
_loaders = loaders;
Logger = NullLogger.Instance;
}
@@ -62,7 +62,7 @@ namespace Orchard.FileSystems.Dependencies {
var dependencies =
virtualPathDependencies
.OfType<string>()
.Concat(file.Loaders.SelectMany(dl => _moduleDependenciesManager.GetVirtualPathDependencies(dl.Descriptor)))
.Concat(file.Loaders.SelectMany(dl => _extensionDependenciesManager.GetVirtualPathDependencies(dl.Descriptor)))
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();

8
src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs
View File

@@ -27,20 +27,20 @@ namespace Orchard.Mvc.ViewEngines.Razor {
/// </summary>
public class DefaultRazorCompilationEvents : IRazorCompilationEvents {
private readonly IDependenciesFolder _dependenciesFolder;
private readonly IModuleDependenciesManager _moduleDependenciesManager;
private readonly IExtensionDependenciesManager _extensionDependenciesManager;
private readonly IBuildManager _buildManager;
private readonly IEnumerable<IExtensionLoader> _loaders;
private readonly IAssemblyLoader _assemblyLoader;
public DefaultRazorCompilationEvents(
IDependenciesFolder dependenciesFolder,
IModuleDependenciesManager moduleDependenciesManager,
IExtensionDependenciesManager extensionDependenciesManager,
IBuildManager buildManager,
IEnumerable<IExtensionLoader> 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

4
src/Orchard/Orchard.Framework.csproj
View File

@@ -193,8 +193,8 @@
<Compile Include="Environment\WorkContextImplementation.cs" />
<Compile Include="Environment\WorkContextModule.cs" />
<Compile Include="Environment\WorkContextProperty.cs" />
<Compile Include="FileSystems\Dependencies\IModuleDependenciesManager.cs" />
<Compile Include="FileSystems\Dependencies\DefaultModuleDependenciesManager.cs" />
<Compile Include="FileSystems\Dependencies\IExtensionDependenciesManager.cs" />
<Compile Include="FileSystems\Dependencies\DefaultExtensionDependenciesManager.cs" />
<Compile Include="FileSystems\LockFile\ILockFile.cs" />
<Compile Include="FileSystems\LockFile\ILockFileManager.cs" />
<Compile Include="FileSystems\LockFile\LockFile.cs" />