From 94fee29d1aa86085d3d572892c97bf91eee177a2 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <Renaud.Paquay@microsoft.com>
Date: Fri, 15 Oct 2010 14:33:02 -0700
Subject: [PATCH 1/4] Authenticate admin user during setup phase

This is so that we don't need code all over the place to set the Owner
of the CommonPart. The CommonPart will have direct access to the user.

--HG--
branch : dev
---
 .../Modules/Orchard.Setup/Services/SetupService.cs     |  7 +++++--
 src/Orchard/Environment/DefaultWorkContextAccessor.cs  |  2 --
 src/Orchard/Security/IAuthenticationService.cs         |  1 +
 .../Security/Providers/FormsAuthenticationService.cs   | 10 ++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index ed80805d2..6751916c4 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -170,6 +170,10 @@ namespace Orchard.Setup.Services {
                                                                           String.Empty, String.Empty, String.Empty,
                                                                           true));
 
+
+                    var authenticationService = environment.Resolve<IAuthenticationService>();
+                    authenticationService.SetAuthenticatedUserForRequest(user);
+
                     // set site name and settings
                     var siteService = environment.Resolve<ISiteService>();
                     var siteSettings = siteService.GetSiteSettings().As<SiteSettingsPart>();
@@ -265,9 +269,8 @@ namespace Orchard.Setup.Services {
                     menuItem.As<MenuPart>().OnMainMenu = true;
                     menuItem.As<MenuItemPart>().Url = "";
 
-                    //Temporary fix for running setup on command line
+                    //null check: temporary fix for running setup in command line
                     if (HttpContext.Current != null) {
-                        var authenticationService = environment.Resolve<IAuthenticationService>();
                         authenticationService.SignIn(user, true);
                     }
                 }
diff --git a/src/Orchard/Environment/DefaultWorkContextAccessor.cs b/src/Orchard/Environment/DefaultWorkContextAccessor.cs
index 767444806..a507cfcdd 100644
--- a/src/Orchard/Environment/DefaultWorkContextAccessor.cs
+++ b/src/Orchard/Environment/DefaultWorkContextAccessor.cs
@@ -163,6 +163,4 @@ namespace Orchard.Environment {
             }
         }
     }
-
-
 }
diff --git a/src/Orchard/Security/IAuthenticationService.cs b/src/Orchard/Security/IAuthenticationService.cs
index e4af94abf..9edcda2b9 100644
--- a/src/Orchard/Security/IAuthenticationService.cs
+++ b/src/Orchard/Security/IAuthenticationService.cs
@@ -2,6 +2,7 @@
     public interface IAuthenticationService : IDependency {
         void SignIn(IUser user, bool createPersistentCookie);
         void SignOut();
+        void SetAuthenticatedUserForRequest(IUser user);
         IUser GetAuthenticatedUser();
     }
 }
diff --git a/src/Orchard/Security/Providers/FormsAuthenticationService.cs b/src/Orchard/Security/Providers/FormsAuthenticationService.cs
index 37f7f0107..3f2b2cf6c 100644
--- a/src/Orchard/Security/Providers/FormsAuthenticationService.cs
+++ b/src/Orchard/Security/Providers/FormsAuthenticationService.cs
@@ -11,6 +11,7 @@ namespace Orchard.Security.Providers {
         private readonly IClock _clock;
         private readonly IContentManager _contentManager;
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private IUser _signedInUser;
 
         public FormsAuthenticationService(IClock clock, IContentManager contentManager, IHttpContextAccessor httpContextAccessor) {
             _clock = clock;
@@ -52,13 +53,22 @@ namespace Orchard.Security.Providers {
             
             var httpContext = _httpContextAccessor.Current();
             httpContext.Response.Cookies.Add(cookie);
+            _signedInUser = user;
         }
 
         public void SignOut() {
+            _signedInUser = null;
             FormsAuthentication.SignOut();
         }
 
+        public void SetAuthenticatedUserForRequest(IUser user) {
+            _signedInUser = user;
+        }
+
         public IUser GetAuthenticatedUser() {
+            if (_signedInUser != null)
+                return _signedInUser;
+
             var httpContext = _httpContextAccessor.Current();
             if (!httpContext.Request.IsAuthenticated || !(httpContext.User.Identity is FormsIdentity)) {
                 return null;

From 21c04e45da3ebac9c4371c1b11469c6edbfe2423 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Fri, 15 Oct 2010 15:15:44 -0700
Subject: [PATCH 2/4] Adding a layout classification helper function to
 TheThemeMachine's layout

--HG--
branch : dev
---
 .../TheThemeMachine/Views/Layout.cshtml       | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index be3a6916f..698790fc1 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -1,4 +1,12 @@
-@{
+@functions {
+   string CalcuClassify(string[] zoneNames, string classNamePrefix)
+   {
+        var zoneCounter = 0;
+        var zoneNumsFilled = string.Join("", zoneNames.Select(zoneName => { ++zoneCounter; return Model[zoneName] != null ? zoneCounter.ToString() : "";}).ToArray());
+        return HasText(zoneNumsFilled) ? classNamePrefix + zoneNumsFilled : "";
+   }
+}
+@{
     Style.Include("http://fonts.googleapis.com/css?family=Lobster&subset=latin");
     Style.Include("site.css");
 
@@ -28,22 +36,20 @@
    // {WorkContext.Layout.FooterQuadThird.Add("3 This is some test text to see if zones are working. This is some test text to see if zones are working.");}
 
     //Add classes to the wrapper div to toggle quad widget zones on and off
+    var tripelClass = CalcuClassify(new [] {"TripelFirst", "TripelSecond", "TripelThird"}, "tripel-");
+    if (HasText(tripelClass)) {
+        Model.Classes.Add(tripelClass);
+    }
 
-        if (Model.FooterQuadFirst == null && Model.FooterQuadSecond != null && Model.FooterQuadThird != null && Model.FooterQuadFourth != null) {
-        Model.Classes.Add("split-234");
+    //Add classes to the wrapper div to toggle quad widget zones on and off
+    var footerQuadClass = CalcuClassify(new [] {"FooterQuadFirst", "FooterQuadSecond", "FooterQuadThird", "FooterQuadFourth"}, "split-");
+    if (HasText(footerQuadClass)) {
+        Model.Classes.Add(footerQuadClass);
     }
-    else if (Model.FooterQuadFirst != null && Model.FooterQuadSecond == null && Model.FooterQuadThird != null && Model.FooterQuadFourth != null) {
-        Model.Classes.Add("split-134");
-    }
-        else if (Model.FooterQuadFirst != null && Model.FooterQuadSecond != null && Model.FooterQuadThird == null && Model.FooterQuadFourth != null) {
-        Model.Classes.Add("split-124");
-    }
-        else if (Model.FooterQuadFirst != null && Model.FooterQuadSecond != null && Model.FooterQuadThird != null && Model.FooterQuadFourth == null) {
-        Model.Classes.Add("split-123");
-    }
-        else {
 
-    }
+    @*<span>debug: </span>*@
+    @*<span>tripelClass:@tripelClass</span>*@
+    @*<span>footerQuadClass:@footerQuadClass</span>*@
 
     Model.Id = "layout-wrapper";
     var tag = Tag (Model, "div");

From 3d72236e813e38e4ff1c15bee6ad5873cc053625 Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Fri, 15 Oct 2010 15:16:41 -0700
Subject: [PATCH 3/4] - Migrating Email module to the new shape API.

--HG--
branch : dev
---
 .../Orchard.Email/Drivers/SmtpSettingsPartDriver.cs  |  8 ++++++--
 .../Modules/Orchard.Email/Orchard.Email.csproj       |  5 ++++-
 src/Orchard.Web/Modules/Orchard.Email/Placement.info |  3 +++
 ...{Smtp.SiteSettings.cshtml => SmtpSettings.cshtml} |  0
 .../Modules/Orchard.Tags/Drivers/TagsPartDriver.cs   | 12 +++++++-----
 .../Modules/Orchard.Tags/Orchard.Tags.csproj         |  4 +++-
 6 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Email/Placement.info
 rename src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/{Smtp.SiteSettings.cshtml => SmtpSettings.cshtml} (100%)

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
index 0e2d16515..e8847e280 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
@@ -9,6 +9,8 @@ namespace Orchard.Email.Drivers {
     // Thus the encryption/decryption will be done when accessing the part's property
 
     public class SmtpSettingsPartDriver : ContentPartDriver<SmtpSettingsPart> {
+        private const string TemplateName = "Parts/SmtpSettings";
+
         public SmtpSettingsPartDriver() {
             T = NullLocalizer.Instance;
         }
@@ -18,12 +20,14 @@ namespace Orchard.Email.Drivers {
         protected override string Prefix { get { return "SmtpSettings"; } }
 
         protected override DriverResult Editor(SmtpSettingsPart part, dynamic shapeHelper) {
-            return ContentPartTemplate(part, "Parts/Smtp.SiteSettings");
+            return ContentShape("Parts_SmtpSettings_Editor",
+                    () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: part, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(SmtpSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
             updater.TryUpdateModel(part, Prefix, null, null);
-            return Editor(part, shapeHelper);
+            return ContentShape("Parts_SmtpSettings_Editor",
+                    () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: part, Prefix: Prefix));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
index 004a884b9..08bf37967 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
@@ -82,7 +82,7 @@
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\EditorTemplates\Parts\Smtp.SiteSettings.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts\SmtpSettings.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -98,6 +98,9 @@
       <Name>Orchard.Users</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Placement.info" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Placement.info b/src/Orchard.Web/Modules/Orchard.Email/Placement.info
new file mode 100644
index 000000000..e40e465f2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Email/Placement.info
@@ -0,0 +1,3 @@
+<Placement>
+  <Place Parts_SmtpSettings_Editor="Primary:10"/>
+</Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/SmtpSettings.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml
rename to src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/SmtpSettings.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
index dde0560c6..2989a258a 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
@@ -36,12 +36,8 @@ namespace Orchard.Tags.Drivers {
             if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, CurrentUser, part))
                 return null;
 
-            var model = new EditTagsViewModel {
-                                                  Tags = string.Join(", ", part.CurrentTags.Select((t, i) => t.TagName).ToArray())
-                                              };
-
             return ContentShape("Parts_Tags_Editor",
-                    () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
+                    () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: BuildEditorViewModel(part), Prefix: Prefix));
         }
 
         protected override DriverResult Editor(TagsPart part, IUpdateModel updater, dynamic shapeHelper) {
@@ -59,5 +55,11 @@ namespace Orchard.Tags.Drivers {
             return ContentShape("Parts_Tags_Editor",
                     () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
+
+        private static EditTagsViewModel BuildEditorViewModel(TagsPart part) {
+            return new EditTagsViewModel {
+                Tags = string.Join(", ", part.CurrentTags.Select((t, i) => t.TagName).ToArray())
+            };
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
index 045ae63fc..859b22f4c 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -113,7 +113,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Placement.info" />
+    <Content Include="Placement.info">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

From ada594bf3ec819a72d238eba543d551250308ace Mon Sep 17 00:00:00 2001
From: Renaud Paquay <Renaud.Paquay@microsoft.com>
Date: Fri, 15 Oct 2010 15:18:53 -0700
Subject: [PATCH 4/4] Move creation of default layers to SetupService

--HG--
branch : dev
---
 .../Orchard.Setup/Services/SetupService.cs    | 231 +++++++++---------
 .../Modules/Orchard.Widgets/Migrations.cs     |  25 +-
 2 files changed, 122 insertions(+), 134 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 6751916c4..f4ff8d165 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/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,116 +165,7 @@ namespace Orchard.Setup.Services {
             shellSettings.State = new TenantState("Running");
             using (var environment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
                 try {
-                    // create superuser
-                    var membershipService = environment.Resolve<IMembershipService>();
-                    var user =
-                        membershipService.CreateUser(new CreateUserParams(context.AdminUsername, context.AdminPassword,
-                                                                          String.Empty, String.Empty, String.Empty,
-                                                                          true));
-
-
-                    var authenticationService = environment.Resolve<IAuthenticationService>();
-                    authenticationService.SetAuthenticatedUserForRequest(user);
-
-                    // set site name and settings
-                    var siteService = environment.Resolve<ISiteService>();
-                    var siteSettings = siteService.GetSiteSettings().As<SiteSettingsPart>();
-                    siteSettings.Record.SiteSalt = Guid.NewGuid().ToString("N");
-                    siteSettings.Record.SiteName = context.SiteName;
-                    siteSettings.Record.SuperUser = context.AdminUsername;
-                    siteSettings.Record.PageTitleSeparator = " - ";
-                    siteSettings.Record.SiteCulture = "en-US";
-
-                    // set site theme
-                    var themeService = environment.Resolve<IThemeService>();
-                    themeService.SetSiteTheme("TheThemeMachine");
-
-                    // add default culture
-                    var cultureManager = environment.Resolve<ICultureManager>();
-                    cultureManager.AddCulture("en-US");
-
-                    var contentManager = environment.Resolve<IContentManager>();
-
-                    // this needs to exit the standalone environment? rework this process entirely?
-                    // simulate installation-time module activation events
-                    //var hackInstallationGenerator = environment.Resolve<IHackInstallationGenerator>();
-                    //hackInstallationGenerator.GenerateInstallEvents();
-
-                    var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>();
-                    //todo: (heskew) pull these definitions (and initial content creation) out into more appropriate modules
-                    contentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg
-                        .WithPart("CommentsPart")
-                        .WithPart("TagsPart")
-                        .WithPart("LocalizationPart")
-                        .Indexed()
-                        );
-                    contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg
-                        .WithPart("CommonPart")
-                        .WithPart("PublishLaterPart")
-                        .WithPart("RoutePart")
-                        .WithPart("BodyPart")
-                        .WithPart("TagsPart")
-                        .WithPart("LocalizationPart")
-                        .Creatable()
-                        .Indexed()
-                        );
-                    contentDefinitionManager.AlterPartDefinition("BodyPart", cfg => cfg
-                        .WithSetting("BodyPartSettings.FlavorDefault", BodyPartSettings.FlavorDefaultDefault));
-
-
-                    // add a layer for the homepage
-                    var homepageLayer = contentManager.Create("Layer");
-                    homepageLayer.As<LayerPart>().Name = "TheHomepage";
-                    homepageLayer.As<LayerPart>().LayerRule = "url \"~/\"";
-                    contentManager.Publish(homepageLayer);
-                    
-                    // and three more for the tripel...really need this elsewhere...
-                    var tripelFirst = contentManager.Create("HtmlWidget");
-                    tripelFirst.As<WidgetPart>().LayerPart = homepageLayer.As<LayerPart>();
-                    tripelFirst.As<WidgetPart>().Title = T("First Leader Aside").Text;
-                    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");
-                    tripelSecond.As<WidgetPart>().LayerPart = homepageLayer.As<LayerPart>();
-                    tripelSecond.As<WidgetPart>().Title = T("Second Leader Aside").Text;
-                    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");
-                    tripelThird.As<WidgetPart>().LayerPart = homepageLayer.As<LayerPart>();
-                    tripelThird.As<WidgetPart>().Title = T("Third Leader Aside").Text;
-                    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;
- 
-                    // add a menu item for the shiny new home page
-                    var menuItem = contentManager.Create("MenuItem");
-                    menuItem.As<MenuPart>().MenuPosition = "1";
-                    menuItem.As<MenuPart>().MenuText = T("Home").ToString();
-                    menuItem.As<MenuPart>().OnMainMenu = true;
-                    menuItem.As<MenuItemPart>().Url = "";
-
-                    //null check: temporary fix for running setup in command line
-                    if (HttpContext.Current != null) {
-                        authenticationService.SignIn(user, true);
-                    }
+                    CreateTenantData(context, environment);
                 }
                 catch {
                     environment.Resolve<ITransactionManager>().Cancel();
@@ -282,5 +175,123 @@ namespace Orchard.Setup.Services {
 
             _shellSettingsManager.SaveSettings(shellSettings);
         }
+
+        private void CreateTenantData(SetupContext context, IWorkContextScope environment) {
+            // create superuser
+            var membershipService = environment.Resolve<IMembershipService>();
+            var user =
+                membershipService.CreateUser(new CreateUserParams(context.AdminUsername, context.AdminPassword,
+                                                                  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);
+
+            // set site name and settings
+            var siteService = environment.Resolve<ISiteService>();
+            var siteSettings = siteService.GetSiteSettings().As<SiteSettingsPart>();
+            siteSettings.Record.SiteSalt = Guid.NewGuid().ToString("N");
+            siteSettings.Record.SiteName = context.SiteName;
+            siteSettings.Record.SuperUser = context.AdminUsername;
+            siteSettings.Record.PageTitleSeparator = " - ";
+            siteSettings.Record.SiteCulture = "en-US";
+
+            // set site theme
+            var themeService = environment.Resolve<IThemeService>();
+            themeService.SetSiteTheme("TheThemeMachine");
+
+            // add default culture
+            var cultureManager = environment.Resolve<ICultureManager>();
+            cultureManager.AddCulture("en-US");
+
+            var contentManager = environment.Resolve<IContentManager>();
+
+            // this needs to exit the standalone environment? rework this process entirely?
+            // simulate installation-time module activation events
+            //var hackInstallationGenerator = environment.Resolve<IHackInstallationGenerator>();
+            //hackInstallationGenerator.GenerateInstallEvents();
+
+            var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>();
+            //todo: (heskew) pull these definitions (and initial content creation) out into more appropriate modules
+            contentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg
+                .WithPart("CommentsPart")
+                .WithPart("TagsPart")
+                .WithPart("LocalizationPart")
+                .Indexed()
+                );
+            contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg
+                .WithPart("CommonPart")
+                .WithPart("PublishLaterPart")
+                .WithPart("RoutePart")
+                .WithPart("BodyPart")
+                .WithPart("TagsPart")
+                .WithPart("LocalizationPart")
+                .Creatable()
+                .Indexed()
+                );
+            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");
+                homepageLayer.As<LayerPart>().Name = "TheHomepage";
+                homepageLayer.As<LayerPart>().LayerRule = "url \"~/\"";
+                contentManager.Publish(homepageLayer);
+
+                // and three more for the tripel...really need this elsewhere...
+                var tripelFirst = contentManager.Create("HtmlWidget");
+                tripelFirst.As<WidgetPart>().LayerPart = homepageLayer.As<LayerPart>();
+                tripelFirst.As<WidgetPart>().Title = T("First Leader Aside").Text;
+                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>";
+                contentManager.Publish(tripelFirst);
+
+                var tripelSecond = contentManager.Create("HtmlWidget");
+                tripelSecond.As<WidgetPart>().LayerPart = homepageLayer.As<LayerPart>();
+                tripelSecond.As<WidgetPart>().Title = T("Second Leader Aside").Text;
+                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>";
+                contentManager.Publish(tripelSecond);
+
+                var tripelThird = contentManager.Create("HtmlWidget");
+                tripelThird.As<WidgetPart>().LayerPart = homepageLayer.As<LayerPart>();
+                tripelThird.As<WidgetPart>().Title = T("Third Leader Aside").Text;
+                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>";
+                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>";
+
+            contentManager.Publish(page);
+            siteSettings.Record.HomePage = "RoutableHomePageProvider;" + page.Id;
+
+            // add a menu item for the shiny new home page
+            var menuItem = contentManager.Create("MenuItem");
+            menuItem.As<MenuPart>().MenuPosition = "1";
+            menuItem.As<MenuPart>().MenuText = T("Home").ToString();
+            menuItem.As<MenuPart>().OnMainMenu = true;
+            menuItem.As<MenuItemPart>().Url = "";
+
+            //null check: temporary fix for running setup in command line
+            if (HttpContext.Current != null) {
+                authenticationService.SignIn(user, true);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
index 7c662a5c1..adc4b2864 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
+++ b/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>());
-        }
     }
 }
\ No newline at end of file