Merge

--HG--
branch : dev

src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs

@@ -14,7 +14,7 @@ using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.Records;
 using Orchard.Security;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
 
 namespace Orchard.Core.Tests.Common.Providers {
     [TestFixture]

src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs

@@ -10,7 +10,7 @@ using Orchard.ContentManagement.Records;
 using Orchard.Core.Common.Models;
 using Orchard.Core.Common.Records;
 using Orchard.Core.Common.Services;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
 
 namespace Orchard.Core.Tests.Common.Services {
     [TestFixture]

src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs

@@ -19,7 +19,7 @@ using Orchard.Core.Feeds.Models;
 using Orchard.Core.Feeds.Rss;
 using Orchard.Core.Feeds.StandardBuilders;
 using Orchard.Mvc.Results;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
 using Orchard.Tests.Stubs;
 
 namespace Orchard.Core.Tests.Feeds.Controllers {

src/Orchard.Core.Tests/Orchard.Core.Tests.csproj

@@ -85,9 +85,9 @@
     <Compile Include="Scheduling\ScheduledTaskExecutorTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Orchard.Tests.Packages\Orchard.Tests.Packages.csproj">
+    <ProjectReference Include="..\Orchard.Tests.Modules\Orchard.Tests.Modules.csproj">
       <Project>{6CB3EB30-F725-45C0-9742-42599BA8E8D2}</Project>
-      <Name>Orchard.Tests.Packages</Name>
+      <Name>Orchard.Tests.Modules</Name>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Tests\Orchard.Tests.csproj">
       <Project>{ABC826D4-2FA1-4F2F-87DE-E6095F653810}</Project>

src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs

@@ -10,7 +10,7 @@ using Orchard.Core.Scheduling.Services;
 using Orchard.Data;
 using Orchard.Tasks;
 using Orchard.Tasks.Scheduling;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
 
 namespace Orchard.Core.Tests.Scheduling {
     [TestFixture]

src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs

@@ -11,7 +11,7 @@ using Orchard.Core.Scheduling.Services;
 using Orchard.Data;
 using Orchard.Tasks;
 using Orchard.Tasks.Scheduling;
-using Orchard.Tests.Packages;
+using Orchard.Tests.Modules;
 
 namespace Orchard.Core.Tests.Scheduling {
     [TestFixture]

src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs

@@ -12,7 +12,7 @@ using Orchard.Services;
 using Orchard.Tests.Data;
 using Orchard.Tests.Stubs;
 
-namespace Orchard.Tests.Packages {
+namespace Orchard.Tests.Modules {
     public abstract class DatabaseEnabledTestsBase {
 
         protected IContainer _container;

src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj

@@ -105,15 +105,15 @@
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.Web\Packages\Orchard.Pages\Orchard.Pages.csproj">
+    <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Pages\Orchard.Pages.csproj">
       <Project>{4A9C04A6-0986-4A92-A610-5F59FF273FB9}</Project>
       <Name>Orchard.Pages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.Web\Packages\Orchard.Roles\Orchard.Roles.csproj">
+    <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Roles\Orchard.Roles.csproj">
       <Project>{D10AD48F-407D-4DB5-A328-173EC7CB010F}</Project>
       <Name>Orchard.Roles</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.Web\Packages\Orchard.Users\Orchard.Users.csproj">
+    <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Users\Orchard.Users.csproj">
       <Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project>
       <Name>Orchard.Users</Name>
     </ProjectReference>

src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Orchard.Tests.Packages")]
+[assembly: AssemblyTitle("Orchard.Tests.Modules")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]

src/Orchard.Tests.Modules/Roles/Controllers/AdminControllerTests.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Orchard.Tests.Packages.Roles.Controllers {
+namespace Orchard.Tests.Modules.Roles.Controllers {
     class AdminControllerTests {
     }
 }

src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs

@@ -6,7 +6,7 @@ using NUnit.Framework;
 using Orchard.Roles.Records;
 using Orchard.Roles.Services;
 
-namespace Orchard.Tests.Packages.Roles.Services {
+namespace Orchard.Tests.Modules.Roles.Services {
     [TestFixture]
     public class RoleServiceTests : DatabaseEnabledTestsBase{
         public override void Register(ContainerBuilder builder) {

src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs

@@ -22,7 +22,7 @@ using Orchard.Users.Models;
 using Orchard.Users.Services;
 using Orchard.Users.ViewModels;
 
-namespace Orchard.Tests.Packages.Users.Controllers {
+namespace Orchard.Tests.Modules.Users.Controllers {
     [TestFixture]
     public class AdminControllerTests : DatabaseEnabledTestsBase {
         private AdminController _controller;

src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs

@@ -16,7 +16,7 @@ using Orchard.Security;
 using Orchard.Users.Models;
 using Orchard.Users.Services;
 
-namespace Orchard.Tests.Packages.Users.Services {
+namespace Orchard.Tests.Modules.Users.Services {
     [TestFixture]
     public class MembershipServiceTests {
         private IMembershipService _membershipService;

src/Orchard.Tests.Modules/Values.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Web.Mvc;
 
-namespace Orchard.Tests.Packages {
+namespace Orchard.Tests.Modules {
     public static class Values {
         public static IValueProvider From<T>(T obj) {
             if (obj is IDictionary<string,string>) {

src/Orchard.Tests.Modules/XmlRpc/Controllers/HomeControllerTests.cs

@@ -7,7 +7,7 @@ using Orchard.Core.XmlRpc.Controllers;
 using Orchard.Core.XmlRpc.Models;
 using Orchard.Core.XmlRpc.Services;
 
-namespace Orchard.Tests.Packages.XmlRpc.Controllers {
+namespace Orchard.Tests.Modules.XmlRpc.Controllers {
     [TestFixture]
     public class HomeControllerTests {
         [Test]

src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcReaderTests.cs

@@ -4,7 +4,7 @@ using NUnit.Framework;
 using Orchard.Core.XmlRpc.Models;
 using Orchard.Core.XmlRpc.Services;
 
-namespace Orchard.Tests.Packages.XmlRpc.Services {
+namespace Orchard.Tests.Modules.XmlRpc.Services {
     [TestFixture]
     public class XmlRpcReaderTests {
         private IMapper<XElement, XRpcMethodCall> _methodCallMapper;

src/Orchard.Tests.Modules/XmlRpc/Services/XmlRpcWriterTests.cs

@@ -3,7 +3,7 @@ using NUnit.Framework;
 using Orchard.Core.XmlRpc.Models;
 using Orchard.Core.XmlRpc.Services;
 
-namespace Orchard.Tests.Packages.XmlRpc.Services {
+namespace Orchard.Tests.Modules.XmlRpc.Services {
     [TestFixture]
     public class XmlRpcWriterTests {
         [Test]

src/Orchard.Tests/Extensions/ExtensionFoldersTests.cs

@@ -48,8 +48,8 @@ namespace Orchard.Tests.Extensions {
         }
 
         [Test]
-        public void NamesFromFoldersWithPackageTxtShouldBeListed() {
-            var folders = new PackageFolders(new[] { _tempFolderName });
+        public void NamesFromFoldersWithModuleTxtShouldBeListed() {
+            var folders = new ModuleFolders(new[] { _tempFolderName });
             var names = folders.ListNames();
             Assert.That(names.Count(), Is.EqualTo(2));
             Assert.That(names, Has.Some.EqualTo("Sample1"));
@@ -57,8 +57,8 @@ namespace Orchard.Tests.Extensions {
         }
 
         [Test]
-        public void PackageTxtShouldBeParsedAndReturnedAsYamlDocument() {
-            var folders = new PackageFolders(new[] { _tempFolderName });
+        public void ModuleTxtShouldBeParsedAndReturnedAsYamlDocument() {
+            var folders = new ModuleFolders(new[] { _tempFolderName });
             var sample1 = folders.ParseManifest("Sample1");
             var mapping = (Mapping)sample1.YamlDocument.Root;
             var entities = mapping.Entities

src/Orchard.Tests/Orchard.Tests.csproj

@@ -184,9 +184,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Extensions\FoldersData\Sample1\Package.txt" />
+    <EmbeddedResource Include="Extensions\FoldersData\Sample1\Module.txt" />
     <EmbeddedResource Include="Extensions\FoldersData\Sample2\Two.txt" />
-    <EmbeddedResource Include="Extensions\FoldersData\Sample3\Package.txt" />
+    <EmbeddedResource Include="Extensions\FoldersData\Sample3\Module.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Orchard.Web/Core/Common/Permissions.cs

@@ -6,7 +6,7 @@ namespace Orchard.Core.Common {
     public class Permissions : IPermissionProvider {
         public static readonly Permission ChangeOwner = new Permission { Name = "ChangeOwner", Description = "Change the owner of content items" };
 
-        public string PackageName {
+        public string ModuleName {
             get { return "Common"; }
         }
 

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -149,11 +149,11 @@
     <Compile Include="XmlRpc\XmlRpcContext.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Common\Package.txt" />
-    <Content Include="Settings\Package.txt" />
+    <Content Include="Common\Module.txt" />
+    <Content Include="Settings\Module.txt" />
     <Content Include="Settings\Views\Admin\Index.ascx" />
     <Content Include="Web.config" />
-    <Content Include="XmlRpc\Package.txt" />
+    <Content Include="XmlRpc\Module.txt" />
     <Content Include="XmlRpc\Views\Home\Index.aspx" />
   </ItemGroup>
   <ItemGroup>
@@ -170,7 +170,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Common\Views\Web.config" />
-    <Content Include="Themes\Package.txt" />
+    <Content Include="Themes\Module.txt" />
     <Content Include="Themes\Views\Admin\Index.aspx" />
   </ItemGroup>
   <ItemGroup>
@@ -179,8 +179,8 @@
     <Content Include="Common\Views\EditorTemplates\Parts\Common.Routable.ascx" />
     <Content Include="Common\Views\EditorTemplates\Parts\Common.Body.ascx" />
     <Content Include="Common\Views\EditorTemplates\Parts\Common.Owner.ascx" />
-    <Content Include="Feeds\Package.txt" />
-    <Content Include="Scheduling\Package.txt" />
+    <Content Include="Feeds\Module.txt" />
+    <Content Include="Scheduling\Module.txt" />
     <Content Include="Settings\Views\EditorTemplates\Items\Settings.Site.ascx" />
     <Content Include="Themes\Scripts\jquery-1.4.1.js" />
     <Content Include="Themes\Scripts\jquery-1.4.1.min.js" />

src/Orchard.Web/Core/Settings/Permissions.cs

@@ -6,7 +6,7 @@ namespace Orchard.Core.Settings {
         public static readonly Permission ManageSettings = new Permission { Name = "ManageSettings", Description = "Manage site settings" };
         public static readonly Permission ChangeSuperuser = new Permission { Name = "ChangeSuperuser", Description = "Change the superuser for the site" };
 
-        public string PackageName {
+        public string ModuleName {
             get { return "Settings"; }
         }
 

src/Orchard.Web/Core/Themes/Permissions.cs

@@ -7,7 +7,7 @@ namespace Orchard.Core.Themes {
         public static readonly Permission ManageThemes = new Permission { Description = "Manage Themes", Name = "ManageThemes" };
         public static readonly Permission ApplyTheme = new Permission { Description = "Apply a Theme", Name = "ApplyTheme" };
 
-        public string PackageName {
+        public string ModuleName {
             get {
                 return "Themes";
             }

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -110,7 +110,7 @@
     <Compile Include="ViewModels\BlogEditViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Package.txt" />
+    <Content Include="Module.txt" />
     <Content Include="Scripts\archives.js" />
     <Content Include="Scripts\jquery.ui.core.js" />
     <Content Include="Scripts\jquery.ui.datepicker.js" />

src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs

@@ -16,7 +16,7 @@ namespace Orchard.Blogs {
         public static readonly Permission MetaListOthersBlogs = new Permission { ImpliedBy = new[] { EditOthersBlogPost, PublishOthersBlogPost, DeleteOthersBlogPost } };
         public static readonly Permission MetaListBlogs = new Permission { ImpliedBy = new[] { EditBlogPost, PublishBlogPost, DeleteBlogPost } };
 
-        public string PackageName {
+        public string ModuleName {
             get {
                 return "Blogs";
             }