From 12eccd479ab7acccea044f22b109a4ba84b217f9 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Sun, 14 Nov 2010 14:34:01 -0800 Subject: [PATCH] Adding Orchard.Pages and removing base Page type configuratino to said module --HG-- branch : dev --- .../Orchard.Lists/Properties/AssemblyInfo.cs | 8 +- .../Modules/Orchard.Pages/Migrations.cs | 19 ++++ .../Modules/Orchard.Pages/Module.txt | 12 +++ .../Orchard.Pages/Orchard.Pages.csproj | 96 +++++++++++++++++++ .../Orchard.Pages/Properties/AssemblyInfo.cs | 36 +++++++ .../Orchard.Setup/Services/SetupService.cs | 8 +- src/Orchard.sln | 13 +++ 7 files changed, 183 insertions(+), 9 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Pages/Migrations.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Pages/Module.txt create mode 100644 src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj create mode 100644 src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs index 0f2e0ed79..2910839cd 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs @@ -1,6 +1,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Security; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -9,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Orchard")] -[assembly: AssemblyCopyright("")] +[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -30,5 +31,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.8.0.0")] +[assembly: AssemblyFileVersion("0.8.0.0")] +[assembly: SecurityTransparent] diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Pages/Migrations.cs new file mode 100644 index 000000000..aeb7c0397 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Pages/Migrations.cs @@ -0,0 +1,19 @@ +using Orchard.ContentManagement.MetaData; +using Orchard.Core.Contents.Extensions; +using Orchard.Data.Migration; + +namespace Orchard.Pages { + public class Migrations : DataMigrationImpl { + public int Create() { + ContentDefinitionManager.AlterTypeDefinition("Page", + cfg=>cfg + .WithPart("CommonPart") + .WithPart("PublishLaterPart") + .WithPart("RoutePart") + .WithPart("BodyPart") + .Creatable()); + + return 1; + } + } +} diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt new file mode 100644 index 000000000..898c6ed37 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt @@ -0,0 +1,12 @@ +Name: Pages +AntiForgery: enabled +Author: The Orchard Team +Website: http://orchardproject.net +Version: 0.8.0 +OrchardVersion: 0.8.0 +Description: Introduces a preconfigured page content type. +Features: + Orchard.Pages: + Description: A basic page content type. + Dependencies: Contents + Category: Content diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj new file mode 100644 index 000000000..211a8d352 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -0,0 +1,96 @@ + + + + Debug + AnyCPU + + + 2.0 + {3420C92A-747F-4990-BA08-F2C9531E44AD} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Orchard.Pages + Orchard.Pages + v4.0 + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} + Orchard.Framework + + + {9916839C-39FC-4CEB-A5AF-89CA7E87119F} + Orchard.Core + + + + + + + + + False + True + 6857 + / + + + False + True + http://orchard.codeplex.com + False + + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..c4ac95ed5 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Security; + +// 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.Pages")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyProduct("Orchard")] +[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("0d852f97-2bc9-42ee-91b6-90e90dbbe6ca")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("0.8.0.0")] +[assembly: AssemblyFileVersion("0.8.0.0")] +[assembly: SecurityTransparent] diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 10d55bbc9..97882c4d9 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -86,6 +86,7 @@ namespace Orchard.Setup.Services { "Orchard.Roles", "TinyMce", "PackagingServices", + "Orchard.Pages", "Orchard.Modules", "Orchard.Themes", "Orchard.PublishLater", @@ -213,7 +214,7 @@ namespace Orchard.Setup.Services { //hackInstallationGenerator.GenerateInstallEvents(); var contentDefinitionManager = environment.Resolve(); - //todo: (heskew) pull these definitions (and initial content creation) out into more appropriate modules + //todo: (heskew) pull these definitions (and initial content creation) out into a distribution configuration when we have that capability contentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg .WithPart("CommentsPart") .WithPart("TagsPart") @@ -222,13 +223,8 @@ namespace Orchard.Setup.Services { .Indexed() ); contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg - .WithPart("CommonPart") - .WithPart("PublishLaterPart") - .WithPart("RoutePart") - .WithPart("BodyPart") .WithPart("TagsPart") .WithPart("LocalizationPart") - .Creatable() .Draftable() .Indexed() ); diff --git a/src/Orchard.sln b/src/Orchard.sln index 839c5af7c..3131d1596 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -94,6 +94,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.PublishLater", "Orc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Lists", "Orchard.Web\Modules\Orchard.Lists\Orchard.Lists.csproj", "{137906EA-15FE-4AD8-A6A0-27528F0477D6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Pages", "Orchard.Web\Modules\Orchard.Pages\Orchard.Pages.csproj", "{3420C92A-747F-4990-BA08-F2C9531E44AD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CodeCoverage|Any CPU = CodeCoverage|Any CPU @@ -500,6 +502,16 @@ Global {137906EA-15FE-4AD8-A6A0-27528F0477D6}.FxCop|Any CPU.ActiveCfg = Release|Any CPU {137906EA-15FE-4AD8-A6A0-27528F0477D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {137906EA-15FE-4AD8-A6A0-27528F0477D6}.Release|Any CPU.Build.0 = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.Coverage|Any CPU.ActiveCfg = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.Coverage|Any CPU.Build.0 = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.FxCop|Any CPU.ActiveCfg = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.FxCop|Any CPU.Build.0 = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3420C92A-747F-4990-BA08-F2C9531E44AD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -530,6 +542,7 @@ Global {EA4F1DA7-F2AB-4384-9AA4-9B756E2026B1} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {C889167C-E52C-4A65-A419-224B3D1B957D} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {137906EA-15FE-4AD8-A6A0-27528F0477D6} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} + {3420C92A-747F-4990-BA08-F2C9531E44AD} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}