diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs index f5527bb79..9c576aecc 100644 --- a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs +++ b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs @@ -64,11 +64,11 @@ namespace Orchard.Tests.Environment.Extensions { return new ExtensionEntry { Descriptor = descriptor, ExportedTypes = new[] { typeof(Alpha), typeof(Beta), typeof(Phi) } }; } - public void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { throw new NotImplementedException(); } - public void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { throw new NotImplementedException(); } diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs index 6b1ecc127..92e6c1e61 100644 --- a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs +++ b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs @@ -63,11 +63,11 @@ namespace Orchard.Tests.Environment.Extensions { return new ExtensionEntry { Descriptor = descriptor, ExportedTypes = new[] { typeof(Alpha), typeof(Beta), typeof(Phi) } }; } - public void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { throw new NotImplementedException(); } - public void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { throw new NotImplementedException(); } diff --git a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs index 2f65e88c9..24fb9d0f2 100644 --- a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs +++ b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs @@ -58,8 +58,7 @@ namespace Orchard.Environment.Extensions { // load that extension. var newDependencies = new List(); foreach (var extension in extensions) { - bool isNewExtension = newExtensions.Any(e => e.Name == extension.Name); - ProcessExtension(ctx, extension, isNewExtension, existingDependencies, newDependencies); + ProcessExtension(ctx, extension, existingDependencies, newDependencies); } // Execute all the work need by "ctx" @@ -71,9 +70,8 @@ namespace Orchard.Environment.Extensions { } private void ProcessExtension( - ExtensionLoadingContext ctx, + ExtensionLoadingContext loadingContext, ExtensionDescriptor extension, - bool isNewExtension, IEnumerable existingDependencies, List newDependencies) { @@ -98,17 +96,17 @@ namespace Orchard.Environment.Extensions { var previousDependency = existingDependencies.Where(d => d.Name == extension.Name).FirstOrDefault(); if (activatedExtension == null) { - Logger.Warning("No loader found for extension {0}!", extension.Name); + Logger.Warning("No loader found for extension \"{0}\"!", extension.Name); } foreach (var loader in _loaders) { if (activatedExtension != null && activatedExtension.Loader.Name == loader.Name) { Logger.Information("Activating extension \"{0}\" with loader \"{1}\"", activatedExtension.Descriptor.Name, loader.Name); - loader.ExtensionActivated(ctx, isNewExtension, extension); + loader.ExtensionActivated(loadingContext, extension); } else if (previousDependency != null && previousDependency.LoaderName == loader.Name) { Logger.Information("Deactivating extension \"{0}\" from loader \"{1}\"", previousDependency.Name, loader.Name); - loader.ExtensionDeactivated(ctx, isNewExtension, extension); + loader.ExtensionDeactivated(loadingContext, extension); } } @@ -132,12 +130,12 @@ namespace Orchard.Environment.Extensions { } if (ctx.RestartAppDomain) { - Logger.Information("AppDomain restart required."); + Logger.Information("AppDomain restart required."); _hostEnvironment.RestartAppDomain(); } if (ctx.ResetSiteCompilation) { - Logger.Information("Reset site compilation state required."); + Logger.Information("Reset site compilation state required."); _hostEnvironment.ResetSiteCompilation(); } } diff --git a/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs b/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs index 987ebfc6d..3c4847c95 100644 --- a/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs +++ b/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs @@ -26,8 +26,8 @@ namespace Orchard.Environment.Extensions.Loaders { return null; } - public virtual void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { } - public virtual void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { } + public virtual void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { } + public virtual void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { } public virtual void ExtensionRemoved(ExtensionLoadingContext ctx, DependencyDescriptor dependency) { } public virtual void Monitor(ExtensionDescriptor extension, Action monitor) { } diff --git a/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs index 501e62488..2f2bd8765 100644 --- a/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs @@ -19,8 +19,8 @@ namespace Orchard.Environment.Extensions.Loaders { ExtensionProbeEntry Probe(ExtensionDescriptor descriptor); ExtensionEntry Load(ExtensionDescriptor descriptor); - void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension); - void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension); + void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension); + void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension); void ExtensionRemoved(ExtensionLoadingContext ctx, DependencyDescriptor dependency); void Monitor(ExtensionDescriptor extension, Action monitor); diff --git a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs index 3baceaecd..d4a62c7b9 100644 --- a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs @@ -55,7 +55,7 @@ namespace Orchard.Environment.Extensions.Loaders { } } - public override void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public override void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { string sourceFileName = _virtualPathProvider.MapPath(GetAssemblyPath(extension)); // Copy the assembly if it doesn't exist or if it is older than the source file. @@ -73,7 +73,7 @@ namespace Orchard.Environment.Extensions.Loaders { } } - public override void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public override void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { if (_assemblyProbingFolder.AssemblyExists(extension.Name)) { ctx.DeleteActions.Add(() => _assemblyProbingFolder.DeleteAssembly(extension.Name)); diff --git a/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs index 78483312c..2e82bc78a 100644 --- a/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs @@ -45,7 +45,7 @@ namespace Orchard.Environment.Extensions.Loaders { } } - public override void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public override void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { if (_assemblyProbingFolder.AssemblyExists(extension.Name)) { ctx.DeleteActions.Add(() => _assemblyProbingFolder.DeleteAssembly(extension.Name)); diff --git a/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs index a80ef22b8..7651acef3 100644 --- a/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs @@ -28,7 +28,7 @@ namespace Orchard.Environment.Extensions.Loaders { public override int Order { get { return 20; } } - public override void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { + public override void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { var assemblyPath = _virtualPathProvider.Combine("~/bin", extension.Name + ".dll"); if (_virtualPathProvider.FileExists(assemblyPath)) { ctx.DeleteActions.Add(() => File.Delete(_virtualPathProvider.MapPath(assemblyPath)));