From 09d232612ac99d7ea93c517f7a149dfc3c205a95 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Sat, 23 May 2015 11:09:41 +0200
Subject: [PATCH 1/3] Removed unused enum values and consolidated SortDirection
 and OrderByDirection.

The unused enum values of the SortDirectionEnum were probably an artifact of a copy/paste operation.
---
 src/Orchard.Web/Core/Containers/Models/OrderByDirection.cs  | 6 ------
 .../Core/Containers/ViewModels/ContainerViewModel.cs        | 4 +---
 .../Containers/Views/EditorTemplates/ContainerWidget.cshtml | 5 ++---
 src/Orchard.Web/Core/Orchard.Core.csproj                    | 1 -
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 src/Orchard.Web/Core/Containers/Models/OrderByDirection.cs

diff --git a/src/Orchard.Web/Core/Containers/Models/OrderByDirection.cs b/src/Orchard.Web/Core/Containers/Models/OrderByDirection.cs
deleted file mode 100644
index 3cc6e2697..000000000
--- a/src/Orchard.Web/Core/Containers/Models/OrderByDirection.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Orchard.Core.Containers.Models {
-    public enum OrderByDirection {
-        Ascending,
-        Descending
-    }
-}
diff --git a/src/Orchard.Web/Core/Containers/ViewModels/ContainerViewModel.cs b/src/Orchard.Web/Core/Containers/ViewModels/ContainerViewModel.cs
index 65006a4eb..dd0bbb328 100644
--- a/src/Orchard.Web/Core/Containers/ViewModels/ContainerViewModel.cs
+++ b/src/Orchard.Web/Core/Containers/ViewModels/ContainerViewModel.cs
@@ -26,8 +26,6 @@ namespace Orchard.Core.Containers.ViewModels {
 
     public enum SortDirection {
         Ascending,
-        Descending,
-        Created,
-        DisplayText
+        Descending
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml b/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
index 9be03b722..46d201a50 100644
--- a/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
+++ b/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
@@ -1,5 +1,4 @@
 @model Orchard.Core.Containers.ViewModels.ContainerWidgetViewModel
-@using Orchard.Core.Containers.Models;
 @{
     Script.Require("ShapesBase");
 }
@@ -25,8 +24,8 @@
         @Html.SelectOption(Model.Part.Record.OrderByProperty, "CustomPropertiesPart.CustomThree", T("Custom 3").Text)
     </select>
     <select title="@T("Order direction")" id="@Html.FieldIdFor(m => m.Part.Record.OrderByDirection)" name="@Html.FieldNameFor(m => m.Part.Record.OrderByDirection)">
-        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)OrderByDirection.Ascending, T("Ascending").Text)
-        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)OrderByDirection.Descending, T("Descending").Text)
+        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)SortDirection.Ascending, T("Ascending").Text)
+        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)SortDirection.Descending, T("Descending").Text)
     </select>
 </fieldset>
 <fieldset>
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index b7fbbb7ba..eaa488e62 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -117,7 +117,6 @@
     <Compile Include="Containers\ListViews\DefaultListView.cs" />
     <Compile Include="Containers\Migrations.cs" />
     <Compile Include="Containers\Models\ContainablePart.cs" />
-    <Compile Include="Containers\Models\OrderByDirection.cs" />
     <Compile Include="Containers\Models\ContainerPart.cs" />
     <Compile Include="Common\Shapes.cs" />
     <Compile Include="Common\Fields\TextField.cs" />

From 443b03fd67b410094df6fd18353536291e087380 Mon Sep 17 00:00:00 2001
From: Lombiq <registrator@lombiq.com>
Date: Sat, 23 May 2015 21:49:41 +0200
Subject: [PATCH 2/3] Removing unused folders from TaskLease

---
 .../Orchard.TaskLease/Orchard.TaskLease.csproj   |  6 +-----
 .../Modules/Orchard.TaskLease/Scripts/Web.config | 16 ----------------
 .../Modules/Orchard.TaskLease/Styles/Web.config  | 16 ----------------
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 src/Orchard.Web/Modules/Orchard.TaskLease/Scripts/Web.config
 delete mode 100644 src/Orchard.Web/Modules/Orchard.TaskLease/Styles/Web.config

diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj
index 358b87276..aeb29903f 100644
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj
+++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj
@@ -72,8 +72,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web.config" />
-    <Content Include="Scripts\Web.config" />
-    <Content Include="Styles\Web.config" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Content Include="Module.txt" />
   </ItemGroup>
@@ -85,9 +83,7 @@
     <Compile Include="Services\ITaskLeaseService.cs" />
     <Compile Include="Services\TaskLeaseService.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Tests\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Scripts/Web.config
deleted file mode 100644
index 7806fcc84..000000000
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Scripts/Web.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <system.webServer>
-    <staticContent>
-      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
-    </staticContent>
-
-    <handlers accessPolicy="Script,Read">
-      <!--
-      iis7 - for any request to a file exists on disk, return it via native http module.
-      accessPolicy 'Script' is to allow for a managed 404 page.
-      -->
-      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Styles/Web.config
deleted file mode 100644
index 7806fcc84..000000000
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Styles/Web.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <system.webServer>
-    <staticContent>
-      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
-    </staticContent>
-
-    <handlers accessPolicy="Script,Read">
-      <!--
-      iis7 - for any request to a file exists on disk, return it via native http module.
-      accessPolicy 'Script' is to allow for a managed 404 page.
-      -->
-      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
-    </handlers>
-  </system.webServer>
-</configuration>

From 801d58183a1be00c8c1a2519280a35bbf3e44f64 Mon Sep 17 00:00:00 2001
From: Lombiq <registrator@lombiq.com>
Date: Sat, 23 May 2015 23:54:08 +0200
Subject: [PATCH 3/3] Fixing that JobsQueue doesn't actually use Task Lease to
 prevent multiple server nodes from executing the same jobs

---
 .../Orchard.JobsQueue/Services/JobsQueueProcessor.cs  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs b/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs
index 085864810..958ef89d0 100644
--- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs
+++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs
@@ -35,12 +35,13 @@ namespace Orchard.JobsQueue.Services {
             // prevent two threads on the same machine to process the message queue
             if (_rwl.TryEnterWriteLock(0)) {
                 try {
-                    _taskLeaseService.Value.Acquire("JobsQueueProcessor", _clock.Value.UtcNow.AddMinutes(5));
-                    IEnumerable<QueuedJobRecord> messages;
+                    if (_taskLeaseService.Value.Acquire("JobsQueueProcessor", _clock.Value.UtcNow.AddMinutes(5)) != null) {
+                        IEnumerable<QueuedJobRecord> messages;
 
-                    while ((messages = _jobsQueueManager.Value.GetJobs(0, 10).ToArray()).Any()) {
-                        foreach (var message in messages) {
-                            ProcessMessage(message);
+                        while ((messages = _jobsQueueManager.Value.GetJobs(0, 10).ToArray()).Any()) {
+                            foreach (var message in messages) {
+                                ProcessMessage(message);
+                            }
                         }
                     }
                 }