diff --git a/src/Umbraco.Core/Auditing/Audit.cs b/src/Umbraco.Core/Auditing/Audit.cs deleted file mode 100644 index 418c900fb1..0000000000 --- a/src/Umbraco.Core/Auditing/Audit.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.ComponentModel; - -namespace Umbraco.Core.Auditing -{ - [Obsolete("Use Umbraco.Core.Services.IAuditService instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public static class Audit - { - public static void Add(Umbraco.Core.Auditing.AuditTypes type, string comment, int userId, int objectId) - { - ApplicationContext.Current.Services.AuditService.Add( - Enum.Parse(type.ToString()), - comment, userId, objectId); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Auditing/AuditTypes.cs b/src/Umbraco.Core/Auditing/AuditTypes.cs deleted file mode 100644 index 5bb67a7ca5..0000000000 --- a/src/Umbraco.Core/Auditing/AuditTypes.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System; -using System.ComponentModel; - -namespace Umbraco.Core.Auditing -{ - [Obsolete("Use Umbraco.Core.Models.AuditType instead")] - [EditorBrowsable(EditorBrowsableState.Never)] - public enum AuditTypes - { - /// - /// Used when new nodes are added - /// - New, - /// - /// Used when nodes are saved - /// - Save, - /// - /// Used when nodes are opened - /// - Open, - /// - /// Used when nodes are deleted - /// - Delete, - /// - /// Used when nodes are published - /// - Publish, - /// - /// Used when nodes are send to publishing - /// - SendToPublish, - /// - /// Used when nodes are unpublished - /// - UnPublish, - /// - /// Used when nodes are moved - /// - Move, - /// - /// Used when nodes are copied - /// - Copy, - /// - /// Used when nodes are assígned a domain - /// - AssignDomain, - /// - /// Used when public access are changed for a node - /// - PublicAccess, - /// - /// Used when nodes are sorted - /// - Sort, - /// - /// Used when a notification are send to a user - /// - Notify, - /// - /// General system notification - /// - System, - /// - /// Used when a node's content is rolled back to a previous version - /// - RollBack, - /// - /// Used when a package is installed - /// - PackagerInstall, - /// - /// Used when a package is uninstalled - /// - PackagerUninstall, - /// - /// Used when a node is send to translation - /// - SendToTranslate, - /// - /// Use this log action for custom log messages that should be shown in the audit trail - /// - Custom - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs index 1e8e7e9790..f65e4c31c4 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs @@ -1,5 +1,4 @@ using System.Collections; -using Umbraco.Core.Auditing; using Umbraco.Core.Models; namespace Umbraco.Core.Persistence.Repositories diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 6481caab7f..eb50815957 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -5,7 +5,6 @@ using System.Globalization; using System.Linq; using System.Threading; using System.Xml.Linq; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs index 0beaa6f976..4013f0a943 100644 --- a/src/Umbraco.Core/Services/ContentTypeService.cs +++ b/src/Umbraco.Core/Services/ContentTypeService.cs @@ -7,7 +7,6 @@ using System.Text; using System.Xml.Linq; using System.Threading; using AutoMapper; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.Exceptions; diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs index 91523130fb..f17a245d38 100644 --- a/src/Umbraco.Core/Services/DataTypeService.cs +++ b/src/Umbraco.Core/Services/DataTypeService.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using Umbraco.Core.Auditing; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs index 79ed338a5d..1368908dbd 100644 --- a/src/Umbraco.Core/Services/FileService.cs +++ b/src/Umbraco.Core/Services/FileService.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Runtime.Remoting.Messaging; using System.Text.RegularExpressions; using System.Web; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Events; diff --git a/src/Umbraco.Core/Services/LocalizationService.cs b/src/Umbraco.Core/Services/LocalizationService.cs index 02626b4734..68d93c41e3 100644 --- a/src/Umbraco.Core/Services/LocalizationService.cs +++ b/src/Umbraco.Core/Services/LocalizationService.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/Services/MacroService.cs b/src/Umbraco.Core/Services/MacroService.cs index eb61af16cc..69185a6029 100644 --- a/src/Umbraco.Core/Services/MacroService.cs +++ b/src/Umbraco.Core/Services/MacroService.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Umbraco.Core.Auditing; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs index 1f07116b2c..502c90fadb 100644 --- a/src/Umbraco.Core/Services/MediaService.cs +++ b/src/Umbraco.Core/Services/MediaService.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading; using System.Xml.Linq; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs index 8270df363c..363f36e87c 100644 --- a/src/Umbraco.Core/Services/MemberService.cs +++ b/src/Umbraco.Core/Services/MemberService.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using System.Threading; using System.Web.Security; using System.Xml.Linq; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Core/Services/MemberTypeService.cs b/src/Umbraco.Core/Services/MemberTypeService.cs index 3e0b8615a5..0d604bf4fb 100644 --- a/src/Umbraco.Core/Services/MemberTypeService.cs +++ b/src/Umbraco.Core/Services/MemberTypeService.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using Umbraco.Core.Auditing; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Core/Strategies/RelateOnCopyHandler.cs b/src/Umbraco.Core/Strategies/RelateOnCopyHandler.cs index 654ecb4891..7a172ae1a8 100644 --- a/src/Umbraco.Core/Strategies/RelateOnCopyHandler.cs +++ b/src/Umbraco.Core/Strategies/RelateOnCopyHandler.cs @@ -1,5 +1,4 @@ using System; -using Umbraco.Core.Auditing; using Umbraco.Core.Models; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs b/src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs index f9f07df564..7628332738 100644 --- a/src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs +++ b/src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using Umbraco.Core.Auditing; using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 4b9fec968f..a45066a5dc 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -148,8 +148,6 @@ - - diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 65c4cd81d5..c92421d911 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using System.Web.Http; using System.Xml; using System.Xml.Linq; -using Umbraco.Core.Auditing; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.packager.repositories; using Umbraco.Core.IO; diff --git a/src/Umbraco.Web/Strategies/RelateOnCopyHandler.cs b/src/Umbraco.Web/Strategies/RelateOnCopyHandler.cs deleted file mode 100644 index ae72000edc..0000000000 --- a/src/Umbraco.Web/Strategies/RelateOnCopyHandler.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Linq; -using Umbraco.Core; -using Umbraco.Core.Auditing; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -namespace Umbraco.Web.Strategies -{ - [Obsolete("This class is no longer used and will be removed from the codebase in future versions")] - public sealed class RelateOnCopyHandler : ApplicationEventHandler - { - protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) - { - } - } -} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index bd8a6b102d..751549ffce 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -704,7 +704,6 @@ - diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 4af6dfea7f..35b29c6678 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -6,13 +6,14 @@ using System.Xml; using System.Linq; using ICSharpCode.SharpZipLib.Zip; using Umbraco.Core; -using Umbraco.Core.Auditing; using Umbraco.Core.IO; using Umbraco.Core.Logging; using umbraco.cms.businesslogic.web; using System.Diagnostics; -using umbraco.cms.businesslogic.macro; -using umbraco.cms.businesslogic.template; +using Umbraco.Core.Models; +using File = System.IO.File; +using Macro = umbraco.cms.businesslogic.macro.Macro; +using Template = umbraco.cms.businesslogic.template.Template; namespace umbraco.cms.businesslogic.packager { @@ -272,9 +273,9 @@ namespace umbraco.cms.businesslogic.packager // log that a user has install files if (_currentUserId > -1) { - Audit.Add(AuditTypes.PackagerInstall, + ApplicationContext.Current.Services.AuditService.Add(AuditType.PackagerInstall, string.Format("Package '{0}' installed. Package guid: {1}", insPack.Data.Name, insPack.Data.PackageGuid), - _currentUserId, -1); + _currentUserId, -1); } insPack.Save(); diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index 974f398ca7..96038eb968 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; -using Umbraco.Core.Auditing; +using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.IO; +using Umbraco.Core.Models; namespace umbraco.cms.businesslogic.packager { public class InstalledPackage @@ -62,7 +63,7 @@ namespace umbraco.cms.businesslogic.packager { public void Delete(int userId) { - Audit.Add(AuditTypes.PackagerUninstall, string.Format("Package '{0}' uninstalled. Package guid: {1}", Data.Name, Data.PackageGuid), userId, -1); + ApplicationContext.Current.Services.AuditService.Add(AuditType.PackagerUninstall, string.Format("Package '{0}' uninstalled. Package guid: {1}", Data.Name, Data.PackageGuid), userId, -1); Delete(); } diff --git a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs index 6c3b672f14..747bbd6602 100644 --- a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs +++ b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs @@ -6,10 +6,10 @@ using System.Xml; using System.IO; using System.Net; using Umbraco.Core; -using Umbraco.Core.Auditing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.IO; +using Umbraco.Core.Models; namespace umbraco.cms.businesslogic.packager.repositories { @@ -152,7 +152,7 @@ namespace umbraco.cms.businesslogic.packager.repositories public string fetch(string packageGuid, int userId) { // log - Audit.Add(AuditTypes.PackagerInstall, + ApplicationContext.Current.Services.AuditService.Add(AuditType.PackagerInstall, string.Format("Package {0} fetched from {1}", packageGuid, this.Guid), userId, -1); return fetch(packageGuid);