From ff31d75ce1d7741ca810b3ca80aae6ef4e800b90 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Thu, 24 Mar 2011 14:18:17 -0700
Subject: [PATCH] Updating Path on module's manifests. Adding FeatureName
 attribute.

--HG--
branch : dev
---
 src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt  | 1 +
 src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt | 9 ++++-----
 .../Modules/Orchard.Experimental/LockLogging.cs          | 1 -
 src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt  | 1 +
 src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt  | 1 +
 src/Orchard.Web/Modules/Orchard.jQuery/Module.txt        | 1 +
 .../Environment/Extensions/Folders/ExtensionFolders.cs   | 5 ++++-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
index c63e93ea3..d79ebb6ae 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
@@ -1,4 +1,5 @@
 Name: Archive Later
+Path: ArchiveLater
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
index f3a68792e..80761c299 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
@@ -5,12 +5,11 @@ Website: http://orchardproject.net
 Version: 1.0
 OrchardVersion: 1.0
 Description: Contains designer tools to ease the Themes development process
+FeatureName: Shape Tracing
+Category: Designer
+FeatureDescription: Displays all currently displayed shapes and some information to customize them
+Dependencies: Orchard.jQuery
 Features:
-    Orchard.DesignerTools:
-        Name: Shape Tracing
-        Category: Designer
-        Description: Displays all currently displayed shapes and some information to customize them
-        Dependencies: Orchard.jQuery
     UrlAlternates:
         Name: Url Alternates
         Category: Designer
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/LockLogging.cs b/src/Orchard.Web/Modules/Orchard.Experimental/LockLogging.cs
index 1d7b6c661..df5cc680d 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/LockLogging.cs
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/LockLogging.cs
@@ -10,7 +10,6 @@ namespace Orchard.Experimental {
     [OrchardFeature("Orchard.Experimental.LockLogging")]
     public class LockLogging : FilterProvider, IExceptionFilter {
         private readonly Work<ISessionLocator> _sessionLocator;
-        private readonly ITransactionManager _transactionManager;
 
         public LockLogging(Work<ISessionLocator> sessionLocator) {
             _sessionLocator = sessionLocator;
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
index 5cd5d3f57..11a192342 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
@@ -1,4 +1,5 @@
 Name: Import Export
+Path: ImportExport
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
index 2bf9c28a2..a267ff2d2 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
@@ -1,4 +1,5 @@
 Name: Publish Later
+Path: PublishLater
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt b/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
index 6e1780aef..9bc74a481 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
@@ -1,4 +1,5 @@
 Name: jQuery
+Path: Orchard.jQuery
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs b/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
index 3d78add09..7cbfcf1f3 100644
--- a/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
+++ b/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
@@ -183,6 +183,9 @@ namespace Orchard.Environment.Extensions.Folders {
                         case "FeatureDescription":
                             manifest.Add("FeatureDescription", field[1]);
                             break;
+                        case "FeatureName":
+                            manifest.Add("FeatureName", field[1]);
+                            break;
                         case "Priority":
                             manifest.Add("Priority", field[1]);
                             break;
@@ -202,7 +205,7 @@ namespace Orchard.Environment.Extensions.Folders {
             // Default feature
             FeatureDescriptor defaultFeature = new FeatureDescriptor {
                 Id = extensionDescriptor.Id,
-                Name = extensionDescriptor.Name,
+                Name = GetValue(manifest, "FeatureName") ?? extensionDescriptor.Name,
                 Priority = GetValue(manifest, "Priority") != null ? int.Parse(GetValue(manifest, "Priority")) : 0,
                 Description = GetValue(manifest, "FeatureDescription") ?? GetValue(manifest, "Description") ?? string.Empty,
                 Dependencies = ParseFeatureDependenciesEntry(GetValue(manifest, "Dependencies")),