Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

src/Umbraco.Core/Constants-Packaging.cs

@@ -0,0 +1,51 @@
+namespace Umbraco.Core
+{
+    public static partial class Constants
+	{
+        /// <summary>
+        /// Defines the constants used for Umbraco packages in the package.config xml
+        /// </summary>
+        public static class Packaging
+        {
+            public const string UmbPackageNodeName = "umbPackage";
+            public const string DataTypesNodeName = "DataTypes";
+            public const string PackageXmlFileName = "package.xml";
+            public const string UmbracoPackageExtention = ".umb";
+            public const string DataTypeNodeName = "DataType";
+            public const string LanguagesNodeName = "Languages";
+            public const string FilesNodeName = "Files";
+            public const string StylesheetsNodeName = "Stylesheets";
+            public const string TemplatesNodeName = "Templates";
+            public const string OrgnameNodeName = "orgName";
+            public const string NameNodeName = "Name";
+            public const string TemplateNodeName = "Template";
+            public const string AliasNodeName = "Alias";
+            public const string DictionaryitemsNodeName = "DictionaryItems";
+            public const string MacrosNodeName = "macros";
+            public const string DocumentSetNodeName = "DocumentSet";
+            public const string DocumentTypesNodeName = "DocumentTypes";
+            public const string DocumentTypeNodeName = "DocumentType";
+            public const string FileNodeName = "file";
+            public const string OrgPathNodeName = "orgPath";
+            public const string GuidNodeName = "guid";
+            public const string StylesheetNodeName = "styleSheet";
+            public const string MacroNodeName = "macro";
+            public const string InfoNodeName = "info";
+            public const string PackageRequirementsMajorXpath = "/package/requirements/major";
+            public const string PackageRequirementsMinorXpath = "/package/requirements/minor";
+            public const string PackageRequirementsPatchXpath = "/package/requirements/patch";
+            public const string PackageNameXpath = "/package/name";
+            public const string PackageVersionXpath = "/package/version";
+            public const string PackageUrlXpath = "/package/url";
+            public const string PackageLicenseXpath = "/package/license";
+            public const string AuthorNameXpath = "/author/name";
+            public const string AuthorWebsiteXpath = "/author/website";
+            public const string ReadmeXpath = "/readme";
+            public const string ControlNodeName = "control";
+            public const string ActionNodeName = "Action";
+            public const string ActionsNodeName = "Actions";
+            public const string UndoNodeAttribute = "undo";
+            public const string RunatNodeAttribute = "runat";
+        }
+	}
+}

src/Umbraco.Core/Packaging/Models/InstallAction.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace Umbraco.Core.Packaging.Models
+{
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal class InstallAction
+    {
+        public string Alias { get; set; }
+
+        public string PackageName { get; set; }
+
+        public string RunAt { get; set; }//NOTE Should this default to "install"
+
+        public bool Undo { get; set; }
+
+        public XmlNode XmlData { get; set; }
+    }
+}

src/Umbraco.Core/Packaging/Models/InstallationSummary.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Packaging.Models
+{
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal class InstallationSummary
+    {
+         public MetaData MetaData { get; set; }
+         public IEnumerable<int> DataTypesInstalled { get; set; }
+         public IEnumerable<int> LanguagesInstalled { get; set; }
+         public IEnumerable<int> DictionaryItemsInstalled { get; set; }
+         public IEnumerable<int> MacrosInstalled { get; set; }
+         public IEnumerable<KeyValuePair<string, bool>> FilesInstalled { get; set;}
+         public IEnumerable<int> TemplatesInstalled { get; set; }
+         public IEnumerable<int> DocumentTypesInstalled { get; set; }
+         public IEnumerable<int> StylesheetsInstalled { get; set; }
+         public IEnumerable<int> DocumentsInstalled { get; set; }
+         public IEnumerable<InstallAction> InstallActions { get; set; }
+         public IEnumerable<UninstallAction> UninstallActions { get; set; }
+    }
+}

src/Umbraco.Core/Packaging/Models/MetaData.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Packaging.Models
+{
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal class MetaData
+    {
+        public string Name { get; set; }
+        public string Version { get; set; }
+        public string Url { get; set; }
+        public string License { get; set; }
+        public string LicenseUrl { get; set; }
+        public int ReqMajor { get; set; }
+        public int ReqMinor { get; set; }
+        public int ReqPatch { get; set; }
+        public string AuthorName { get; set; }
+        public string AuthorUrl { get; set; }
+        public string Readme { get; set; }
+        public string Control { get; set; }
+    }
+}

src/Umbraco.Core/Packaging/Models/UninstallAction.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace Umbraco.Core.Packaging.Models
+{
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal class UninstallAction
+    {
+        public string Alias { get; set; }
+
+        public string PackageName { get; set; }
+
+        public string RunAt { get; set; }//NOTE Should this default to "install"
+
+        public bool Undo { get; set; }//NOTE: Should thid default to "False"?
+
+        public XmlNode XmlData { get; set; }
+    }
+}

src/Umbraco.Core/Packaging/PackageBuilding.cs

@@ -0,0 +1,18 @@
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Packaging
+{
+    internal interface IPackageBuilding
+    {
+    }
+
+    internal class PackageBuilding : IPackageBuilding
+    {
+        private readonly PackagingService _packagingService;
+
+        public PackageBuilding(PackagingService packagingService)
+        {
+            _packagingService = packagingService;
+        }
+    }
+}

src/Umbraco.Core/Packaging/PackageExtraction.cs

@@ -0,0 +1,34 @@
+using System;
+using System.IO;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core.Packaging
+{
+    internal interface IPackageExtraction
+    {
+        bool Extract(string packageFilePath, string destinationFolder);
+        string ExtractToTemporaryFolder(string packageFilePath);
+        string GetPackageConfigFromArchive(string packageFilePath, string fileToRead = "package.xml");
+    }
+
+    internal class PackageExtraction : IPackageExtraction
+    {
+        public bool Extract(string packageFilePath, string destinationFolder)
+        {
+            return true;
+        }
+
+        public string ExtractToTemporaryFolder(string packageFilePath)
+        {
+            string tempDir = Path.Combine(IOHelper.MapPath(SystemDirectories.Data), Guid.NewGuid().ToString("D"));
+            Directory.CreateDirectory(tempDir);
+            Extract(packageFilePath, tempDir);
+            return tempDir;
+        }
+
+        public string GetPackageConfigFromArchive(string packageFilePath, string fileToRead = "package.xml")
+        {
+            return string.Empty;
+        }
+    }
+}

src/Umbraco.Core/Packaging/PackageInstallation.cs

@@ -0,0 +1,35 @@
+using Umbraco.Core.Packaging.Models;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Packaging
+{
+    internal interface IPackageInstallation
+    {
+        InstallationSummary InstallPackage(string packageFilePath, int userId = 0);
+        MetaData GetPackageMetaData(string packageFilePath);
+    }
+
+    internal class PackageInstallation : IPackageInstallation
+    {
+        private readonly PackagingService _packagingService;
+        private readonly PackageExtraction _packageExtraction;
+
+        public PackageInstallation(PackagingService packagingService, PackageExtraction packageExtraction)
+        {
+            _packagingService = packagingService;
+            _packageExtraction = packageExtraction;
+        }
+
+        public InstallationSummary InstallPackage(string packageFilePath, int userId = 0)
+        {
+            var summary = new InstallationSummary();
+            return summary;
+        }
+
+        public MetaData GetPackageMetaData(string packageFilePath)
+        {
+            var metaData = new MetaData();
+            return metaData;
+        }
+    }
+}

src/Umbraco.Core/Services/PackagingService.cs

@@ -12,6 +12,8 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Packaging;
+using Umbraco.Core.Packaging.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -1198,5 +1200,21 @@ namespace Umbraco.Core.Services
 
         #region Stylesheets
         #endregion
+
+        #region Installation
+
+        internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0)
+        {
+            //TODO Add events ?
+            //NOTE The PackageInstallation class should be passed as IPackageInstallation through the 
+            //constructor (probably as an overload to avoid breaking stuff), so that its extendable.
+            var installer = new PackageInstallation(this, new PackageExtraction());
+            return installer.InstallPackage(packageFilePath, userId);
+        }
+
+        #endregion
+
+        #region Package Building
+        #endregion
     }
 }

src/Umbraco.Core/Umbraco.Core.csproj

@@ -211,6 +211,13 @@
     <Compile Include="Models\PublishedContent\PublishedContentModel.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentModelFactoryResolver.cs" />
     <Compile Include="Models\TemplateNode.cs" />
+    <Compile Include="Packaging\Models\InstallAction.cs" />
+    <Compile Include="Packaging\Models\InstallationSummary.cs" />
+    <Compile Include="Packaging\Models\MetaData.cs" />
+    <Compile Include="Packaging\Models\UninstallAction.cs" />
+    <Compile Include="Packaging\PackageBuilding.cs" />
+    <Compile Include="Packaging\PackageExtraction.cs" />
+    <Compile Include="Packaging\PackageInstallation.cs" />
     <Compile Include="Persistence\DatabaseModelDefinitions\DbIndexDefinition.cs" />
     <Compile Include="Persistence\Factories\MemberGroupFactory.cs" />
     <Compile Include="Persistence\Mappers\MemberGroupMapper.cs" />
@@ -854,6 +861,9 @@
     </Compile>
     <Compile Include="Constants-PropertyEditors.cs">
       <DependentUpon>Constants.cs</DependentUpon>
+    </Compile>
+	<Compile Include="Constants-Packaging.cs">
+	  <DependentUpon>Constants.cs</DependentUpon>
     </Compile>
     <Compile Include="Constants-ObjectTypes.cs">
       <DependentUpon>Constants.cs</DependentUpon>
@@ -917,9 +927,7 @@
   <ItemGroup>
     <Content Include="Strings\Notes.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Packaging\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.