diff --git a/src/Orchard.5.0.ReSharper b/src/Orchard.5.0.ReSharper index 73a205d2f..470d2dcf2 100644 --- a/src/Orchard.5.0.ReSharper +++ b/src/Orchard.5.0.ReSharper @@ -10,6 +10,7 @@ False END_OF_LINE END_OF_LINE + TOGETHER ALWAYS_ADD ALWAYS_ADD ALWAYS_ADD diff --git a/src/Orchard.Specs/Bindings/WebAppHosting.cs b/src/Orchard.Specs/Bindings/WebAppHosting.cs index 3d98e163e..622bc5eef 100644 --- a/src/Orchard.Specs/Bindings/WebAppHosting.cs +++ b/src/Orchard.Specs/Bindings/WebAppHosting.cs @@ -169,7 +169,7 @@ namespace Orchard.Specs.Bindings { foreach (var row in table.Rows) { var r = row; - var input = inputs.First(x => x.GetAttributeValue("name", x.GetAttributeValue("id", "")) == r["name"]); + var input = inputs.FirstOrDefault(x => x.GetAttributeValue("name", x.GetAttributeValue("id", "")) == r["name"]); Assert.That(input, Is.Not.Null, "Unable to locate name {0} in page html:\r\n\r\n{1}", r["name"], Details.ResponseText); var inputType = input.GetAttributeValue("type", ""); switch(inputType) { diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 4ca4f89c1..a9c886fc1 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -52,6 +52,7 @@ prompt 4 AllRules.ruleset + x86 diff --git a/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs b/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs index 4ba054eb7..2324dfdd7 100644 --- a/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs +++ b/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs @@ -147,7 +147,7 @@ namespace Orchard.Tests.Modules.Settings.Topology { [Test] public void ManagerReturnsStateForFeaturesInDescriptor() { var descriptorManager = _container.Resolve(); - var stateManager = _container.Resolve(); + var stateManager = _container.Resolve(); var state = stateManager.GetShellState(); Assert.That(state.Features.Count(), Is.EqualTo(0)); descriptorManager.UpdateShellDescriptor( diff --git a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs index 2761d2971..0a8a4c6ce 100644 --- a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs +++ b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs @@ -9,24 +9,20 @@ using Orchard.Environment.Topology.Models; using Orchard.Events; using Orchard.Tests.Utility; -namespace Orchard.Tests.Environment.State -{ +namespace Orchard.Tests.Environment.State { [TestFixture] - public class DefaultProcessingEngineTests - { + public class DefaultProcessingEngineTests { private IContainer _container; private ShellContext _shellContext; [SetUp] - public void Init() - { + public void Init() { var builder = new ContainerBuilder(); builder.RegisterType().As(); builder.RegisterAutoMocking(); _container = builder.Build(); - _shellContext = new ShellContext - { + _shellContext = new ShellContext { Descriptor = new ShellDescriptor(), Settings = new ShellSettings(), LifetimeScope = _container.BeginLifetimeScope(), @@ -39,16 +35,14 @@ namespace Orchard.Tests.Environment.State } [Test] - public void NoTasksPendingByDefault() - { + public void NoTasksPendingByDefault() { var engine = _container.Resolve(); var pending = engine.AreTasksPending(); Assert.That(pending, Is.False); } [Test] - public void ExecuteTaskIsSafeToCallWhenItDoesNothing() - { + public void ExecuteTaskIsSafeToCallWhenItDoesNothing() { var engine = _container.Resolve(); var pending1 = engine.AreTasksPending(); engine.ExecuteNextTask(); @@ -58,11 +52,10 @@ namespace Orchard.Tests.Environment.State } [Test] - public void CallingAddTaskReturnsResultIdentifierAndCausesPendingToBeTrue() - { + public void CallingAddTaskReturnsResultIdentifierAndCausesPendingToBeTrue() { var engine = _container.Resolve(); var pending1 = engine.AreTasksPending(); - var resultId = engine.AddTask(null, null, null, null); + var resultId = engine.AddTask(new ShellSettings {Name = "Default"}, null, null, null); var pending2 = engine.AreTasksPending(); Assert.That(pending1, Is.False); Assert.That(resultId, Is.Not.Null); @@ -71,10 +64,9 @@ namespace Orchard.Tests.Environment.State } [Test] - public void CallingExecuteCausesEventToFireAndPendingFlagToBeCleared() - { + public void CallingExecuteCausesEventToFireAndPendingFlagToBeCleared() { _container.Mock() - .Setup(x => x.Notify(It.IsAny(), It.IsAny>())); + .Setup(x => x.Notify(It.IsAny(), It.IsAny>())); var engine = _container.Resolve(); var pending1 = engine.AreTasksPending(); diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index c1025c5c0..cb1d41974 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -52,6 +52,7 @@ prompt 4 AllRules.ruleset + x86 diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx index d39d7cc8d..18093dde3 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx @@ -1,3 +1,2 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Common.ViewModels"%> - \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 81dcac881..c5cc66580 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -133,7 +133,7 @@ - + diff --git a/src/Orchard.Web/Core/Settings/State/ShellStateProvider.cs b/src/Orchard.Web/Core/Settings/State/ShellStateManager.cs similarity index 95% rename from src/Orchard.Web/Core/Settings/State/ShellStateProvider.cs rename to src/Orchard.Web/Core/Settings/State/ShellStateManager.cs index 8bacd4aac..01cd15c7e 100644 --- a/src/Orchard.Web/Core/Settings/State/ShellStateProvider.cs +++ b/src/Orchard.Web/Core/Settings/State/ShellStateManager.cs @@ -7,11 +7,11 @@ using Orchard.Environment.Topology; using Orchard.Logging; namespace Orchard.Core.Settings.State { - public class ShellStateProvider : Component, IShellStateProvider { + public class ShellStateManager : Component, IShellStateManager { private readonly IRepository _shellStateRepository; private readonly IShellDescriptorManager _shellDescriptorManager; - public ShellStateProvider( + public ShellStateManager( IRepository shellStateRepository, IShellDescriptorManager shellDescriptorManager) { _shellStateRepository = shellStateRepository; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Routing/BlogSlugConstraintUpdator.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Routing/BlogSlugConstraintUpdator.cs index 879379d7e..bb9abf7cb 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Routing/BlogSlugConstraintUpdator.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Routing/BlogSlugConstraintUpdator.cs @@ -1,12 +1,12 @@ using System.Linq; using JetBrains.Annotations; using Orchard.Blogs.Services; -using Orchard.Environment.Extensions; +using Orchard.Environment; using Orchard.Tasks; namespace Orchard.Blogs.Routing { [UsedImplicitly] - public class BlogSlugConstraintUpdator : ExtensionManagerEvents, IBackgroundTask { + public class BlogSlugConstraintUpdator : IOrchardShellEvents, IBackgroundTask { private readonly IBlogSlugConstraint _blogSlugConstraint; private readonly IBlogService _blogService; @@ -14,14 +14,15 @@ namespace Orchard.Blogs.Routing { _blogSlugConstraint = blogSlugConstraint; _blogService = blogService; } - - public override void Activated(ExtensionEventContext context) { - if (context.Extension.Descriptor.Name == "Orchard.Blogs") { - Refresh(); - } + + void IOrchardShellEvents.Activated() { + Refresh(); } - public void Sweep() { + void IOrchardShellEvents.Terminating() { + } + + void IBackgroundTask.Sweep() { Refresh(); } diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Routing/PageSlugConstraintUpdator.cs b/src/Orchard.Web/Modules/Orchard.Pages/Routing/PageSlugConstraintUpdator.cs index dd6dcdfe2..bf22b1c8e 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Routing/PageSlugConstraintUpdator.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Routing/PageSlugConstraintUpdator.cs @@ -1,12 +1,12 @@ using System.Linq; using JetBrains.Annotations; -using Orchard.Environment.Extensions; +using Orchard.Environment; using Orchard.Pages.Services; using Orchard.Tasks; namespace Orchard.Pages.Routing { [UsedImplicitly] - public class PageSlugConstraintUpdator : ExtensionManagerEvents, IBackgroundTask { + public class PageSlugConstraintUpdator : IOrchardShellEvents, IBackgroundTask { private readonly IPageSlugConstraint _pageSlugConstraint; private readonly IPageService _pageService; @@ -15,18 +15,20 @@ namespace Orchard.Pages.Routing { _pageService = pageService; } - public override void Activated(ExtensionEventContext context) { - if (context.Extension.Descriptor.Name == "Orchard.Pages") { - Refresh(); - } + void IOrchardShellEvents.Activated() { + Refresh(); } - public void Sweep() { + void IOrchardShellEvents.Terminating() { + } + + void IBackgroundTask.Sweep() { Refresh(); } private void Refresh() { _pageSlugConstraint.SetSlugs(_pageService.Get(PageStatus.Published).Select(p => p.Slug)); } + } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Extension.cs b/src/Orchard.Web/Modules/Orchard.Roles/DefaultRoleUpdater.cs similarity index 77% rename from src/Orchard.Web/Modules/Orchard.Roles/Extension.cs rename to src/Orchard.Web/Modules/Orchard.Roles/DefaultRoleUpdater.cs index f353119ab..f7a4d2b6a 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Extension.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/DefaultRoleUpdater.cs @@ -1,18 +1,19 @@ using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Orchard.Environment.Extensions; +using Orchard.Environment; +using Orchard.Environment.Extensions.Models; using Orchard.Logging; using Orchard.Roles.Services; using Orchard.Security.Permissions; namespace Orchard.Roles { [UsedImplicitly] - public class Extension : ExtensionManagerEvents { + public class DefaultRoleUpdater : IFeatureEventHandler { private readonly IRoleService _roleService; private readonly IEnumerable _permissionProviders; - public Extension( + public DefaultRoleUpdater( IRoleService roleService, IEnumerable permissionProviders) { _roleService = roleService; @@ -23,18 +24,27 @@ namespace Orchard.Roles { public ILogger Logger { get; set; } - public override void Enabled(ExtensionEventContext context) { - var extensionDisplayName = context.Extension.Descriptor.DisplayName ?? context.Extension.Descriptor.Name; + void IFeatureEventHandler.Install(Feature feature) { + AddDefaultRolesForFeature(feature); + } + + void IFeatureEventHandler.Enable(Feature feature) {} + + void IFeatureEventHandler.Disable(Feature feature) {} + + void IFeatureEventHandler.Uninstall(Feature feature) {} + + public void AddDefaultRolesForFeature(Feature feature) { + var featureName = feature.Descriptor.Name; // when another module is being enabled, locate matching permission providers - var providersForEnabledModule = - _permissionProviders.Where(x => x.ModuleName == extensionDisplayName); + var providersForEnabledModule = _permissionProviders.Where(x => x.ModuleName == featureName); if (providersForEnabledModule.Any()) { - Logger.Debug("Configuring default roles for module {0}", extensionDisplayName); + Logger.Debug("Configuring default roles for module {0}", featureName); } else { - Logger.Debug("No default roles for module {0}", extensionDisplayName); + Logger.Debug("No default roles for module {0}", featureName); } foreach (var permissionProvider in providersForEnabledModule) { diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index 71908c00b..671501046 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -68,7 +68,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj index c3e010436..54b613b8f 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj @@ -80,7 +80,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 740d1b40c..5495ae7a8 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -132,9 +132,10 @@ namespace Orchard.Setup.Services { var contentManager = environment.Resolve(); + // this needs to exit the standalone environment? rework this process entirely? // simulate installation-time module activation events - var hackInstallationGenerator = environment.Resolve(); - hackInstallationGenerator.GenerateInstallEvents(); + //var hackInstallationGenerator = environment.Resolve(); + //hackInstallationGenerator.GenerateInstallEvents(); // create home page as a CMS page var page = contentManager.Create("page", VersionOptions.Draft); diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs index 28425b688..42bafdd02 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs @@ -45,7 +45,6 @@ namespace Orchard.Setup { builder.RegisterType().As().InstancePerLifetimeScope(); // setup mode specific implementations of needed service interfaces - builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().InstancePerLifetimeScope(); @@ -88,10 +87,6 @@ namespace Orchard.Setup { public void UninstallTheme(string themeName) { } } - class NullHackInstallationGenerator : IHackInstallationGenerator { - public void GenerateInstallEvents() { } - public void GenerateActivateEvents() { } - } class SafeModeSiteService : ISiteService { public ISite GetSiteSettings() { diff --git a/src/Orchard/Environment/Extensions/HackInstallationGenerator.cs b/src/Orchard/Environment/Extensions/HackInstallationGenerator.cs deleted file mode 100644 index 78e10deff..000000000 --- a/src/Orchard/Environment/Extensions/HackInstallationGenerator.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Collections.Generic; -using Orchard.Logging; -using Orchard.Utility.Extensions; - -namespace Orchard.Environment.Extensions { - public interface IHackInstallationGenerator : IDependency { - void GenerateInstallEvents(); - void GenerateActivateEvents(); - } - - public class HackInstallationGenerator : IHackInstallationGenerator { - private readonly IExtensionManager _extensionManager; - private readonly IEnumerable _extensionEvents; - - public HackInstallationGenerator( - IExtensionManager extensionManager, - IEnumerable extensionEvents) { - _extensionManager = extensionManager; - _extensionEvents = extensionEvents; - Logger = NullLogger.Instance; - } - - public ILogger Logger { get; set; } - - public void GenerateInstallEvents() { - //TEMP: this is really part of the extension manager's job. an extension - // install event is being simulated here on each web app startup - var enabled = new List(); - foreach (var extension in _extensionManager.ActiveExtensions_Obsolete()) { - var context = new ExtensionEventContext { - Extension = extension, - EnabledExtensions = enabled.ToReadOnlyCollection(), - }; - _extensionEvents.Invoke(x => x.Enabling(context), Logger); - enabled.Add(extension); - context.EnabledExtensions = enabled.ToReadOnlyCollection(); - _extensionEvents.Invoke(x => x.Enabled(context), Logger); - } - } - - public void GenerateActivateEvents() { - //TEMP: This is really part of the extension manager's job. - var extensions = _extensionManager.ActiveExtensions_Obsolete().ToReadOnlyCollection(); - foreach (var extension in extensions) { - var context = new ExtensionEventContext { - Extension = extension, - EnabledExtensions = extensions, - }; - _extensionEvents.Invoke(x => x.Activating(context), Logger); - _extensionEvents.Invoke(x => x.Activated(context), Logger); - } - } - } -} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/IExtensionManagerEvents.cs b/src/Orchard/Environment/Extensions/IExtensionManagerEvents.cs deleted file mode 100644 index b2368af52..000000000 --- a/src/Orchard/Environment/Extensions/IExtensionManagerEvents.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections.Generic; - -namespace Orchard.Environment.Extensions { - public interface IExtensionManagerEvents : IEvents { - void Enabling(ExtensionEventContext context); - void Enabled(ExtensionEventContext context); - void Disabling(ExtensionEventContext context); - void Disabled(ExtensionEventContext context); - void Activating(ExtensionEventContext context); - void Activated(ExtensionEventContext context); - void Deactivating(ExtensionEventContext context); - void Deactivated(ExtensionEventContext context); - } - - public abstract class ExtensionManagerEvents : IExtensionManagerEvents { - public virtual void Enabling(ExtensionEventContext context) { } - public virtual void Enabled(ExtensionEventContext context) { } - public virtual void Disabling(ExtensionEventContext context) {} - public virtual void Disabled(ExtensionEventContext context) {} - public virtual void Activating(ExtensionEventContext context) {} - public virtual void Activated(ExtensionEventContext context) {} - public virtual void Deactivating(ExtensionEventContext context) {} - public virtual void Deactivated(ExtensionEventContext context) {} - } - - public class ExtensionEventContext { - public ExtensionEntry Extension { get; set; } - public IEnumerable EnabledExtensions { get; set; } - } -} \ No newline at end of file diff --git a/src/Orchard/Environment/State/IShellStateProvider.cs b/src/Orchard/Environment/State/IShellStateManager.cs similarity index 83% rename from src/Orchard/Environment/State/IShellStateProvider.cs rename to src/Orchard/Environment/State/IShellStateManager.cs index 366eea763..df8fafe65 100644 --- a/src/Orchard/Environment/State/IShellStateProvider.cs +++ b/src/Orchard/Environment/State/IShellStateManager.cs @@ -1,7 +1,7 @@ using Orchard.Environment.State.Models; namespace Orchard.Environment.State { - public interface IShellStateProvider : IDependency { + public interface IShellStateManager : IDependency { ShellState GetShellState(); void UpdateEnabledState(ShellFeatureState featureState, ShellFeatureState.State value); void UpdateInstalledState(ShellFeatureState featureState, ShellFeatureState.State value); diff --git a/src/Orchard/Environment/State/Models/ShellState.cs b/src/Orchard/Environment/State/Models/ShellState.cs index 40250ef06..f600dd190 100644 --- a/src/Orchard/Environment/State/Models/ShellState.cs +++ b/src/Orchard/Environment/State/Models/ShellState.cs @@ -17,7 +17,6 @@ namespace Orchard.Environment.State.Models { public bool IsInstalled { get { return InstallState == State.Up; } } public bool IsEnabled { get { return EnableState == State.Up; } } public bool IsDisabled { get { return EnableState == State.Down || EnableState == State.Undefined; } } - public bool IsUninstalled { get { return InstallState == State.Down || InstallState == State.Undefined; } } public enum State { Undefined, diff --git a/src/Orchard/Environment/State/ShellStateManager.cs b/src/Orchard/Environment/State/ShellStateCoordinator.cs similarity index 86% rename from src/Orchard/Environment/State/ShellStateManager.cs rename to src/Orchard/Environment/State/ShellStateCoordinator.cs index cc8fa3325..1ef1d1854 100644 --- a/src/Orchard/Environment/State/ShellStateManager.cs +++ b/src/Orchard/Environment/State/ShellStateCoordinator.cs @@ -9,21 +9,21 @@ using Orchard.Environment.Topology; using Orchard.Environment.Topology.Models; namespace Orchard.Environment.State { - public class ShellStateManager : IShellStateManagerEventHandler, IShellDescriptorManagerEventHandler { + public class ShellStateCoordinator : IShellStateManagerEventHandler, IShellDescriptorManagerEventHandler { private readonly ShellSettings _settings; - private readonly IShellStateProvider _stateProvider; + private readonly IShellStateManager _stateManager; private readonly IExtensionManager _extensionManager; private readonly IProcessingEngine _processingEngine; private readonly IFeatureEventHandler _featureEvents; - public ShellStateManager( + public ShellStateCoordinator( ShellSettings settings, - IShellStateProvider stateProvider, + IShellStateManager stateManager, IExtensionManager extensionManager, IProcessingEngine processingEngine, IFeatureEventHandler featureEvents) { _settings = settings; - _stateProvider = stateProvider; + _stateManager = stateManager; _extensionManager = extensionManager; _processingEngine = processingEngine; _featureEvents = featureEvents; @@ -31,7 +31,7 @@ namespace Orchard.Environment.State { void IShellDescriptorManagerEventHandler.Changed(ShellDescriptor descriptor) { // deduce and apply state changes involved - var shellState = _stateProvider.GetShellState(); + var shellState = _stateManager.GetShellState(); foreach (var feature in descriptor.Features) { var featureName = feature.Name; var featureState = shellState.Features.SingleOrDefault(f => f.Name == featureName); @@ -42,10 +42,10 @@ namespace Orchard.Environment.State { shellState.Features = shellState.Features.Concat(new[] { featureState }); } if (!featureState.IsInstalled) { - _stateProvider.UpdateInstalledState(featureState, ShellFeatureState.State.Rising); + _stateManager.UpdateInstalledState(featureState, ShellFeatureState.State.Rising); } if (!featureState.IsEnabled) { - _stateProvider.UpdateEnabledState(featureState, ShellFeatureState.State.Rising); + _stateManager.UpdateEnabledState(featureState, ShellFeatureState.State.Rising); } } foreach (var featureState in shellState.Features) { @@ -54,7 +54,7 @@ namespace Orchard.Environment.State { continue; } if (!featureState.IsDisabled) { - _stateProvider.UpdateEnabledState(featureState, ShellFeatureState.State.Falling); + _stateManager.UpdateEnabledState(featureState, ShellFeatureState.State.Falling); } } @@ -62,7 +62,7 @@ namespace Orchard.Environment.State { } private void FireApplyChangesIfNeeded() { - var shellState = _stateProvider.GetShellState(); + var shellState = _stateManager.GetShellState(); if (shellState.Features.Any(FeatureIsChanging)) { var descriptor = new ShellDescriptor { Features = shellState.Features @@ -98,7 +98,7 @@ namespace Orchard.Environment.State { } void IShellStateManagerEventHandler.ApplyChanges() { - var shellState = _stateProvider.GetShellState(); + var shellState = _stateManager.GetShellState(); // start with description of all declared features in order - order preserved with all merging var orderedFeatureDescriptors = AllFeaturesInOrder(); @@ -150,24 +150,24 @@ namespace Orchard.Environment.State { // lower enabled states in reverse order foreach (var entry in allEntries.Where(entry => entry.FeatureState.EnableState == ShellFeatureState.State.Falling)) { _featureEvents.Disable(entry.Feature); - _stateProvider.UpdateEnabledState(entry.FeatureState, ShellFeatureState.State.Down); + _stateManager.UpdateEnabledState(entry.FeatureState, ShellFeatureState.State.Down); } // lower installed states in reverse order foreach (var entry in allEntries.Where(entry => entry.FeatureState.InstallState == ShellFeatureState.State.Falling)) { _featureEvents.Uninstall(entry.Feature); - _stateProvider.UpdateInstalledState(entry.FeatureState, ShellFeatureState.State.Down); + _stateManager.UpdateInstalledState(entry.FeatureState, ShellFeatureState.State.Down); } // raise install and enabled states in order foreach (var entry in allEntries.Where(entry => IsRising(entry.FeatureState))) { if (entry.FeatureState.InstallState == ShellFeatureState.State.Rising) { _featureEvents.Install(entry.Feature); - _stateProvider.UpdateInstalledState(entry.FeatureState, ShellFeatureState.State.Up); + _stateManager.UpdateInstalledState(entry.FeatureState, ShellFeatureState.State.Up); } if (entry.FeatureState.EnableState == ShellFeatureState.State.Rising) { _featureEvents.Enable(entry.Feature); - _stateProvider.UpdateEnabledState(entry.FeatureState, ShellFeatureState.State.Up); + _stateManager.UpdateEnabledState(entry.FeatureState, ShellFeatureState.State.Up); } } diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index b9b4c7dbd..fed37f65b 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -140,8 +140,8 @@ - - + + @@ -325,8 +325,6 @@ - - @@ -501,7 +499,6 @@ -