Consolidated separate features into a single one.

2025-04-05 21:01:35 +08:00 · 2015-11-24 01:44:49 +01:00 · 2015-11-24 01:44:49 +01:00 · a09c2045c5
commit a09c2045c5
parent 3da3ab8a49
33 changed files with 32 additions and 106 deletions
--- a/src/Orchard.Profile/profiling-setup-commands.txt
+++ b/src/Orchard.Profile/profiling-setup-commands.txt
@ -1 +1 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,Navigation,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.Resources.jQuery,Orchard.Lists,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine,Orchard.Tokens,Orchard.Alias,Orchard.Autoroute
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,Navigation,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.Resources,Orchard.Lists,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine,Orchard.Tokens,Orchard.Alias,Orchard.Autoroute
--- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
+++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
@ -24,7 +24,7 @@ namespace Orchard.Specs.Bindings {
            webApp.GivenIHaveACleanSiteWith(
                virtualDirectory,
                TableData(
-                new { extension = "Module", names = "Lucene, Markdown, Orchard.Alias, Orchard.AntiSpam, Orchard.ArchiveLater, Orchard.Autoroute, Orchard.Azure, Orchard.Blogs, Orchard.Caching, Orchard.CodeGeneration, Orchard.Comments, Orchard.ContentPermissions, Orchard.ContentPicker, Orchard.ContentTypes, Orchard.CustomForms, Orchard.DesignerTools, Orchard.Email, Orchard.Fields, Orchard.Forms, Orchard.ImageEditor, Orchard.ImportExport, Orchard.Indexing, Orchard.JobsQueue, Orchard.Resources.jQuery, Orchard.Layouts, Orchard.Lists, Orchard.Localization, Orchard.Media, Orchard.MediaLibrary, Orchard.MediaPicker, Orchard.MediaProcessing, Orchard.Migrations, Orchard.Modules, Orchard.MultiTenancy, Orchard.OutputCache, Orchard.Packaging, Orchard.Pages, Orchard.Projections, Orchard.PublishLater, Orchard.Recipes, Orchard.Roles, Orchard.Rules, Orchard.Scripting, Orchard.Scripting.CSharp, Orchard.Scripting.Dlr, Orchard.Search, Orchard.SecureSocketsLayer, Orchard.Setup, Orchard.Tags, Orchard.TaskLease, Orchard.Taxonomies, Orchard.Templates, Orchard.Themes, Orchard.Tokens, Orchard.Users, Orchard.Warmup, Orchard.Widgets, Orchard.Workflows, SysCache, TinyMce, Upgrade" },
+                new { extension = "Module", names = "Lucene, Markdown, Orchard.Alias, Orchard.AntiSpam, Orchard.ArchiveLater, Orchard.Autoroute, Orchard.Azure, Orchard.Blogs, Orchard.Caching, Orchard.CodeGeneration, Orchard.Comments, Orchard.ContentPermissions, Orchard.ContentPicker, Orchard.ContentTypes, Orchard.CustomForms, Orchard.DesignerTools, Orchard.Email, Orchard.Fields, Orchard.Forms, Orchard.ImageEditor, Orchard.ImportExport, Orchard.Indexing, Orchard.JobsQueue, Orchard.Resources, Orchard.Layouts, Orchard.Lists, Orchard.Localization, Orchard.Media, Orchard.MediaLibrary, Orchard.MediaPicker, Orchard.MediaProcessing, Orchard.Migrations, Orchard.Modules, Orchard.MultiTenancy, Orchard.OutputCache, Orchard.Packaging, Orchard.Pages, Orchard.Projections, Orchard.PublishLater, Orchard.Recipes, Orchard.Roles, Orchard.Rules, Orchard.Scripting, Orchard.Scripting.CSharp, Orchard.Scripting.Dlr, Orchard.Search, Orchard.SecureSocketsLayer, Orchard.Setup, Orchard.Tags, Orchard.TaskLease, Orchard.Taxonomies, Orchard.Templates, Orchard.Themes, Orchard.Tokens, Orchard.Users, Orchard.Warmup, Orchard.Widgets, Orchard.Workflows, SysCache, TinyMce, Upgrade" },
                new { extension = "Core", names = "Common, Containers, Contents, Dashboard, Feeds, Navigation, Scheduling, Settings, Shapes, Title, XmlRpc" },
                new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));

--- a/src/Orchard.Specs/Setup.feature
+++ b/src/Orchard.Specs/Setup.feature
@ -6,7 +6,7 @@ Feature: Setup
 Scenario: Root request shows setup form
    Given I have a clean site with
            | extension | names |
-            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
+            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
            | Theme | SafeMode |
    When I go to "/"
@ -17,7 +17,7 @@ Scenario: Root request shows setup form
 Scenario: Setup folder also shows setup form
    Given I have a clean site with
            | extension | names |
-            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
+            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
            | Theme | SafeMode |
    When I go to "/Setup"
@ -28,7 +28,7 @@ Scenario: Setup folder also shows setup form
 Scenario: Some of the initial form values are required
    Given I have a clean site with
            | extension | names |
-            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
+            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
            | Theme | SafeMode |
    When I go to "/Setup"
@ -40,7 +40,7 @@ Scenario: Some of the initial form values are required
 Scenario: Calling setup on a brand new install
    Given I have a clean site with
            | extension | names |
-            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
+            | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
            | Theme | SafeMode, TheAdmin, TheThemeMachine |
        And I am on "/Setup"
--- a/src/Orchard.Specs/Setup.feature.cs
+++ b/src/Orchard.Specs/Setup.feature.cs
@ -78,7 +78,7 @@ this.ScenarioSetup(scenarioInfo);
                        "names"});
            table1.AddRow(new string[] {
                        "Module",
-                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
+                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
            table1.AddRow(new string[] {
                        "Core",
                        "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
@ -113,7 +113,7 @@ this.ScenarioSetup(scenarioInfo);
                        "names"});
            table2.AddRow(new string[] {
                        "Module",
-                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
+                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
            table2.AddRow(new string[] {
                        "Core",
                        "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
@ -148,7 +148,7 @@ this.ScenarioSetup(scenarioInfo);
                        "names"});
            table3.AddRow(new string[] {
                        "Module",
-                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
+                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
            table3.AddRow(new string[] {
                        "Core",
                        "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
@ -185,7 +185,7 @@ this.ScenarioSetup(scenarioInfo);
                        "names"});
            table4.AddRow(new string[] {
                        "Module",
-                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
+                        @"Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.Resources, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp"});
            table4.AddRow(new string[] {
                        "Core",
                        "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
@ -10,7 +10,7 @@ Features:
        Name: Anti-Spam
        Description: Provides anti-spam services to protect your content from malicious submissions.
        Category: Security
-        Dependencies: Orchard.Tokens, Orchard.Resources.jQuery
+        Dependencies: Orchard.Tokens, Orchard.Resources
    Akismet.Filter:
        Name: Akismet Anti-Spam Filter
        Description: Provides an anti-spam filter based on Akismet.
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt
@ -10,4 +10,4 @@ Features:
        Name: Microsoft Azure Media Services
        Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
        Category: Hosting
-        Dependencies: Orchard.MediaLibrary, Orchard.PublishLater, Orchard.TaskLease, Orchard.Resources.jQuery, Orchard.TaskLease, Orchard.Resources.Knockout, Orchard.TaskLease, Orchard.Resources.Moment, Orchard.TaskLease, Orchard.Resources.Underscore, Orchard.Resources.BlockUI, Orchard.Resources.Uri
+        Dependencies: Orchard.MediaLibrary, Orchard.PublishLater, Orchard.TaskLease, Orchard.Resources
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
@ -6,7 +6,7 @@ Version: 1.9.2
 OrchardVersion: 1.9
 Description: The Orchard Blogs module is implementing basic blogging features. 
 FeatureDescription: A simple web log.
-Dependencies: Shapes, Common, Feeds, Navigation, Orchard.Widgets, Orchard.Resources.jQuery, Orchard.PublishLater, Orchard.Autoroute
+Dependencies: Shapes, Common, Feeds, Navigation, Orchard.Widgets, Orchard.Resources, Orchard.PublishLater, Orchard.Autoroute
 Category: Content
 Features:
    Orchard.Blogs.RemotePublishing:
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
@ -8,7 +8,7 @@ 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.Resources.jQuery
+Dependencies: Orchard.Resources
 Features:
    UrlAlternates:
        Name: Url Alternates
--- a/src/Orchard.Web/Modules/Orchard.Fields/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Module.txt
@ -9,4 +9,4 @@ Features:
    Orchard.Fields:
        Description: Contains the following fields: Input, Boolean, DateTime, Numeric, Link, Enumeration
        Category: Fields
-        Dependencies: Common, Orchard.Resources.jQuery
+        Dependencies: Common, Orchard.Resources
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
@ -11,4 +11,4 @@ Features:
        Name: Import Export
        Description: Imports and exports content item data.
        Category: Content
-        Dependencies: Orchard.Resources.jQuery, Orchard.Recipes, Orchard.Setup.Services
+        Dependencies: Orchard.Resources, Orchard.Recipes, Orchard.Setup.Services
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
@ -10,7 +10,7 @@ Features:
    Orchard.Layouts:
        Name: Layouts
        Description: Provides tools to create layouts.
-        Dependencies: Common, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, Orchard.Conditions, Orchard.Resources.jQuery, Orchard.Resources.AngularJs, Orchard.Resources.Underscore, Orchard.Resources.Bootstrap, Orchard.Resources.FontAwesome
+        Dependencies: Common, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, Orchard.Conditions, Orchard.Resources
        Category: Layout
    Orchard.Layouts.Snippets:
        Name: Layout Snippets
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt
@ -7,7 +7,7 @@ OrchardVersion: 1.9
 Description: Provides enhanced Media management tools.
 Features:
    Orchard.MediaLibrary:
-		Name: Media Library
+        Name: Media Library
        Description: Provides enhanced Media management tools.
-		Dependencies: Title, Orchard.MediaProcessing, Orchard.Tokens, Orchard.Resources.jQuery, Orchard.Resources.History, Orchard.Resources.Knockout
-		Category: Media
+        Dependencies: Title, Orchard.MediaProcessing, Orchard.Tokens, Orchard.Resources
+        Category: Media
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
@ -7,6 +7,6 @@ Version: 1.8
 OrchardVersion: 1.9
 LifecycleStatus: Deprecated
 Description: UI for browsing for, uploading, or selecting an image for an HTML editor.
-Dependencies: Orchard.Media, Orchard.Resources.jQuery
+Dependencies: Orchard.Media, Orchard.Resources
 FeatureDescription: UI for browsing for, uploading, or selecting an image for an HTML editor.
 Category: Input Editor
--- a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
@ -10,5 +10,5 @@ Category: Core
 Features:
    Orchard.Modules:
        Description: Standard module and feature management.
-        Dependencies: Orchard.Resources.jQuery
-        Category: Core
+        Dependencies: Orchard.Resources
+        Category: Core
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
@ -8,4 +8,4 @@ OrchardVersion: 1.9
 Description: The multi-tenancy module enables multiple Orchard sites to run in isolation inside of a single web application, improving site density on a single server or hosted account.
 FeatureDescription: Configure multiple site tenants.
 Category: Hosting
-Dependencies: Orchard.Resources.jQuery
+Dependencies: Orchard.Resources
--- a/src/Orchard.Web/Modules/Orchard.Resources/AngularJs.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/AngularJs.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.AngularJs")]
    public class AngularJs : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/BlockUI.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/BlockUI.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.BlockUI")]
    public class BlockUI : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/Bootstrap.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Bootstrap.cs
@ -1,16 +1,10 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.Bootstrap")]
    public class Bootstrap : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
-
-            // Styles.
            manifest.DefineStyle("Bootstrap").SetUrl("bootstrap.min.css", "bootstrap.css").SetVersion("3.3.5").SetCdn("//ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/css/bootstrap.min.css", "//ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/css/bootstrap.css", true);
-
-            // Scripts.
            manifest.DefineScript("Bootstrap").SetUrl("bootstrap.min.js", "bootstrap.js").SetVersion("3.3.5").SetDependencies("jQuery").SetCdn("//ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/bootstrap.min.js", "//ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/bootstrap.js", true);
        }
    }
--- a/src/Orchard.Web/Modules/Orchard.Resources/FontAwesome.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/FontAwesome.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.FontAwesome")]
    public class FontAwesome : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/History.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/History.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.History")]
    public class History : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/Knockout.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Knockout.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.Knockout")]
    public class Knockout : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Module.txt
@ -9,54 +9,4 @@ Features:
    Orchard.Resources:
        Name: Resources
        Description: Provides a variety of client script libraries used for the Orchard dashboard.
-        Category: Core
-    Orchard.Resources.jQuery:
-        Name: jQuery Resources
-        Description: Provides the jQuery and jQuery related libraries.
-        Category: Core
-        Dependencies: Orchard.Resources
-    Orchard.Resources.AngularJs:
-        Name: Angular Resources
-        Description: Provides the AngularJs library.
-        Category: Core
-        Dependencies: Orchard.Resources, Orchard.Resources.jQuery
-    Orchard.Resources.Underscore:
-        Name: Underscore Resources
-        Description: Provides the Underscore library.
-        Category: Core
-        Dependencies: Orchard.Resources
-    Orchard.Resources.Bootstrap:
-        Name: Bootstrap Resources
-        Description: Provides the Bootstrap library.
-        Category: Core
-        Dependencies: Orchard.Resources, Orchard.Resources.jQuery
-    Orchard.Resources.FontAwesome:
-        Name: FontAwesome Resources
-        Description: Provides the FontAwesome library.
-        Category: Core
-        Dependencies: Orchard.Resources
-    Orchard.Resources.History:
-        Name: History Resources
-        Description: Provides the History script library.
-        Category: Core
-        Dependencies: Orchard.Resources
-    Orchard.Resources.Knockout:
-        Name: Knockout Resources
-        Description: Provides the Knockout script library.
-        Category: Core
-        Dependencies: Orchard.Resources
-    Orchard.Resources.Moment:
-        Name: Moment Resources
-        Description: Provides the Moment script library.
-        Category: Core
-        Dependencies: Orchard.Resources
-    Orchard.Resources.BlockUI:
-        Name: Moment Resources
-        Description: Provides the BlockUI script library.
-        Category: Core
-        Dependencies: Orchard.Resources, Orchard.Resources.jQuery
-    Orchard.Resources.Uri:
-        Name: Uri Resources
-        Description: Provides the Uri script library.
-        Category: Core
-        Dependencies: Orchard.Resources
+        Category: Core
--- a/src/Orchard.Web/Modules/Orchard.Resources/Moment.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Moment.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.Moment")]
    public class Moment : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/Underscore.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Underscore.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.Underscore")]
    public class Underscore : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/Uri.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Uri.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.Uri")]
    public class Uri : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Resources/jQuery.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/jQuery.cs
@ -1,8 +1,6 @@
-using Orchard.Environment.Extensions;
 using Orchard.UI.Resources;

 namespace Orchard.Resources {
-    [OrchardFeature("Orchard.Resources.jQuery")]
    public class jQuery : IResourceManifestProvider {
        public void BuildManifests(ResourceManifestBuilder builder) {
            var manifest = builder.Add();
--- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
@ -14,7 +14,7 @@
    <Feature enable="Orchard.Blogs,Orchard.Comments,Orchard.Tags,Orchard.Alias,Orchard.Autoroute,
                   XmlRpc,Orchard.Blogs.RemotePublishing,Orchard.ContentPicker, 
                   TinyMce,Orchard.MediaLibrary,Orchard.PublishLater,
-                   Orchard.Resources.jQuery,Orchard.Widgets,
+                   Orchard.Resources,Orchard.Widgets,
                   Orchard.Scripting,Orchard.Scripting.Lightweight,
                   PackagingServices,Orchard.Packaging,Orchard.Warmup,Orchard.OutputCache,
                   Orchard.Taxonomies,Orchard.Workflows,
--- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/core.recipe.xml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/core.recipe.xml
@ -12,7 +12,7 @@
    </Recipe>

    <Feature disable="Feeds, Containers"
-             enable="Orchard.Resources.jQuery,Orchard.Alias,Orchard.Autoroute" />
+             enable="Orchard.Resources,Orchard.Alias,Orchard.Autoroute" />

    <ContentDefinition>
        <Types>
--- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
@ -13,7 +13,7 @@

    <Feature enable="Orchard.Blogs,Orchard.Comments,Orchard.Tags,Orchard.Alias,Orchard.Autoroute,
                   TinyMce,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.PublishLater,
-                   Orchard.Resources.jQuery,Orchard.Widgets,Orchard.ContentTypes,
+                   Orchard.Resources,Orchard.Widgets,Orchard.ContentTypes,
                   Orchard.Scripting,Orchard.Scripting.Lightweight,PackagingServices,Orchard.Packaging,
                   Orchard.Projections,Orchard.Fields,Orchard.OutputCache,Orchard.Taxonomies,Orchard.Workflows,
                   Orchard.Layouts,Orchard.Layouts.Tokens,
--- a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
@ -8,7 +8,7 @@ Features:
    Orchard.Tags:
        Name: Tags
        Description: The tags module is providing basic tagging for arbitrary content types. 
-        Dependencies: Settings, Orchard.Resources.jQuery
+        Dependencies: Settings, Orchard.Resources
        Category: Navigation
    Orchard.Tags.Feeds:
        Name: Tags Feeds
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Module.txt
@ -9,7 +9,7 @@ Description: Provides tools to create custom workflows.
 Features:
    Orchard.Workflows:
        Description: Provides tools to create custom workflows.
-        Dependencies: Orchard.Tokens, Orchard.Forms, Orchard.Resources.jQuery
+        Dependencies: Orchard.Tokens, Orchard.Forms, Orchard.Resources
    Orchard.Workflows.Timer:
        Name: Workflows Timer
        Description: Provides a Timer activity.
--- a/src/Orchard.Web/Modules/TinyMce/Module.txt
+++ b/src/Orchard.Web/Modules/TinyMce/Module.txt
@ -6,5 +6,5 @@ Version: 1.9.2
 OrchardVersion: 1.9
 Description: The TinyMCE module enables rich text contents to be created using a "What You See Is What You Get" user interface.
 FeatureDescription: TinyMCE HTML WYSIWYG editor.
-FeatureDependencies: Orchard.Resources.jQuery
+FeatureDependencies: Orchard.Resources
 Category: Input Editor
--- a/src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs
+++ b/src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs
@ -103,7 +103,7 @@ namespace Orchard.Environment.ShellBuilders {
                Features = new[] {
                    new ShellFeature { Name = "Orchard.Setup" },
                    new ShellFeature { Name = "Shapes" },
-                    new ShellFeature { Name = "Orchard.Resources.jQuery" }
+                    new ShellFeature { Name = "Orchard.Resources" }
                },
            };