Merge

--HG--
branch : dev

Orchard.proj

@@ -69,7 +69,7 @@
 
   <Target Name="Clean">
     <MSBuild Projects="$(SrcFolder)\Orchard.sln" Targets="Clean" />
-    <RemoveDir Directories="$(BuildFolder)" />
+    <RemoveDir Directories="$(BuildFolder)" ContinueOnError="true"/>
     <RemoveDir Directories="$(ArtifactsFolder)" />
   </Target>
 
@@ -126,7 +126,7 @@
   <Target Name="Package-Stage">
     <CallTarget Targets="CompileMsBuildTasks"/>
     <CallTarget Targets="ValidateProjectFiles"/>
-    
+
     <ItemGroup>
       <SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/>
       <SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\*"/>
@@ -293,10 +293,18 @@
 
     <Copy SourceFiles="@(Profiling-Web)" DestinationFolder="$(ProfilingFolder)\%(RecursiveDir)"/>
 
+    <XmlUpdate XmlFileName="$(ProfilingFolder)\web.config"
+      XPath="/configuration/system.web/trust/@level"
+      Value="Full" />
+
   </Target>
 
   <Target Name="Profiling-Setup">
-    <Exec Command="$(ProfilingFolder)\bin\Orchard.exe @$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt" WorkingDirectory="$(ProfilingFolder)"/>
+    <ReadLinesFromFile File="$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt">
+      <Output TaskParameter="Lines" ItemName="ProfilingSetupCommands"/>
+    </ReadLinesFromFile>
+
+    <Exec Command="$(ProfilingFolder)\bin\Orchard.exe %(ProfilingSetupCommands.Identity)" WorkingDirectory="$(ProfilingFolder)"/>
   </Target>
 
   <!-- Gallery Packaging -->
@@ -307,7 +315,6 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(Gallery-Web)" DestinationFolder="$(GalleryFolder)\%(RecursiveDir)"/>
-
   </Target>
 
   <Target Name="Gallery-Setup">

src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs

@@ -46,7 +46,7 @@ namespace Orchard.Core.Tests.Routable.Services {
             builder.RegisterInstance(new Mock<INotifier>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
             builder.RegisterType<StubHttpContextAccessor>().As<IHttpContextAccessor>();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterType<OrchardServices>().As<IOrchardServices>();
 
             builder.RegisterType<ThingHandler>().As<IContentHandler>();

src/Orchard.Profile/Tests/Profiling.feature

@@ -22,5 +22,8 @@ Scenario: Hitting blogs
     When I go to "/blog4" 10 times
      
 Scenario: Hitting home page
-    Given I am logged in
+    //Given I am logged in
-    When I go to "/" 40 times
+    When I go to "/" 10 times
+    When I go to "/" 10 times
+    When I go to "/" 10 times
+    When I go to "/" 10 times

src/Orchard.Profile/Tests/Profiling.feature.cs

@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
 //      This code was generated by SpecFlow (http://www.specflow.org/).
-//      SpecFlow Version:1.3.2.0
+//      SpecFlow Version:1.4.0.0
 //      Runtime Version:4.0.30319.1
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
@@ -9,12 +9,12 @@
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 #region Designer generated code
-namespace Orchard.Specs.Le.Tests
+namespace Orchard.Profile.Tests
 {
     using TechTalk.SpecFlow;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.2.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.4.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("Profiling")]
@@ -31,7 +31,7 @@ namespace Orchard.Specs.Le.Tests
         {
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
             TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Profiling", "In order to profile the site\r\nAs a developer\r\nI want to generate a fixed number o" +
-                    "f repeatable requests", ((string[])(null)));
+                    "f repeatable requests", GenerationTargetLanguage.CSharp, ((string[])(null)));
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -61,13 +61,13 @@ namespace Orchard.Specs.Le.Tests
 #line 6
 this.ScenarioSetup(scenarioInfo);
 #line 7
-testRunner.Given("I am logged in");
+    testRunner.Given("I am logged in");
 #line 8
-testRunner.When("I go to \"/admin\"");
+    testRunner.When("I go to \"/admin\"");
 #line 9
-testRunner.When("I go to \"/blog0\"");
+    testRunner.When("I go to \"/blog0\"");
 #line 10
-testRunner.When("I go to \"/\"");
+    testRunner.When("I go to \"/\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -80,9 +80,9 @@ testRunner.When("I go to \"/\"");
 #line 12
 this.ScenarioSetup(scenarioInfo);
 #line 13
-testRunner.Given("I am logged in");
+    testRunner.Given("I am logged in");
 #line 14
-testRunner.When("I go to \"/admin\" 40 times");
+    testRunner.When("I go to \"/admin\" 40 times");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -95,17 +95,17 @@ testRunner.When("I go to \"/admin\" 40 times");
 #line 16
 this.ScenarioSetup(scenarioInfo);
 #line 17
-testRunner.Given("I am logged in");
+    testRunner.Given("I am logged in");
 #line 18
-testRunner.When("I go to \"/blog0\" 10 times");
+    testRunner.When("I go to \"/blog0\" 10 times");
 #line 19
-testRunner.When("I go to \"/blog1\" 10 times");
+    testRunner.When("I go to \"/blog1\" 10 times");
 #line 20
-testRunner.When("I go to \"/blog2\" 10 times");
+    testRunner.When("I go to \"/blog2\" 10 times");
 #line 21
-testRunner.When("I go to \"/blog3\" 10 times");
+    testRunner.When("I go to \"/blog3\" 10 times");
 #line 22
-testRunner.When("I go to \"/blog4\" 10 times");
+    testRunner.When("I go to \"/blog4\" 10 times");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -117,10 +117,14 @@ testRunner.When("I go to \"/blog4\" 10 times");
             TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Hitting home page", ((string[])(null)));
 #line 24
 this.ScenarioSetup(scenarioInfo);
-#line 25
-testRunner.Given("I am logged in");
 #line 26
-testRunner.When("I go to \"/\" 40 times");
+    testRunner.When("I go to \"/\" 10 times");
+#line 27
+    testRunner.When("I go to \"/\" 10 times");
+#line 28
+    testRunner.When("I go to \"/\" 10 times");
+#line 29
+    testRunner.When("I go to \"/\" 10 times");
 #line hidden
             testRunner.CollectScenarioErrors();
         }

src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs

@@ -22,7 +22,7 @@ namespace Orchard.Tests.Environment {
         }
 
         protected override void Register(ContainerBuilder builder) {
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterAutoMocking();
         }
 

src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs

@@ -21,7 +21,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
         public void Init() {
             var builder = new ContainerBuilder();
             builder.RegisterType<ShellContextFactory>().As<IShellContextFactory>();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterAutoMocking(Moq.MockBehavior.Strict);
             _container = builder.Build();
         }

src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs

@@ -23,7 +23,7 @@ namespace Orchard.Tests.Environment.State {
         public void Init() {
             var builder = new ContainerBuilder();
             builder.RegisterType<DefaultProcessingEngine>().As<IProcessingEngine>();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterAutoMocking();
             _container = builder.Build();
 

src/Orchard.Tests/Localization/CultureManagerTests.cs

@@ -51,7 +51,7 @@ namespace Orchard.Tests.Localization {
             builder.RegisterInstance(new Mock<INotifier>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
             builder.RegisterType<StubHttpContextAccessor>().As<IHttpContextAccessor>();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterType<OrchardServices>().As<IOrchardServices>();

src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs

@@ -36,7 +36,7 @@ namespace Orchard.Tests.Mvc.Routes {
             rootBuilder.Register(ctx => _routes);
             rootBuilder.RegisterType<ShellRoute>().InstancePerDependency();
             rootBuilder.RegisterType<RunningShellTable>().As<IRunningShellTable>().SingleInstance();
-            rootBuilder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
+            rootBuilder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
             rootBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>();
 
             _rootContainer = rootBuilder.Build();

src/Orchard.Tests/Tasks/SweepGeneratorTests.cs

@@ -12,7 +12,7 @@ namespace Orchard.Tests.Tasks {
     public class SweepGeneratorTests : ContainerTestBase {
         protected override void Register(ContainerBuilder builder) {
             builder.RegisterAutoMocking(MockBehavior.Loose);
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterType<SweepGenerator>();
         }
 

src/Orchard.Tests/UI/ShapeTests.cs

@@ -19,7 +19,7 @@ namespace Orchard.Tests.UI {
 
         protected override void Register(ContainerBuilder builder) {
             builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<LayoutWorkContext>().As<IWorkContextStateProvider>();

src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Models;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.Localization;
@@ -67,9 +66,11 @@ namespace Orchard.Core.Common.Handlers {
         bool ContentTypeWithACommonPart(string typeName) {
             //Note: What about content type handlers which activate "CommonPart" in code?
             var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName);
-            if (contentTypeDefinition == null)
+            
-                return false;
+            if (contentTypeDefinition != null)
-            return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
+                return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
+
+            return false;
         }
 
         void AssignCreatingOwner(InitializingContentContext context, CommonPart part) {

src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml

@@ -1,5 +1,5 @@
 @if (HasText(Model.Description)) {
-<div class="blog-description">
+<div class="content-description blog-description">
     <p>@Model.Description</p>
 </div>
 }

src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs

@@ -45,6 +45,8 @@ namespace Orchard.Setup {
             // standard services needed in setup mode
             builder.RegisterModule(new MvcModule());
             builder.RegisterModule(new CommandModule());
+            builder.RegisterModule(new WorkContextModule());
+
             builder.RegisterType<RoutePublisher>().As<IRoutePublisher>().InstancePerLifetimeScope();
             builder.RegisterType<ModelBinderPublisher>().As<IModelBinderPublisher>().InstancePerLifetimeScope();
             builder.RegisterType<WebFormViewEngineProvider>().As<IViewEngineProvider>().As<IShapeTemplateViewEngine>().InstancePerLifetimeScope();
@@ -58,7 +60,7 @@ namespace Orchard.Setup {
             builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>().InstancePerLifetimeScope();
             builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope();
             builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
             builder.RegisterType<ResourceManifest>().As<IResourceManifestProvider>().InstancePerLifetimeScope();
             builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope();
             builder.RegisterType<ResourceFilter>().As<IFilterProvider>().InstancePerLifetimeScope();

src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs

@@ -38,32 +38,30 @@ namespace Orchard.Users.Services {
         public ILogger Logger { get; set; }
 
         public string VerifyUserUnicity(string userName, string email) {
-            IEnumerable<UserPart> allUsers = _contentManager.Query<UserPart, UserPartRecord>().List();
+            string normalizedUserName = userName.ToLower();
 
-            foreach (var user in allUsers) {
+            if (_contentManager.Query<UserPart, UserPartRecord>()
-                if (String.Equals(userName.ToLower(), user.NormalizedUserName, StringComparison.OrdinalIgnoreCase)) {
+                                   .Where(user => 
-                    return "A user with that name already exists";
+                                          user.NormalizedUserName == normalizedUserName || 
-                }
+                                          user.Email == email)
-                if (String.Equals(email, user.Email, StringComparison.OrdinalIgnoreCase)) {
+                                   .List().Any()) {
-                    return "A user with that email already exists";
+                return "User with that username and/or email already exists.";
-                }
             }
 
             return null;
         }
 
         public string VerifyUserUnicity(int id, string userName, string email) {
-            IEnumerable<UserPart> allUsers = _contentManager.Query<UserPart, UserPartRecord>().List();
+            string normalizedUserName = userName.ToLower();
-            foreach (var user in allUsers) {
+
-                if (user.Id == id)
+            if (_contentManager.Query<UserPart, UserPartRecord>()
-                    continue;
+                                   .Where(user =>
-                if (String.Equals(userName.ToLower(), user.NormalizedUserName, StringComparison.OrdinalIgnoreCase)) {
+                                          user.NormalizedUserName == normalizedUserName ||
-                    return "A user with that name already exists";
+                                          user.Email == email)
-                }
+                                   .List().Any(user => user.Id != id)) {
-                if (String.Equals(email, user.Email, StringComparison.OrdinalIgnoreCase)) {
+                return "User with that username and/or email already exists.";
-                    return "A user with that email already exists";
-                }
             }
+
             return null;
         }
 

src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css

@@ -321,26 +321,25 @@ nav ul
 /* Main
 ***************************************************************/
 
-/* Blogs */
+/* Content lists and details */
-.blog-description { font-size: 1.231em; }
+.content-description { font-size: 1.154em; }
-.blog-post .tags { margin-top: 12px; }
+.content-items { padding: 0; margin: 0; list-style: none; }
-.blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
+.content-items li { padding: 0; margin: 0; }
-.blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
+.content-items .content-item { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
-.blog-posts { padding: 0; margin: 0; list-style: none; }
+.content-items .content-item header {}
-.blog-posts li { padding: 0; margin: 0; }
+.content-items .content-item header h1 { font-size: 1.308em; color:#ff0000; }
-.blog-posts .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
+.content-items .content-item header h1 a { color: #434343; }
-.blog-posts .blog-post header {}
+.content-items .content-item header h1 a:hover {}
-.blog-posts .blog-post header h1 { font-size: 1.308em; }
+
-.blog-posts .blog-post header h1 a { color: #434343; }
+/* Tags */
-.blog-posts .blog-post header h1 a:hover {}
+.tags { margin-top: 12px; }
-.blog-posts .blog-post .tags { margin-top: 12px; }
+.tags a { background-color: #dbdbdb; padding: 3px 6px; color: #434343; }
-.blog-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
+.tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
-.blog-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
+
-.blog-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 0.846em; }
+/* Metadata */
-.blog-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
+.metadata { margin: 0 0 12px 0; color: #999; font-size: 0.846em; }
-.blog-posts .blog-post .metadata .commentcount { display: inline; }
+.metadata .published { display: inline; margin: 0 6px 0 0; }
-.blog-post {}
+.metadata .commentcount { display: inline; }
-.blog-post-title {}
 .meta {}
 
 /* Comments */
@@ -359,38 +358,6 @@ nav ul
 .comment-disabled {}
 .comment-count { font-size: 1.231em; }
 
-/* Tag Search */
-.tagged-posts {}
-.tagged-posts { padding: 0; margin: 0; list-style: none; }
-.tagged-posts li { padding: 0; margin: 0; }
-.tagged-posts .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
-.tagged-posts .blog-post header {}
-.tagged-posts .blog-post header h1 { font-size: 1.308em; }
-.tagged-posts .blog-post header h1 a { color: #434343; }
-.tagged-posts .blog-post header h1 a:hover {}
-.tagged-posts .blog-post .tags { margin-top: 12px; }
-.tagged-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.tagged-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
-.tagged-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 1.1em; }
-.tagged-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
-.tagged-posts .blog-post .metadata .commentcount { display: inline; }
-
-/* Search Results */
-.search-results {}
-.search-results { padding: 0; margin: 0; list-style: none; }
-.search-results li { padding: 0; margin: 0; }
-.search-results .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
-.search-results .blog-post header {}
-.search-results .blog-post header h1 { font-size: 1.308em; }
-.search-results .blog-post header h1 a { color: #434343; }
-.search-results .blog-post header h1 a:hover {}
-.search-results .blog-post .tags { margin-top: 12px; }
-.search-results .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.search-results .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
-.search-results .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 0.846em; }
-.search-results .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
-.search-results .blog-post .metadata .commentcount { display: inline; }
-
 /* Confirmations */
 .message, .validation-summary-errors { margin:10px 0 4px 0; padding:4px; }
 .messages a { font-weight:bold; }
@@ -455,18 +422,11 @@ nav ul
 /* Widgets
 ***************************************************************/
 .widgets {}
+.widget h1 { font-size: 1.077em; }
 
 /* Search */
 /* Search widget shuld go into the sidebar for proper styling */
 /* TODO: (mibach) Generic any zone compatible search widget */
-.widget-search-form 
-{
-    position: absolute;
-    top: 30px;
-    right: 12px;
-}
-.widget-search-form h1 { font-size: 1.077em; }
-
 .search-form {}
 .search-form input[type="text"] { float: left; }
 .search-form button[type="submit"] { float: left; margin: 0; margin-left: 6px; }
@@ -477,12 +437,6 @@ nav ul
 .widget-control .manage-actions { position:absolute; top: 0px; right: 0px; }
 .widget-control .manage-actions a { display: block; background-color: #dbdbdb; color: #434343; padding: 3px 6px;  }
 .widget-control .manage-actions a:hover { background-color: #434343; color: #fff; text-decoration: none; }
-.widget-control .widget-search-form /* TODO: (mibach) Remove special case for Search Widget */
-{
-    position: absolute;
-    top: 0px;
-    right: 12px;
-}
 
 /* Content Mode */
 .content-control { position: relative; border: 1px dotted #5f97af; }

src/Orchard/Environment/WorkContextAccessor.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Web;
 using Autofac;
 using Orchard.Mvc;
 
 namespace Orchard.Environment {
-    public class DefaultWorkContextAccessor : IWorkContextAccessor {
+    public class WorkContextAccessor : IWorkContextAccessor {
         readonly ILifetimeScope _lifetimeScope;
 
         readonly IHttpContextAccessor _httpContextAccessor;
@@ -18,7 +16,7 @@ namespace Orchard.Environment {
         [ThreadStatic]
         static ConcurrentDictionary<object, WorkContext> _threadStaticContexts;
 
-        public DefaultWorkContextAccessor(
+        public WorkContextAccessor(
             IHttpContextAccessor httpContextAccessor,
             ILifetimeScope lifetimeScope) {
             _httpContextAccessor = httpContextAccessor;
@@ -39,36 +37,23 @@ namespace Orchard.Environment {
         }
 
         public IWorkContextScope CreateWorkContextScope(HttpContextBase httpContext) {
+            var workLifetime = _lifetimeScope.BeginLifetimeScope("work");
+            workLifetime.Resolve<WorkContextProperty<HttpContextBase>>().Value = httpContext;
 
-            var workLifetime = SpawnWorkLifetime(builder => {
-                builder.Register(ctx => httpContext)
-                    .As<HttpContextBase>();
-
-                builder.Register(ctx => new WorkContextImplementation(ctx))
-                    .As<WorkContext>()
-                    .InstancePerMatchingLifetimeScope("work");
-            });
             return new HttpContextScopeImplementation(
                 workLifetime,
                 httpContext,
                 _workContextKey);
         }
 
+
         public IWorkContextScope CreateWorkContextScope() {
             var httpContext = _httpContextAccessor.Current();
             if (httpContext != null)
                 return CreateWorkContextScope(httpContext);
 
-            var workLifetime = SpawnWorkLifetime(builder => {
-                builder.Register(ctx => httpContext)
-                    .As<HttpContextBase>();
-
-                builder.Register(ctx => new WorkContextImplementation(ctx))
-                    .As<WorkContext>()
-                    .InstancePerMatchingLifetimeScope("work");
-            });
             return new ThreadStaticScopeImplementation(
-                workLifetime,
+                _lifetimeScope.BeginLifetimeScope("work"),
                 EnsureThreadStaticContexts(),
                 _workContextKey);
         }
@@ -77,49 +62,6 @@ namespace Orchard.Environment {
             return _threadStaticContexts ?? (_threadStaticContexts = new ConcurrentDictionary<object, WorkContext>());
         }
 
-        private ILifetimeScope SpawnWorkLifetime(Action<ContainerBuilder> configurationAction) {
-            return _lifetimeScope.BeginLifetimeScope("work", configurationAction);
-        }
-
-        class WorkContextImplementation : WorkContext {
-            readonly IComponentContext _componentContext;
-            readonly ConcurrentDictionary<string, Func<object>> _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
-            readonly IEnumerable<IWorkContextStateProvider> _workContextStateProviders;
-
-            public WorkContextImplementation(IComponentContext componentContext) {
-                _componentContext = componentContext;
-                _workContextStateProviders = componentContext.Resolve<IEnumerable<IWorkContextStateProvider>>();
-            }
-
-            public override T Resolve<T>() {
-                return _componentContext.Resolve<T>();
-            }
-
-            public override bool TryResolve<T>(out T service) {
-                return _componentContext.TryResolve(out service);
-            }
-
-            public override T GetState<T>(string name) {
-                var resolver = _stateResolvers.GetOrAdd(name, FindResolverForState<T>);
-                return (T)resolver();
-            }
-
-            Func<object> FindResolverForState<T>(string name) {
-                var resolver = _workContextStateProviders.Select(wcsp => wcsp.Get<T>(name))
-                    .FirstOrDefault(value => !Equals(value, default(T)));
-
-                if (resolver == null) {
-                    return () => default(T);
-                }
-                return () => resolver(this);
-            }
-
-
-            public override void SetState<T>(string name, T value) {
-                _stateResolvers[name] = () => value;
-            }
-        }
-
 
         class HttpContextScopeImplementation : IWorkContextScope {
             readonly WorkContext _workContext;

src/Orchard/Environment/WorkContextImplementation.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Autofac;
+
+namespace Orchard.Environment {
+    class WorkContextImplementation : WorkContext {
+        readonly IComponentContext _componentContext;
+        readonly ConcurrentDictionary<string, Func<object>> _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
+        readonly IEnumerable<IWorkContextStateProvider> _workContextStateProviders;
+
+        public WorkContextImplementation(IComponentContext componentContext) {
+            _componentContext = componentContext;
+            _workContextStateProviders = componentContext.Resolve<IEnumerable<IWorkContextStateProvider>>();
+        }
+
+        public override T Resolve<T>() {
+            return _componentContext.Resolve<T>();
+        }
+
+        public override bool TryResolve<T>(out T service) {
+            return _componentContext.TryResolve(out service);
+        }
+
+        public override T GetState<T>(string name) {
+            var resolver = _stateResolvers.GetOrAdd(name, FindResolverForState<T>);
+            return (T)resolver();
+        }
+
+        Func<object> FindResolverForState<T>(string name) {
+            var resolver = Enumerable.FirstOrDefault(_workContextStateProviders.Select(wcsp => wcsp.Get<T>(name)), value => !Equals(value, default(T)));
+
+            if (resolver == null) {
+                return () => default(T);
+            }
+            return () => resolver(this);
+        }
+
+
+        public override void SetState<T>(string name, T value) {
+            _stateResolvers[name] = () => value;
+        }
+    }
+}

src/Orchard/Environment/WorkContextModule.cs

@@ -0,0 +1,24 @@
+using System.Web;
+using Autofac;
+
+namespace Orchard.Environment {
+    public class WorkContextModule : Module {
+        protected override void Load(ContainerBuilder builder) {
+            builder.RegisterType<WorkContextAccessor>()
+                .As<IWorkContextAccessor>()
+                .InstancePerMatchingLifetimeScope("shell");
+
+            builder.Register(ctx => new WorkContextImplementation(ctx))
+                .As<WorkContext>()
+                .InstancePerMatchingLifetimeScope("work");
+
+            builder.RegisterType<WorkContextProperty<HttpContextBase>>()
+                .As<WorkContextProperty<HttpContextBase>>()
+                .InstancePerMatchingLifetimeScope("work");
+
+            builder.Register(ctx => ctx.Resolve<WorkContextProperty<HttpContextBase>>().Value)
+                .As<HttpContextBase>()
+                .InstancePerDependency();
+        }
+    }
+}

src/Orchard/Environment/WorkContextProperty.cs

@@ -0,0 +1,5 @@
+namespace Orchard.Environment {
+    class WorkContextProperty<T> {
+        public T Value { get; set; }
+    }
+}

src/Orchard/IWorkContextAccessor.cs

@@ -2,7 +2,7 @@
 using System.Web;
 
 namespace Orchard {
-    public interface IWorkContextAccessor : ISingletonDependency {
+    public interface IWorkContextAccessor {
         WorkContext GetContext(HttpContextBase httpContext);
         IWorkContextScope CreateWorkContextScope(HttpContextBase httpContext);
 

src/Orchard/Mvc/OrchardControllerFactory.cs

@@ -36,10 +36,10 @@ namespace Orchard.Mvc {
             var serviceKey = (areaName + "/" + controllerName).ToLowerInvariant();
 
             // Now that the request container is known - try to resolve the controller information
-            Lazy<Meta<IController>> info;
+            Meta<Lazy<IController>> info;
             var workContext = requestContext.GetWorkContext();
             if (TryResolve(workContext, serviceKey, out info)) {
-                return (Type) info.Value.Metadata["ControllerType"];
+                return (Type) info.Metadata["ControllerType"];
             }
 
             return null;

src/Orchard/Orchard.Framework.csproj

@@ -158,6 +158,9 @@
     <Compile Include="Environment\Extensions\Loaders\RawThemeExtensionLoader.cs" />
     <Compile Include="Environment\Features\FeatureManager.cs" />
     <Compile Include="Environment\IAssemblyLoader.cs" />
+    <Compile Include="Environment\WorkContextImplementation.cs" />
+    <Compile Include="Environment\WorkContextModule.cs" />
+    <Compile Include="Environment\WorkContextProperty.cs" />
     <Compile Include="Localization\Services\CurrentCultureWorkContext.cs" />
     <Compile Include="Localization\Services\DefaultLocalizedStringManager.cs" />
     <Compile Include="Localization\Services\ILocalizedStringManager.cs" />
@@ -419,7 +422,7 @@
     <Compile Include="DisplayManagement\Implementation\IDisplayManager.cs" />
     <Compile Include="DisplayManagement\IShapeFactory.cs" />
     <Compile Include="DisplayManagement\Descriptors\Interfaces.cs" />
-    <Compile Include="Environment\DefaultWorkContextAccessor.cs" />
+    <Compile Include="Environment\WorkContextAccessor.cs" />
     <Compile Include="Environment\IHostLocalRestart.cs" />
     <Compile Include="Environment\IShellContainerRegistrations.cs" />
     <Compile Include="FileSystems\Dependencies\DynamicModuleVirtualPathProvider.cs" />