Reorganized recipe step folders.

src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleStepTest.cs

@@ -23,7 +23,7 @@ using Orchard.Packaging.GalleryServer;
 using Orchard.Packaging.Models;
 using Orchard.Packaging.Services;
 using Orchard.Recipes.Models;
-using Orchard.Recipes.RecipeExecutionSteps;
+using Orchard.Recipes.Providers.Executors;
 using Orchard.Recipes.Services;
 using Orchard.Tests.Environment.Extensions;
 using Orchard.Tests.Environment.Features;

src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeRecipeHandlerTest.cs

@@ -22,14 +22,13 @@ using Orchard.FileSystems.VirtualPath;
 using Orchard.Packaging.GalleryServer;
 using Orchard.Packaging.Services;
 using Orchard.Recipes.Models;
-using Orchard.Recipes.RecipeExecutionSteps;
 using Orchard.Recipes.Services;
 using Orchard.Tests.DisplayManagement.Descriptors;
 using Orchard.Tests.Environment.Extensions;
 using Orchard.Tests.Environment.Features;
 using Orchard.Tests.Stubs;
 using Orchard.Tests.UI.Navigation;
-using Orchard.Themes.RecipeExecutionSteps;
+using Orchard.Themes.Recipes.Executors;
 using Orchard.Themes.Services;
 
 namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {

src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs

@@ -4,10 +4,10 @@ using System.IO;
 using System.Linq;
 using Orchard.Commands;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ImportExport.RecipeBuilderSteps;
+using Orchard.ImportExport.Recipes.Builders;
 using Orchard.ImportExport.Services;
 using Orchard.Recipes.Models;
-using Orchard.Recipes.RecipeBuilders;
+using Orchard.Recipes.Providers.Builders;
 using Orchard.Recipes.Services;
 using Orchard.Security;
 using Orchard.Settings;

src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj

@@ -71,7 +71,7 @@
     <Compile Include="Models\ExportOptions.cs" />
     <Compile Include="Permissions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RecipeBuilderSteps\CustomStepsStep.cs" />
+    <Compile Include="Recipes\Builders\CustomStepsStep.cs" />
     <Compile Include="Services\ExportContext.cs" />
     <Compile Include="ViewModels\CustomStepEntry.cs" />
     <Compile Include="Services\ICustomExportStep.cs" />

src/Orchard.Web/Modules/Orchard.ImportExport/Recipes/Builders/CustomStepsStep.cs

@@ -7,7 +7,7 @@ using Orchard.ImportExport.ViewModels;
 using Orchard.Localization;
 using Orchard.Recipes.Services;
 
-namespace Orchard.ImportExport.RecipeBuilderSteps {
+namespace Orchard.ImportExport.Recipes.Builders {
     public class CustomStepsStep : RecipeBuilderStep {
         private readonly IEnumerable<IExportEventHandler> _exportEventHandlers;
         private readonly ICustomExportStep _customExportStep;

src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj

@@ -72,8 +72,8 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Data\Migration\DataMigrationNotificationProvider.cs" />
     <Compile Include="Events\IExtensionDisplayEventHandler.cs" />
-    <Compile Include="RecipeBuilderSteps\FeatureStep.cs" />
-    <Compile Include="RecipeExecutionSteps\FeatureStep.cs" />
+    <Compile Include="Recipes\Builders\FeatureStep.cs" />
+    <Compile Include="Recipes\Executors\FeatureStep.cs" />
     <Compile Include="ViewModels\FeatureStepViewModel.cs" />
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\FeatureCommands.cs" />

src/Orchard.Web/Modules/Orchard.Modules/Recipes/Builders/FeatureStep.cs

@@ -7,7 +7,7 @@ using Orchard.Localization;
 using Orchard.Modules.ViewModels;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Modules.RecipeBuilderSteps {
+namespace Orchard.Modules.Recipes.Builders {
     public class FeatureStep : RecipeBuilderStep {
         private readonly IFeatureManager _featureManager;
 

src/Orchard.Web/Modules/Orchard.Modules/Recipes/Executors/FeatureStep.cs

@@ -5,7 +5,7 @@ using Orchard.Environment.Features;
 using Orchard.Logging;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Modules.RecipeExecutionSteps {
+namespace Orchard.Modules.Recipes.Executors {
     public class FeatureStep : RecipeExecutionStep {
         private readonly IFeatureManager _featureManager;
 

src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj

@@ -82,16 +82,16 @@
     <Compile Include="Models\RecipeStepResultRecord.cs" />
     <Compile Include="Models\VersionHistoryOptions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RecipeBuilders\ContentStep.cs" />
-    <Compile Include="RecipeBuilders\RecipeMetadataStep.cs" />
-    <Compile Include="RecipeBuilders\SettingsStep.cs" />
-    <Compile Include="RecipeExecutionSteps\CommandStep.cs" />
-    <Compile Include="RecipeExecutionSteps\ContentStep.cs" />
-    <Compile Include="RecipeExecutionSteps\ContentSchemaStep.cs" />
-    <Compile Include="RecipeExecutionSteps\MigrationStep.cs" />
-    <Compile Include="RecipeExecutionSteps\ModuleStep.cs" />
-    <Compile Include="RecipeExecutionSteps\SettingsStep.cs" />
-    <Compile Include="RecipeHandlers\RecipeExecutionStepHandler.cs" />
+    <Compile Include="Providers\Builders\ContentStep.cs" />
+    <Compile Include="Providers\Builders\RecipeMetadataStep.cs" />
+    <Compile Include="Providers\Builders\SettingsStep.cs" />
+    <Compile Include="Providers\Executors\CommandStep.cs" />
+    <Compile Include="Providers\Executors\ContentStep.cs" />
+    <Compile Include="Providers\Executors\ContentSchemaStep.cs" />
+    <Compile Include="Providers\Executors\MigrationStep.cs" />
+    <Compile Include="Providers\Executors\ModuleStep.cs" />
+    <Compile Include="Providers\Executors\SettingsStep.cs" />
+    <Compile Include="Providers\RecipeHandlers\RecipeExecutionStepHandler.cs" />
     <Compile Include="Routes.cs" />
     <Compile Include="Services\RecipeHarvester.cs" />
     <Compile Include="Services\RecipeManager.cs" />

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/ContentStep.cs

@@ -9,7 +9,7 @@ using Orchard.Recipes.Models;
 using Orchard.Recipes.Services;
 using Orchard.Recipes.ViewModels;
 
-namespace Orchard.Recipes.RecipeBuilders {
+namespace Orchard.Recipes.Providers.Builders {
     public class ContentStep : RecipeBuilderStep {
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly IOrchardServices _orchardServices;

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/RecipeMetadataStep.cs

@@ -3,7 +3,7 @@ using Orchard.Localization;
 using Orchard.Recipes.Services;
 using Orchard.Recipes.ViewModels;
 
-namespace Orchard.Recipes.RecipeBuilders {
+namespace Orchard.Recipes.Providers.Builders {
     public class RecipeMetadataStep : RecipeBuilderStep {
         private readonly IOrchardServices _orchardServices;
         public RecipeMetadataStep(IOrchardServices orchardServices) {

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Builders/SettingsStep.cs

@@ -6,7 +6,7 @@ using Orchard.Localization;
 using Orchard.Recipes.Services;
 using Orchard.Recipes.ViewModels;
 
-namespace Orchard.Recipes.RecipeBuilders {
+namespace Orchard.Recipes.Providers.Builders {
     public class SettingsStep : RecipeBuilderStep {
         private readonly IOrchardServices _orchardServices;
 

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/CommandStep.cs

@@ -7,7 +7,7 @@ using Orchard.Commands;
 using Orchard.Logging;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Recipes.RecipeExecutionSteps  {
+namespace Orchard.Recipes.Providers.Executors  {
     public class CommandStep : RecipeExecutionStep {
         private readonly ICommandManager _commandManager;
         private readonly CommandParser _commandParser;

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentSchemaStep.cs

@@ -5,7 +5,7 @@ using Orchard.ContentTypes.Events;
 using Orchard.Logging;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
     public class ContentSchemaStep : RecipeExecutionStep {
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly IContentDefinitionReader _contentDefinitionReader;

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs

@@ -6,7 +6,7 @@ using Orchard.Data;
 using Orchard.Logging;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
     public class ContentStep : RecipeExecutionStep {
         private readonly IOrchardServices _orchardServices;
         private readonly ITransactionManager _transactionManager;

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/MigrationStep.cs

@@ -5,7 +5,7 @@ using Orchard.Data.Migration;
 using Orchard.Logging;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
     public class MigrationStep : RecipeExecutionStep {
         private readonly IDataMigrationManager _dataMigrationManager;
 

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ModuleStep.cs

@@ -8,7 +8,7 @@ using Orchard.Packaging.Models;
 using Orchard.Packaging.Services;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
     public class ModuleStep : RecipeExecutionStep {
         private readonly IPackagingSourceManager _packagingSourceManager;
         private readonly IPackageManager _packageManager;

src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/SettingsStep.cs

@@ -3,13 +3,11 @@ using System.Collections.Generic;
 using System.Xml.Linq;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
-using Orchard.Localization;
 using Orchard.Logging;
-using Orchard.Recipes.Models;
 using Orchard.Recipes.Services;
 using Orchard.Settings;
 
-namespace Orchard.Recipes.RecipeExecutionSteps {
+namespace Orchard.Recipes.Providers.Executors {
     public class SettingsStep : RecipeExecutionStep {
         private readonly ISiteService _siteService;
         private readonly IContentManager _contentManager;

src/Orchard.Web/Modules/Orchard.Recipes/Providers/RecipeHandlers/RecipeExecutionStepHandler.cs

@@ -4,7 +4,7 @@ using Orchard.Logging;
 using Orchard.Recipes.Models;
 using Orchard.Recipes.Services;
 
-namespace Orchard.Recipes.RecipeHandlers {
+namespace Orchard.Recipes.Providers.RecipeHandlers {
     /// <summary>
     /// Delegates execution of the step to the appropriate recipe execution step implementation.
     /// </summary>

src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj

@@ -75,7 +75,7 @@
     <Compile Include="Migrations.cs" />
     <Compile Include="Models\ThemeEntry.cs" />
     <Compile Include="Models\DisableThemePart.cs" />
-    <Compile Include="RecipeExecutionSteps\ThemeStep.cs" />
+    <Compile Include="Recipes\Executors\ThemeStep.cs" />
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Handlers\ThemeSiteSettingsPartHandler.cs" />

src/Orchard.Web/Modules/Orchard.Themes/Recipes/Executors/ThemeStep.cs

@@ -9,7 +9,7 @@ using Orchard.Packaging.Services;
 using Orchard.Recipes.Services;
 using Orchard.Themes.Services;
 
-namespace Orchard.Themes.RecipeExecutionSteps {
+namespace Orchard.Themes.Recipes.Executors {
     public class ThemeStep : RecipeExecutionStep {
         private readonly IPackagingSourceManager _packagingSourceManager;
         private readonly IPackageManager _packageManager;