From ef4b1ce1fc8dfa8c0717cf15083430b7a4e1834f Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Thu, 11 Nov 2010 17:17:38 -0800
Subject: [PATCH] Adapting Orchard.Packaging feature names

--HG--
branch : dev
---
 .../Modules/Orchard.Packaging/DefaultPackagingUpdater.cs     | 5 ++---
 src/Orchard.Web/Modules/Orchard.Packaging/Migrations.cs      | 3 +--
 .../Modules/Orchard.Packaging/Models/PackagingSource.cs      | 4 +++-
 src/Orchard.Web/Modules/Orchard.Packaging/Module.txt         | 4 ++--
 .../Orchard.Packaging/Services/PackagingSourceManager.cs     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs b/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs
index 516a49f6f..5be632a8c 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs
@@ -1,12 +1,11 @@
-using System;
-using Orchard.Environment;
+using Orchard.Environment;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Localization;
 using Orchard.Packaging.Services;
 
 namespace Orchard.Packaging {
-    [OrchardFeature("PackagingServices")]
+    [OrchardFeature("Gallery")]
     public class DefaultPackagingUpdater : IFeatureEventHandler {
         private readonly IPackagingSourceManager _packagingSourceManager;
 
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Migrations.cs
index 6cb62c79b..aa2ea40d9 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Migrations.cs
@@ -2,10 +2,9 @@
 using Orchard.Environment.Extensions;
 
 namespace Orchard.Packaging {
-    [OrchardFeature("PackagingServices")]
     public class Migrations: DataMigrationImpl {
         public int Create() {
-            SchemaBuilder.CreateTable("PackagingSourceRecord", 
+            SchemaBuilder.CreateTable("PackagingSource", 
                 table => table
                     .Column<int>("Id", column => column.PrimaryKey().Identity())
                     .Column<string>("FeedTitle", c => c.WithLength(255))
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Models/PackagingSource.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Models/PackagingSource.cs
index 070434df0..f0830cfb2 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Models/PackagingSource.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Models/PackagingSource.cs
@@ -1,4 +1,6 @@
-namespace Orchard.Packaging.Models {
+using Orchard.Environment.Extensions;
+
+namespace Orchard.Packaging.Models {
     public class PackagingSource {
         public virtual int Id { get; set; }
         public virtual string FeedTitle { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
index bdd0044d2..64b039f9f 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
@@ -8,12 +8,12 @@ Description: The packaging module enables packaging modules using the OPC format
 Features:
     PackagingServices:
         Description: Core services for packaging using the OPC format.
-        Category: Core
+        Category: Packaging
     Orchard.Packaging:
         Description: Commands for creating/installing local modules.
         Dependencies: PackagingServices
         Category: Packaging
     Gallery:
         Description: Module gallery management.
-        Dependencies: PackagingServices
+        Dependencies: PackagingServices, Orchard.Packaging
         Category: Packaging
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
index 7c42b937a..a8f3aa7d9 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
@@ -8,7 +8,7 @@ using Orchard.Localization;
 using Orchard.Packaging.Models;
 
 namespace Orchard.Packaging.Services {
-    [OrchardFeature("PackagingServices")]
+    [OrchardFeature("Gallery")]
     public class PackagingSourceManager : IPackagingSourceManager {
         private const string ModulesFilter = "Orchard.Module.";
         private const string ThemesFilter = "Orchard.Theme.";