diff --git a/src/Orchard.Tests.Modules/Recipes/Services/FoldersData/Sample1/Recipes/cms.recipe.xml b/src/Orchard.Tests.Modules/Recipes/Services/FoldersData/Sample1/Recipes/cms.recipe.xml index cd585ffc1..b1047c222 100644 --- a/src/Orchard.Tests.Modules/Recipes/Services/FoldersData/Sample1/Recipes/cms.recipe.xml +++ b/src/Orchard.Tests.Modules/Recipes/Services/FoldersData/Sample1/Recipes/cms.recipe.xml @@ -41,8 +41,6 @@ - - diff --git a/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs b/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs index 3f21d0998..d06a95ed3 100644 --- a/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs +++ b/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs @@ -125,7 +125,7 @@ namespace Orchard.Tests.Modules.Recipes.Services { var sampleRecipe = recipes[0]; var recipeSteps = (List) sampleRecipe.RecipeSteps; - Assert.That(recipeSteps.Count, Is.EqualTo(12)); + Assert.That(recipeSteps.Count, Is.EqualTo(11)); } [Test] @@ -193,7 +193,7 @@ namespace Orchard.Tests.Modules.Recipes.Services { public class CustomRecipeHandler : IRecipeHandler { public static string AttributeValue; - public string[] _handles = {"Module", "Theme", "Migration", "CleanUpInactive", "Custom1", "Custom2", "Command", "Metadata", "Feature", "Settings"}; + public string[] _handles = {"Module", "Theme", "Migration", "Custom1", "Custom2", "Command", "Metadata", "Feature", "Settings"}; public void ExecuteRecipeStep(RecipeContext recipeContext) { if (_handles.Contains(recipeContext.RecipeStep.Name)) { diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj index 9de710b5f..f5244b46e 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj @@ -53,7 +53,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CleanUpInactiveRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CleanUpInactiveRecipeHandler.cs deleted file mode 100644 index f84472138..000000000 --- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CleanUpInactiveRecipeHandler.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using Orchard.Localization; -using Orchard.Logging; -using Orchard.Recipes.Models; -using Orchard.Recipes.Services; - -namespace Orchard.Recipes.RecipeHandlers { - public class CleanUpInactiveRecipeHandler : IRecipeHandler { - public CleanUpInactiveRecipeHandler() { - Logger = NullLogger.Instance; - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - ILogger Logger { get; set; } - - // - // Delete inactive modules and themes. - public void ExecuteRecipeStep(RecipeContext recipeContext) { - if (!String.Equals(recipeContext.RecipeStep.Name, "CleanUpInactive", StringComparison.OrdinalIgnoreCase)) { - return; - } - - // remove modules and themes. - recipeContext.Executed = true; - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/minimal.recipe.xml b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/minimal.recipe.xml index 5d8d66767..4d9bde8f5 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/minimal.recipe.xml +++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/minimal.recipe.xml @@ -43,6 +43,4 @@ - -