Move creation of default layers to SetupService

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -15,6 +15,7 @@ using Orchard.Data.Migration.Interpreters;
 using Orchard.Data.Migration.Schema;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;
+using Orchard.Environment.Extensions;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.Descriptor;
 using Orchard.Environment.Descriptor.Models;
@@ -28,6 +29,7 @@ using Orchard.Themes;
 using Orchard.Environment.State;
 using Orchard.Data.Migration;
 using Orchard.Widgets.Models;
+using Orchard.Widgets;
 
 namespace Orchard.Setup.Services {
     public class SetupService : ISetupService {
@@ -163,6 +165,18 @@ namespace Orchard.Setup.Services {
             shellSettings.State = new TenantState("Running");
             using (var environment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
                 try {
+                    CreateTenantData(context, environment);
+                }
+                catch {
+                    environment.Resolve<ITransactionManager>().Cancel();
+                    throw;
+                }
+            }
+
+            _shellSettingsManager.SaveSettings(shellSettings);
+        }
+
+        private void CreateTenantData(SetupContext context, IWorkContextScope environment) {
             // create superuser
             var membershipService = environment.Resolve<IMembershipService>();
             var user =
@@ -170,7 +184,7 @@ namespace Orchard.Setup.Services {
                                                                   String.Empty, String.Empty, String.Empty,
                                                                   true));
 
-
+            // set superuser as current user for request (it will be set as the owner of all content items)
             var authenticationService = environment.Resolve<IAuthenticationService>();
             authenticationService.SetAuthenticatedUserForRequest(user);
 
@@ -219,6 +233,13 @@ namespace Orchard.Setup.Services {
             contentDefinitionManager.AlterPartDefinition("BodyPart", cfg => cfg
                 .WithSetting("BodyPartSettings.FlavorDefault", BodyPartSettings.FlavorDefaultDefault));
 
+            // If "Orchard.Widgets" is enabled, setup default layers and widgets
+            var extensionManager = environment.Resolve<IExtensionManager>();
+            var shellDescriptor = environment.Resolve<ShellDescriptor>();
+            if (extensionManager.EnabledFeatures(shellDescriptor).Where(d => d.Name == "Orchard.Widgets").Any()) {
+                // Create default layers
+                var layerInitializer = environment.Resolve<IDefaultLayersInitializer>();
+                layerInitializer.CreateDefaultLayers();
 
                 // add a layer for the homepage
                 var homepageLayer = contentManager.Create("Layer");
@@ -233,7 +254,6 @@ namespace Orchard.Setup.Services {
                 tripelFirst.As<WidgetPart>().Zone = "TripelFirst";
                 tripelFirst.As<WidgetPart>().Position = "5";
                 tripelFirst.As<BodyPart>().Text = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a nibh ut tortor dapibus vestibulum. Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>";
-                    tripelFirst.As<CommonPart>().Owner = user;
                 contentManager.Publish(tripelFirst);
 
                 var tripelSecond = contentManager.Create("HtmlWidget");
@@ -242,7 +262,6 @@ namespace Orchard.Setup.Services {
                 tripelSecond.As<WidgetPart>().Zone = "TripelSecond";
                 tripelSecond.As<WidgetPart>().Position = "5";
                 tripelSecond.As<BodyPart>().Text = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a nibh ut tortor dapibus vestibulum. Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>";
-                    tripelSecond.As<CommonPart>().Owner = user; 
                 contentManager.Publish(tripelSecond);
 
                 var tripelThird = contentManager.Create("HtmlWidget");
@@ -251,14 +270,14 @@ namespace Orchard.Setup.Services {
                 tripelThird.As<WidgetPart>().Zone = "TripelThird";
                 tripelThird.As<WidgetPart>().Position = "5";
                 tripelThird.As<BodyPart>().Text = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a nibh ut tortor dapibus vestibulum. Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>";
-                    tripelThird.As<CommonPart>().Owner = user;
                 contentManager.Publish(tripelThird);
+            }
 
             // create a welcome page that's promoted to the home page
             var page = contentManager.Create("Page");
             page.As<RoutePart>().Title = T("Welcome to Orchard!").Text;
             page.As<BodyPart>().Text = "<p>Congratulations, you've successfully set-up your Orchard site.</p><p>This is the home page of your new site. We've taken the liberty to write here about a few things you could look at next in order to get familiar with the application. Once you feel confident you don't need this anymore, just click <a href=\"/Admin/Contents/Edit/7\">Edit</a> to go into edit mode and replace this with whatever you want on your home page to make it your own.</p><p>One thing you could do (but you don't have to) is go into <a href=\"Admin/Settings\">Manage Settings</a> (follow the <a href=\"Admin\">Admin</a> link and then look for it under \"Settings\" in the menu on the left) and check that everything is configured the way you want.</p><p>You probably want to make the site your own. One of the ways you can do that is by clicking <a href=\"Admin/Themes\">Manage Themes</a> in the admin menu. A theme is a packaged look and feel that affects the whole site.</p><p>Next, you can start playing with the content types that we installed. For example, go ahead and click <a href=\"Admin/Pages/Create\">Add New Page</a> in the admin menu and create an \"about\" page. Then, add it to the navigation menu by going to <a href=\"Admin/Navigation\">Manage Menu</a>. You can also click <a href=\"Admin/Blogs/Create\">Add New Blog</a> and start posting by clicking \"Add New Post\".</p><p>Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. You can install new themes by going to <a href=\"Admin/Themes\">Manage Themes</a> and clicking <a href=\"Admin/Themes/Install\">Install a new Theme</a>. Like for themes, modules are created by other users of Orchard just like you so if you feel up to it, please <a href=\"http://www.orchardproject.net/\">consider participating</a>.</p><p>--The Orchard Crew</p>";
-                    page.As<CommonPart>().Owner = user;
+
             contentManager.Publish(page);
             siteSettings.Record.HomePage = "RoutableHomePageProvider;" + page.Id;
 
@@ -274,13 +293,5 @@ namespace Orchard.Setup.Services {
                 authenticationService.SignIn(user, true);
             }
         }
-                catch {
-                    environment.Resolve<ITransactionManager>().Cancel();
-                    throw;
-                }
-            }
-
-            _shellSettingsManager.SaveSettings(shellSettings);
-        }
     }
 }

src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs

@@ -5,14 +5,11 @@ using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
-using Orchard.Environment.Configuration;
-using Orchard.Environment.Descriptor.Models;
-using Orchard.Environment.State;
 using Orchard.Events;
 using Orchard.Widgets.Models;
 
 namespace Orchard.Widgets {
-    public interface IDefaultLayersInitializer : IEventHandler {
+    public interface IDefaultLayersInitializer : IDependency {
         void CreateDefaultLayers();
     }
 
@@ -34,16 +31,6 @@ namespace Orchard.Widgets {
     }
 
     public class WidgetsDataMigration : DataMigrationImpl {
-        private readonly IProcessingEngine _processingEngine;
-        private readonly ShellSettings _shellSettings;
-        private readonly ShellDescriptor _shellDescriptor;
-
-        public WidgetsDataMigration(IProcessingEngine processingEngine, ShellSettings shellSettings, ShellDescriptor shellDescriptor) {
-            _processingEngine = processingEngine;
-            _shellSettings = shellSettings;
-            _shellDescriptor = shellDescriptor;
-        }
-
         public int Create() {
             SchemaBuilder.CreateTable("LayerPartRecord", table => table
                 .ContentPartRecord()
@@ -73,8 +60,6 @@ namespace Orchard.Widgets {
                     .WithSetting("Stereotype", "Widget")
                 );
 
-            CreateDefaultLayers();
-
             return 1;
         }
 
@@ -108,13 +93,5 @@ namespace Orchard.Widgets {
                 );
             return 2;
         }
-
-        private void CreateDefaultLayers() {
-            _processingEngine.AddTask(
-                    _shellSettings,
-                    _shellDescriptor,
-                    "IDefaultLayersInitializer.CreateDefaultLayers",
-                    new Dictionary<string, object>());
-        }
     }
 }