swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moves packaging models to models/packaging

Browse Source
This commit is contained in:
Shannon
2016-05-09 10:05:55 +02:00
parent aee7973c11
commit 648fbdd3f3
12 changed files with 106 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Core/Events/ImportPackageEventArgs.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.Packaging.Models;
using Umbraco.Core.Models.Packaging;
namespace Umbraco.Core.Events
{
src/Umbraco.Core/Packaging/Models/InstallationSummary.cs → src/Umbraco.Core/Models/Packaging/InstallationSummary.cs
+42 -43
View File
@@ -1,44 +1,43 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using Umbraco.Core.Models;
namespace Umbraco.Core.Packaging.Models
{
[Serializable]
[DataContract(IsReference = true)]
internal class InstallationSummary
{
public MetaData MetaData { get; set; }
public IEnumerable<IDataTypeDefinition> DataTypesInstalled { get; set; }
public IEnumerable<ILanguage> LanguagesInstalled { get; set; }
public IEnumerable<IDictionaryItem> DictionaryItemsInstalled { get; set; }
public IEnumerable<IMacro> MacrosInstalled { get; set; }
public IEnumerable<string> FilesInstalled { get; set; }
public IEnumerable<ITemplate> TemplatesInstalled { get; set; }
public IEnumerable<IContentType> ContentTypesInstalled { get; set; }
public IEnumerable<IFile> StylesheetsInstalled { get; set; }
public IEnumerable<IContent> ContentInstalled { get; set; }
public IEnumerable<PackageAction> Actions { get; set; }
public bool PackageInstalled { get; set; }
}
internal static class InstallationSummaryExtentions
{
public static InstallationSummary InitEmpty(this InstallationSummary summary)
{
summary.Actions = new List<PackageAction>();
summary.ContentInstalled = new List<IContent>();
summary.ContentTypesInstalled = new List<IContentType>();
summary.DataTypesInstalled = new List<IDataTypeDefinition>();
summary.DictionaryItemsInstalled = new List<IDictionaryItem>();
summary.FilesInstalled = new List<string>();
summary.LanguagesInstalled = new List<ILanguage>();
summary.MacrosInstalled = new List<IMacro>();
summary.MetaData = new MetaData();
summary.TemplatesInstalled = new List<ITemplate>();
summary.PackageInstalled = false;
return summary;
}
}
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace Umbraco.Core.Models.Packaging
{
[Serializable]
[DataContract(IsReference = true)]
internal class InstallationSummary
{
public MetaData MetaData { get; set; }
public IEnumerable<IDataTypeDefinition> DataTypesInstalled { get; set; }
public IEnumerable<ILanguage> LanguagesInstalled { get; set; }
public IEnumerable<IDictionaryItem> DictionaryItemsInstalled { get; set; }
public IEnumerable<IMacro> MacrosInstalled { get; set; }
public IEnumerable<string> FilesInstalled { get; set; }
public IEnumerable<ITemplate> TemplatesInstalled { get; set; }
public IEnumerable<IContentType> ContentTypesInstalled { get; set; }
public IEnumerable<IFile> StylesheetsInstalled { get; set; }
public IEnumerable<IContent> ContentInstalled { get; set; }
public IEnumerable<PackageAction> Actions { get; set; }
public bool PackageInstalled { get; set; }
}
internal static class InstallationSummaryExtentions
{
public static InstallationSummary InitEmpty(this InstallationSummary summary)
{
summary.Actions = new List<PackageAction>();
summary.ContentInstalled = new List<IContent>();
summary.ContentTypesInstalled = new List<IContentType>();
summary.DataTypesInstalled = new List<IDataTypeDefinition>();
summary.DictionaryItemsInstalled = new List<IDictionaryItem>();
summary.FilesInstalled = new List<string>();
summary.LanguagesInstalled = new List<ILanguage>();
summary.MacrosInstalled = new List<IMacro>();
summary.MetaData = new MetaData();
summary.TemplatesInstalled = new List<ITemplate>();
summary.PackageInstalled = false;
return summary;
}
}
}
src/Umbraco.Core/Packaging/Models/MetaData.cs → src/Umbraco.Core/Models/Packaging/MetaData.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Runtime.Serialization;
namespace Umbraco.Core.Packaging.Models
namespace Umbraco.Core.Models.Packaging
{
[Serializable]
[DataContract(IsReference = true)]
src/Umbraco.Core/Packaging/Models/PackageAction.cs → src/Umbraco.Core/Models/Packaging/PackageAction.cs
+37 -37
View File
@@ -1,38 +1,38 @@
using System;
using System.Runtime.Serialization;
using System.Xml.Linq;
namespace Umbraco.Core.Packaging.Models
{
internal enum ActionRunAt
{
Undefined = 0,
Install,
Uninstall
}
[Serializable]
[DataContract(IsReference = true)]
internal class PackageAction
{
private ActionRunAt _runAt;
private bool? _undo;
public string Alias { get; set; }
public string PackageName { get; set; }
public ActionRunAt RunAt
{
get { return _runAt == ActionRunAt.Undefined ? ActionRunAt.Install : _runAt; }
set { _runAt = value; }
}
public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions)
{
get { return _undo ?? true; }
set { _undo = value; }
}
public XElement XmlData { get; set; }
}
using System;
using System.Runtime.Serialization;
using System.Xml.Linq;
namespace Umbraco.Core.Models.Packaging
{
internal enum ActionRunAt
{
Undefined = 0,
Install,
Uninstall
}
[Serializable]
[DataContract(IsReference = true)]
internal class PackageAction
{
private ActionRunAt _runAt;
private bool? _undo;
public string Alias { get; set; }
public string PackageName { get; set; }
public ActionRunAt RunAt
{
get { return _runAt == ActionRunAt.Undefined ? ActionRunAt.Install : _runAt; }
set { _runAt = value; }
}
public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions)
{
get { return _undo ?? true; }
set { _undo = value; }
}
public XElement XmlData { get; set; }
}
}
src/Umbraco.Core/Packaging/Models/PreInstallWarnings.cs → src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
+16 -17
View File
@@ -1,18 +1,17 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using Umbraco.Core.Models;
namespace Umbraco.Core.Packaging.Models
{
[Serializable]
[DataContract(IsReference = true)]
internal class PreInstallWarnings
{
public KeyValuePair<string, string>[] UnsecureFiles { get; set; }
public KeyValuePair<string, string>[] FilesReplaced { get; set; }
public IEnumerable<IMacro> ConflictingMacroAliases { get; set; }
public IEnumerable<ITemplate> ConflictingTemplateAliases { get; set; }
public IEnumerable<IFile> ConflictingStylesheetNames { get; set; }
}
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace Umbraco.Core.Models.Packaging
{
[Serializable]
[DataContract(IsReference = true)]
internal class PreInstallWarnings
{
public KeyValuePair<string, string>[] UnsecureFiles { get; set; }
public KeyValuePair<string, string>[] FilesReplaced { get; set; }
public IEnumerable<IMacro> ConflictingMacroAliases { get; set; }
public IEnumerable<ITemplate> ConflictingTemplateAliases { get; set; }
public IEnumerable<IFile> ConflictingStylesheetNames { get; set; }
}
}
src/Umbraco.Core/Packaging/IPackageInstallation.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Xml.Linq;
using Umbraco.Core.Packaging.Models;
using Umbraco.Core.Models.Packaging;
namespace Umbraco.Core.Packaging
{
src/Umbraco.Core/Packaging/PackageInstallation.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using System.Xml.XPath;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Models;
using Umbraco.Core.Packaging.Models;
using Umbraco.Core.Models.Packaging;
using Umbraco.Core.Services;
using File = System.IO.File;
src/Umbraco.Core/Services/PackagingService.cs
+1 -1
View File
@@ -14,9 +14,9 @@ using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Models.Packaging;
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.Repositories;
src/Umbraco.Core/Umbraco.Core.csproj
+4 -4
View File
@@ -612,10 +612,10 @@
<Compile Include="Models\UmbracoEntityExtensions.cs" />
<Compile Include="Packaging\IPackageExtraction.cs" />
<Compile Include="Packaging\IPackageInstallation.cs" />
<Compile Include="Packaging\Models\PreInstallWarnings.cs" />
<Compile Include="Packaging\Models\InstallationSummary.cs" />
<Compile Include="Packaging\Models\MetaData.cs" />
<Compile Include="Packaging\Models\PackageAction.cs" />
<Compile Include="Models\Packaging\PreInstallWarnings.cs" />
<Compile Include="Models\Packaging\InstallationSummary.cs" />
<Compile Include="Models\Packaging\MetaData.cs" />
<Compile Include="Models\Packaging\PackageAction.cs" />
<Compile Include="Packaging\PackageExtraction.cs" />
<Compile Include="Packaging\PackageInstallation.cs" />
<Compile Include="Packaging\PackageBinaryInspector.cs" />
src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
+1 -1
View File
@@ -1,8 +1,8 @@
using Moq;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Models.Packaging;
using Umbraco.Core.Packaging;
using Umbraco.Core.Packaging.Models;
using Umbraco.Core.Services;
namespace Umbraco.Tests.Packaging
src/Umbraco.Tests/Services/PackagingServiceTests.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Linq;
using System.Xml.Linq;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Packaging.Models;
using Umbraco.Core.Models.Packaging;
using Umbraco.Core.Services;
using Umbraco.Tests.Services.Importing;
using Umbraco.Tests.TestHelpers;
src/Umbraco.Web/Editors/PackageInstallController.cs
-1
View File
@@ -14,7 +14,6 @@ using Umbraco.Core.Auditing;
using umbraco.BusinessLogic;
using umbraco.cms.businesslogic.packager.repositories;
using Umbraco.Core.IO;
using Umbraco.Core.Packaging.Models;
using Umbraco.Core.Services;
using Umbraco.Web.Models;
using Umbraco.Web.Mvc;