Merge 1.x -> default

src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs

@@ -19,7 +19,7 @@ namespace Orchard.Core.Settings.Descriptor {
             T = NullLocalizer.Instance;
         }
 
-        Localizer T { get; set; }
+        public Localizer T { get; set; }
 
         public ShellDescriptor GetShellDescriptor() {
             ShellDescriptorRecord shellDescriptorRecord = GetDescriptorRecord();

src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentFeedItemBuilder.cs

@@ -21,7 +21,7 @@ namespace Orchard.Comments.Feeds {
             T = NullLocalizer.Instance;
         }
 
-        Localizer T { get; set; }
+        public Localizer T { get; set; }
 
         public void Populate(FeedContext context) {
             foreach (var feedItem in context.Response.Items.OfType<FeedItem<CommentPart>>()) {

src/Orchard.Web/Modules/Orchard.ImportExport/RecipeHandlers/DataRecipeHandler.cs

@@ -16,7 +16,7 @@ namespace Orchard.ImportExport.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         // <Data />
         // Import Data

src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs

@@ -24,7 +24,7 @@ namespace Orchard.Packaging.Services {
             T = NullLocalizer.Instance;
         }
 
-        Localizer T { get; set; }
+        public Localizer T { get; set; }
 
         #region IPackagingSourceManager Members
 

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CommandRecipeHandler.cs

@@ -22,7 +22,7 @@ namespace Orchard.Recipes.RecipeHandlers  {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         /* 
          <Command>

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/FeatureRecipeHandler.cs

@@ -18,7 +18,7 @@ namespace Orchard.Recipes.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         // <Feature enable="f1,f2,f3" disable="f4" />
         // Enable/Disable features.

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/MetaDataRecipeHandler.cs

@@ -19,7 +19,7 @@ namespace Orchard.Recipes.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         /* 
            <Metadata>

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/MigrationRecipeHandler.cs

@@ -18,7 +18,7 @@ namespace Orchard.Recipes.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         // <Migration features="f1, f2" /> 
         // <Migration features="*" />

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/ModuleRecipeHandler.cs

@@ -31,7 +31,7 @@ namespace Orchard.Recipes.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         // <Module packageId="module1" [repository="somerepo"] version="1.1" />
         // install modules from feed.

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/SettingsRecipeHandler.cs

@@ -19,7 +19,7 @@ namespace Orchard.Recipes.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         /*  
          <Settings>

src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/ThemeRecipeHandler.cs

@@ -37,7 +37,7 @@ namespace Orchard.Recipes.RecipeHandlers {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         // <Theme packageId="theme1" repository="somethemerepo" version="1.1" enable="true" current="true" />
         // install themes from feed.

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs

@@ -27,7 +27,7 @@ namespace Orchard.Recipes.Services {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public IEnumerable<Recipe> HarvestRecipes(string extensionId) {
             var recipes = new List<Recipe>();

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeJournalManager.cs

@@ -36,7 +36,7 @@ namespace Orchard.Recipes.Services {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public void ExecutionStart(string executionId) {
             var executionJournal = GetJournalFile(executionId);

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs

@@ -19,7 +19,7 @@ namespace Orchard.Recipes.Services {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public string Execute(Recipe recipe) {
             if (recipe == null)

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeParser.cs

@@ -14,7 +14,7 @@ namespace Orchard.Recipes.Services {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public Recipe ParseRecipe(string recipeText) {
             var recipe = new Recipe();

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepExecutor.cs

@@ -20,7 +20,7 @@ namespace Orchard.Recipes.Services {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public bool ExecuteNextStep(string executionId) {
             var nextRecipeStep= _recipeStepQueue.Dequeue(executionId);

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepQueue.cs

@@ -20,7 +20,7 @@ namespace Orchard.Recipes.Services {
         }
 
         public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public void Enqueue(string executionId, RecipeStep step) {
             var recipeStepElement = new XElement("RecipeStep");

src/Orchard/Environment/Configuration/ShellSettingsManager.cs

@@ -12,7 +12,7 @@ namespace Orchard.Environment.Configuration {
         public const char Separator = ':';
         public const string EmptyValue = "null";
 
-        Localizer T { get; set; }
+        public Localizer T { get; set; }
         
         public ShellSettingsManager(
             IAppDataFolder appDataFolder, 

src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs

@@ -35,8 +35,8 @@ namespace Orchard.Environment.Extensions.Folders {
             T = NullLocalizer.Instance;
         }
 
-        Localizer T { get; set; }
+        public Localizer T { get; set; }
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public IEnumerable<ExtensionDescriptor> AvailableExtensions() {
             var list = new List<ExtensionDescriptor>();

src/Orchard/Environment/State/DefaultProcessingEngine.cs

@@ -11,12 +11,13 @@ using Orchard.Logging;
 namespace Orchard.Environment.State {
     public class DefaultProcessingEngine : Component, IProcessingEngine {
         private readonly IShellContextFactory _shellContextFactory;
+        private readonly Func<IOrchardHost> _orchardHost;
         private readonly IList<Entry> _entries = new List<Entry>();
 
 
-        public DefaultProcessingEngine(
+        public DefaultProcessingEngine(IShellContextFactory shellContextFactory, Func<IOrchardHost> orchardHost) {
-            IShellContextFactory shellContextFactory) {
             _shellContextFactory = shellContextFactory;
+            _orchardHost = orchardHost;
         }
 
         public string AddTask(ShellSettings shellSettings, ShellDescriptor shellDescriptor, string eventName, Dictionary<string, object> parameters) {
@@ -67,6 +68,12 @@ namespace Orchard.Environment.State {
         }
 
         private void Execute(Entry entry) {
+            // Force reloading extensions if there were extensions installed
+            // See http://orchard.codeplex.com/workitem/17465
+            if (entry.MessageName == "IRecipeSchedulerEventHandler.ExecuteWork") {
+                var ctx = _orchardHost().GetShellContext(entry.ShellSettings);
+            }
+
             var shellContext = _shellContextFactory.CreateDescribedContext(entry.ShellSettings, entry.ShellDescriptor);
             using (shellContext.LifetimeScope) {
                 using (var standaloneEnvironment = shellContext.LifetimeScope.CreateWorkContextScope()) {

src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathMonitor.cs

@@ -20,7 +20,7 @@ namespace Orchard.FileSystems.VirtualPath {
             Logger = NullLogger.Instance;
         }
 
-        ILogger Logger { get; set; }
+        public ILogger Logger { get; set; }
 
         public IVolatileToken WhenPathChanges(string virtualPath) {
             try {