diff --git a/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs b/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs index da7cb6801a..9e768ddc47 100644 --- a/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs +++ b/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs @@ -3,9 +3,9 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.ObjectResolution; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI.Pages; using Umbraco.Web; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Tests.Resolvers { diff --git a/src/Umbraco.Tests/Resolvers/XsltExtensionsResolverTests.cs b/src/Umbraco.Tests/Resolvers/XsltExtensionsResolverTests.cs index 5bbc4ed94b..b0f834bf89 100644 --- a/src/Umbraco.Tests/Resolvers/XsltExtensionsResolverTests.cs +++ b/src/Umbraco.Tests/Resolvers/XsltExtensionsResolverTests.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Profiling; using Umbraco.Web; using Umbraco.Web.Macros; using umbraco; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Tests.Resolvers { diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs index 7a0438bd7f..a9ebc159ec 100644 --- a/src/Umbraco.Tests/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests/Services/UserServiceTests.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Tests.Services { diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 0f770b89f9..f4742e3e9f 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -34,7 +34,7 @@ using Umbraco.Web.Trees; using Umbraco.Web.UI.JavaScript; using Umbraco.Web.WebApi.Filters; using Umbraco.Web.WebServices; -using Action = Umbraco.Web.LegacyActions.Action; +using Action = Umbraco.Web._Legacy.Actions.Action; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Editors diff --git a/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs b/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs index d0edfa34bc..c29146d45d 100644 --- a/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/ContentPostValidateAttribute.cs @@ -7,10 +7,10 @@ using System.Web.Http.Filters; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Security; using Umbraco.Web.WebApi; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Editors { diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index b7e6fe7648..8ad9ca2649 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -93,7 +93,7 @@ namespace Umbraco.Web.Editors //clear the tree cache - we'll do this here even though the browser will reload, but just in case it doesn't can't hurt. //these bits are super old, but cant find another way to do this currently global::umbraco.cms.presentation.Trees.TreeDefinitionCollection.Instance.ReRegisterTrees(); - global::Umbraco.Web.LegacyActions.Action.ReRegisterActionsAndHandlers(); + global::Umbraco.Web._Legacy.Actions.Action.ReRegisterActionsAndHandlers(); return model; diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs index f14ef43ace..1d2281eb9f 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs @@ -11,7 +11,6 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Mapping; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Trees; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs index 90a8a01ed9..8e0f581e78 100644 --- a/src/Umbraco.Web/Models/Trees/MenuItem.cs +++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs @@ -5,7 +5,7 @@ using Umbraco.Web.Trees; using System.Collections.Generic; using Umbraco.Core; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Models.Trees { diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs index 16baf2d5c2..15de8046f6 100644 --- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs +++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Umbraco.Core; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Models.Trees { diff --git a/src/Umbraco.Web/NotificationServiceExtensions.cs b/src/Umbraco.Web/NotificationServiceExtensions.cs index 6a71e31621..0a63aec04a 100644 --- a/src/Umbraco.Web/NotificationServiceExtensions.cs +++ b/src/Umbraco.Web/NotificationServiceExtensions.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; using Umbraco.Core.Models; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/PluginManagerExtensions.cs b/src/Umbraco.Web/PluginManagerExtensions.cs index a4ae4266cd..894b598387 100644 --- a/src/Umbraco.Web/PluginManagerExtensions.cs +++ b/src/Umbraco.Web/PluginManagerExtensions.cs @@ -9,8 +9,8 @@ using Umbraco.Web.Trees; using Umbraco.Web.WebApi; using umbraco; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.Trees; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Strategies/NotificationsHandler.cs b/src/Umbraco.Web/Strategies/NotificationsHandler.cs index 034d27139c..1dc1a02418 100644 --- a/src/Umbraco.Web/Strategies/NotificationsHandler.cs +++ b/src/Umbraco.Web/Strategies/NotificationsHandler.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Services; using umbraco; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Strategies { diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 352ecd570c..f46218deb5 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Services; using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi.Filters; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees @@ -124,7 +124,7 @@ namespace Umbraco.Web.Trees // we need to get the default permissions as you can't set permissions on the very root node var permission = Services.UserService.GetPermissions(Security.CurrentUser, Constants.System.Root).First(); - var nodeActions = global::Umbraco.Web.LegacyActions.Action.FromEntityPermission(permission) + var nodeActions = global::Umbraco.Web._Legacy.Actions.Action.FromEntityPermission(permission) .Select(x => new MenuItem(x)); //these two are the standard items diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index b5ce66bdf8..ffe2cd85f8 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -15,7 +15,7 @@ using Umbraco.Web.Models.Trees; using Umbraco.Web.WebApi.Filters; using umbraco; using System.Globalization; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { @@ -268,7 +268,7 @@ namespace Umbraco.Web.Trees internal IEnumerable GetAllowedUserMenuItemsForNode(IUmbracoEntity dd) { var permission = Services.UserService.GetPermissions(Security.CurrentUser, dd.Path); - var actions = global::Umbraco.Web.LegacyActions.Action.FromEntityPermission(permission); + var actions = global::Umbraco.Web._Legacy.Actions.Action.FromEntityPermission(permission); // A user is allowed to delete their own stuff if (dd.CreatorId == Security.CurrentUser.Id && actions.Contains(ActionDelete.Instance) == false) diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs index b75ea60770..bf23d9ba1f 100644 --- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Models; using Umbraco.Web.Models.Trees; using Umbraco.Web.WebApi.Filters; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs index 16dec37949..992c4772f2 100644 --- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs @@ -13,7 +13,7 @@ using Umbraco.Web.WebApi.Filters; using umbraco; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/LanguageTreeController.cs b/src/Umbraco.Web/Trees/LanguageTreeController.cs index 53f71af104..88ad43e3a5 100644 --- a/src/Umbraco.Web/Trees/LanguageTreeController.cs +++ b/src/Umbraco.Web/Trees/LanguageTreeController.cs @@ -8,10 +8,10 @@ using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Core.Models; using umbraco.presentation.actions; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi.Filters; +using Umbraco.Web._Legacy.Actions; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index 1f5359cc03..c7bcdc599c 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -16,7 +16,7 @@ using umbraco.cms.presentation.Trees; using umbraco.controls.Tree; using umbraco.interfaces; using Umbraco.Core.Models; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs b/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs index 5b931265dc..17716724c1 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs @@ -5,7 +5,7 @@ using System.Text; using Umbraco.Core; using Umbraco.Core.Logging; using umbraco.cms.presentation.Trees; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { @@ -55,10 +55,10 @@ namespace Umbraco.Web.Trees if (string.IsNullOrEmpty(a.Alias) == false && (string.IsNullOrEmpty(a.JsFunctionName) == false || string.IsNullOrEmpty(a.JsSource) == false)) { // if the action is using invalid javascript we need to do something about this - if (global::Umbraco.Web.LegacyActions.Action.ValidateActionJs(a) == false) + if (global::Umbraco.Web._Legacy.Actions.Action.ValidateActionJs(a) == false) { js.AppendLine("function IActionProxy_" + a.Alias.ToSafeAlias() + "() {"); - js.AppendLine(global::Umbraco.Web.LegacyActions.Action.ConvertLegacyJs(a.JsFunctionName)); + js.AppendLine(global::Umbraco.Web._Legacy.Actions.Action.ConvertLegacyJs(a.JsFunctionName)); js.AppendLine("}"); } } diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs index 4bce894718..2827f0152a 100644 --- a/src/Umbraco.Web/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTreeController.cs @@ -12,7 +12,7 @@ using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi.Filters; using umbraco; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs index 60ff2d71ab..4919b08092 100644 --- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs @@ -11,7 +11,7 @@ using Umbraco.Core.Models.EntityBase; using Umbraco.Web.Models.Trees; using Umbraco.Web.WebApi.Filters; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index f3543a3535..ccbfb35826 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -12,7 +12,7 @@ using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi.Filters; using umbraco; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs index 441dc4e0f9..4921a2e130 100644 --- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using umbraco; using Umbraco.Core; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.Trees; using Umbraco.Web.WebApi.Filters; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/PartialViewsTree.cs b/src/Umbraco.Web/Trees/PartialViewsTree.cs index 1bca4c63e2..24097b5354 100644 --- a/src/Umbraco.Web/Trees/PartialViewsTree.cs +++ b/src/Umbraco.Web/Trees/PartialViewsTree.cs @@ -11,7 +11,7 @@ using Umbraco.Core.IO; using umbraco.cms.businesslogic.template; using umbraco.cms.presentation.Trees; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs index 30a149f880..536151d738 100644 --- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs +++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs @@ -12,10 +12,10 @@ using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Core.Configuration; using Umbraco.Core.Models; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi.Filters; +using Umbraco.Web._Legacy.Actions; using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 0308f9ae12..bdca751dfd 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -333,40 +333,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs index 66b96100c4..1a21c90f96 100644 --- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs @@ -11,8 +11,8 @@ using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; using Umbraco.Web.Editors; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.WebApi.Filters { diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs index cbddbb828b..7dd33ae0c7 100644 --- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs @@ -7,7 +7,7 @@ using System.Reflection; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; using Umbraco.Core; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.WebApi.Filters { diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 44950f1645..b81be47d33 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -41,7 +41,7 @@ using Umbraco.Core.Services; using Umbraco.Web.Services; using Umbraco.Web.Editors; using Umbraco.Core.DependencyInjection; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Action = System.Action; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; using ProfilingViewEngine = Umbraco.Core.Profiling.ProfilingViewEngine; diff --git a/src/Umbraco.Web/WebServices/DomainsApiController.cs b/src/Umbraco.Web/WebServices/DomainsApiController.cs index 30927d1e96..6c76034767 100644 --- a/src/Umbraco.Web/WebServices/DomainsApiController.cs +++ b/src/Umbraco.Web/WebServices/DomainsApiController.cs @@ -14,8 +14,8 @@ using Umbraco.Web.Routing; using Umbraco.Web.WebApi; //using umbraco.cms.businesslogic.language; using umbraco.cms.businesslogic.web; -using Umbraco.Web.LegacyActions; using Umbraco.Web.WebApi.Filters; +using Umbraco.Web._Legacy.Actions; namespace Umbraco.Web.WebServices { diff --git a/src/Umbraco.Web/LegacyActions/Action.cs b/src/Umbraco.Web/_Legacy/Actions/Action.cs similarity index 99% rename from src/Umbraco.Web/LegacyActions/Action.cs rename to src/Umbraco.Web/_Legacy/Actions/Action.cs index 4ecf0e94d6..4b364d4cc1 100644 --- a/src/Umbraco.Web/LegacyActions/Action.cs +++ b/src/Umbraco.Web/_Legacy/Actions/Action.cs @@ -1,17 +1,14 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using umbraco; -using umbraco.interfaces; using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Core.Logging; using Umbraco.Core.Models.Membership; +using Umbraco.Core.Services; using TypeFinder = Umbraco.Core.TypeFinder; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// Actions and Actionhandlers are a key concept to umbraco and a developer whom wish to apply diff --git a/src/Umbraco.Web/LegacyActions/ActionAssignDomain.cs b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs similarity index 99% rename from src/Umbraco.Web/LegacyActions/ActionAssignDomain.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs index 9fc47f5072..79cd07b6f5 100644 --- a/src/Umbraco.Web/LegacyActions/ActionAssignDomain.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.ObjectResolution; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// A resolver to return all IAction objects diff --git a/src/Umbraco.Web/LegacyActions/ActionAudit.cs b/src/Umbraco.Web/_Legacy/Actions/ActionAudit.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionAudit.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionAudit.cs index f976074eb9..a1a2384702 100644 --- a/src/Umbraco.Web/LegacyActions/ActionAudit.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionAudit.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked upon viewing audittrailing on a document diff --git a/src/Umbraco.Web/LegacyActions/ActionBrowse.cs b/src/Umbraco.Web/_Legacy/Actions/ActionBrowse.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionBrowse.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionBrowse.cs index 50bef10bcf..c5aa0cfb91 100644 --- a/src/Umbraco.Web/LegacyActions/ActionBrowse.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionBrowse.cs @@ -1,6 +1,4 @@ -using umbraco.interfaces; - -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is used as a security constraint that grants a user the ability to view nodes in a tree diff --git a/src/Umbraco.Web/LegacyActions/ActionChangeDocType.cs b/src/Umbraco.Web/_Legacy/Actions/ActionChangeDocType.cs similarity index 97% rename from src/Umbraco.Web/LegacyActions/ActionChangeDocType.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionChangeDocType.cs index a747375e5c..7690c52431 100644 --- a/src/Umbraco.Web/LegacyActions/ActionChangeDocType.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionChangeDocType.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when the document type of a piece of content is changed diff --git a/src/Umbraco.Web/LegacyActions/ActionCopy.cs b/src/Umbraco.Web/_Legacy/Actions/ActionCopy.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionCopy.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionCopy.cs index cf20e0f04c..a9a5794456 100644 --- a/src/Umbraco.Web/LegacyActions/ActionCopy.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionCopy.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when copying a document, media, member diff --git a/src/Umbraco.Web/LegacyActions/ActionDelete.cs b/src/Umbraco.Web/_Legacy/Actions/ActionDelete.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionDelete.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionDelete.cs index b51bb5b99b..b3eff46d5c 100644 --- a/src/Umbraco.Web/LegacyActions/ActionDelete.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionDelete.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a document, media, member is deleted diff --git a/src/Umbraco.Web/LegacyActions/ActionDisable.cs b/src/Umbraco.Web/_Legacy/Actions/ActionDisable.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionDisable.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionDisable.cs index d00ca9c65d..0e72694fe2 100644 --- a/src/Umbraco.Web/LegacyActions/ActionDisable.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionDisable.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a document is disabled. diff --git a/src/Umbraco.Web/LegacyActions/ActionEmptyTranscan.cs b/src/Umbraco.Web/_Legacy/Actions/ActionEmptyTranscan.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionEmptyTranscan.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionEmptyTranscan.cs index 045adff4f7..ef9512ccaf 100644 --- a/src/Umbraco.Web/LegacyActions/ActionEmptyTranscan.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionEmptyTranscan.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when the trash can is emptied diff --git a/src/Umbraco.Web/LegacyActions/ActionExport.cs b/src/Umbraco.Web/_Legacy/Actions/ActionExport.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionExport.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionExport.cs index 0b99b027ec..d7624d7e98 100644 --- a/src/Umbraco.Web/LegacyActions/ActionExport.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionExport.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when exporting a document type diff --git a/src/Umbraco.Web/LegacyActions/ActionImport.cs b/src/Umbraco.Web/_Legacy/Actions/ActionImport.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionImport.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionImport.cs index 5e3b953c54..ab803d883d 100644 --- a/src/Umbraco.Web/LegacyActions/ActionImport.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionImport.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when importing a document type diff --git a/src/Umbraco.Web/LegacyActions/ActionMove.cs b/src/Umbraco.Web/_Legacy/Actions/ActionMove.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionMove.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionMove.cs index a17d13f92a..0a422137f2 100644 --- a/src/Umbraco.Web/LegacyActions/ActionMove.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionMove.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked upon creation of a document, media, member diff --git a/src/Umbraco.Web/LegacyActions/ActionNew.cs b/src/Umbraco.Web/_Legacy/Actions/ActionNew.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionNew.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionNew.cs index 2490cac1fc..211697462b 100644 --- a/src/Umbraco.Web/LegacyActions/ActionNew.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionNew.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked upon creation of a document diff --git a/src/Umbraco.Web/LegacyActions/ActionNewFolder.cs b/src/Umbraco.Web/_Legacy/Actions/ActionNewFolder.cs similarity index 96% rename from src/Umbraco.Web/LegacyActions/ActionNewFolder.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionNewFolder.cs index e4e0e3773f..7768113a7e 100644 --- a/src/Umbraco.Web/LegacyActions/ActionNewFolder.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionNewFolder.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked upon creation of a document diff --git a/src/Umbraco.Web/LegacyActions/ActionNotify.cs b/src/Umbraco.Web/_Legacy/Actions/ActionNotify.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionNotify.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionNotify.cs index 6cf11a111b..9870ec53f8 100644 --- a/src/Umbraco.Web/LegacyActions/ActionNotify.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionNotify.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a notification is sent diff --git a/src/Umbraco.Web/LegacyActions/ActionNull.cs b/src/Umbraco.Web/_Legacy/Actions/ActionNull.cs similarity index 93% rename from src/Umbraco.Web/LegacyActions/ActionNull.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionNull.cs index 6fcbc50c83..dc3128cc62 100644 --- a/src/Umbraco.Web/LegacyActions/ActionNull.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionNull.cs @@ -1,6 +1,4 @@ -using umbraco.interfaces; - -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This permission is assigned to a node when there are no permissions assigned to the node. diff --git a/src/Umbraco.Web/LegacyActions/ActionPackage.cs b/src/Umbraco.Web/_Legacy/Actions/ActionPackage.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionPackage.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionPackage.cs index a381e37d3a..7a1b44af1d 100644 --- a/src/Umbraco.Web/LegacyActions/ActionPackage.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionPackage.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked upon creation of a document, media, member diff --git a/src/Umbraco.Web/LegacyActions/ActionPackageCreate.cs b/src/Umbraco.Web/_Legacy/Actions/ActionPackageCreate.cs similarity index 96% rename from src/Umbraco.Web/LegacyActions/ActionPackageCreate.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionPackageCreate.cs index a3a4d96543..3ae0705727 100644 --- a/src/Umbraco.Web/LegacyActions/ActionPackageCreate.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionPackageCreate.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked upon creation of a document, media, member diff --git a/src/Umbraco.Web/LegacyActions/ActionProtect.cs b/src/Umbraco.Web/_Legacy/Actions/ActionProtect.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionProtect.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionProtect.cs index a9b7831191..98ce80c165 100644 --- a/src/Umbraco.Web/LegacyActions/ActionProtect.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionProtect.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a document is protected or unprotected diff --git a/src/Umbraco.Web/LegacyActions/ActionPublish.cs b/src/Umbraco.Web/_Legacy/Actions/ActionPublish.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionPublish.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionPublish.cs index 50af6aa184..b16802f35c 100644 --- a/src/Umbraco.Web/LegacyActions/ActionPublish.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionPublish.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a document is being published diff --git a/src/Umbraco.Web/LegacyActions/ActionQuit.cs b/src/Umbraco.Web/_Legacy/Actions/ActionQuit.cs similarity index 96% rename from src/Umbraco.Web/LegacyActions/ActionQuit.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionQuit.cs index 40437a5990..b7ec141d3d 100644 --- a/src/Umbraco.Web/LegacyActions/ActionQuit.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionQuit.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a user logs out diff --git a/src/Umbraco.Web/LegacyActions/ActionRePublish.cs b/src/Umbraco.Web/_Legacy/Actions/ActionRePublish.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionRePublish.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionRePublish.cs index 4bab903e7b..9ebbce1dec 100644 --- a/src/Umbraco.Web/LegacyActions/ActionRePublish.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionRePublish.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when all documents are being republished diff --git a/src/Umbraco.Web/LegacyActions/ActionRefresh.cs b/src/Umbraco.Web/_Legacy/Actions/ActionRefresh.cs similarity index 96% rename from src/Umbraco.Web/LegacyActions/ActionRefresh.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionRefresh.cs index addc45ff96..729fe131dc 100644 --- a/src/Umbraco.Web/LegacyActions/ActionRefresh.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionRefresh.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a node reloads its children diff --git a/src/Umbraco.Web/LegacyActions/ActionRestore.cs b/src/Umbraco.Web/_Legacy/Actions/ActionRestore.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionRestore.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionRestore.cs index 402ba878c3..30d4957ee4 100644 --- a/src/Umbraco.Web/LegacyActions/ActionRestore.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionRestore.cs @@ -1,6 +1,4 @@ -using umbraco.interfaces; - -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when the content item is to be restored from the recycle bin diff --git a/src/Umbraco.Web/LegacyActions/ActionRights.cs b/src/Umbraco.Web/_Legacy/Actions/ActionRights.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionRights.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionRights.cs index a91c95713f..c87a4a6910 100644 --- a/src/Umbraco.Web/LegacyActions/ActionRights.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionRights.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when rights are changed on a document diff --git a/src/Umbraco.Web/LegacyActions/ActionRollback.cs b/src/Umbraco.Web/_Legacy/Actions/ActionRollback.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionRollback.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionRollback.cs index 78de09a770..e3a602a66e 100644 --- a/src/Umbraco.Web/LegacyActions/ActionRollback.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionRollback.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when copying a document is being rolled back diff --git a/src/Umbraco.Web/LegacyActions/ActionSendToTranslate.cs b/src/Umbraco.Web/_Legacy/Actions/ActionSendToTranslate.cs similarity index 96% rename from src/Umbraco.Web/LegacyActions/ActionSendToTranslate.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionSendToTranslate.cs index 4e2bf79b14..e68a119462 100644 --- a/src/Umbraco.Web/LegacyActions/ActionSendToTranslate.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionSendToTranslate.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a send to translate request occurs diff --git a/src/Umbraco.Web/LegacyActions/ActionSort.cs b/src/Umbraco.Web/_Legacy/Actions/ActionSort.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionSort.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionSort.cs index a6db6e215f..ff7cc90ebf 100644 --- a/src/Umbraco.Web/LegacyActions/ActionSort.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionSort.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when children to a document, media, member is being sorted diff --git a/src/Umbraco.Web/LegacyActions/ActionToPublish.cs b/src/Umbraco.Web/_Legacy/Actions/ActionToPublish.cs similarity index 96% rename from src/Umbraco.Web/LegacyActions/ActionToPublish.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionToPublish.cs index 8d2bc39683..63246df475 100644 --- a/src/Umbraco.Web/LegacyActions/ActionToPublish.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionToPublish.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when children to a document is being sent to published (by an editor without publishrights) diff --git a/src/Umbraco.Web/LegacyActions/ActionTranslate.cs b/src/Umbraco.Web/_Legacy/Actions/ActionTranslate.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionTranslate.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionTranslate.cs index e8dfae59a8..6bb7cd2fb5 100644 --- a/src/Umbraco.Web/LegacyActions/ActionTranslate.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionTranslate.cs @@ -1,7 +1,6 @@ using System; -using umbraco.interfaces; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when a translation occurs diff --git a/src/Umbraco.Web/LegacyActions/ActionUnPublish.cs b/src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionUnPublish.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs index aed4e51d47..18510b90e8 100644 --- a/src/Umbraco.Web/LegacyActions/ActionUnPublish.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs @@ -1,7 +1,6 @@ using System; -using umbraco.interfaces; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { diff --git a/src/Umbraco.Web/LegacyActions/ActionUpdate.cs b/src/Umbraco.Web/_Legacy/Actions/ActionUpdate.cs similarity index 95% rename from src/Umbraco.Web/LegacyActions/ActionUpdate.cs rename to src/Umbraco.Web/_Legacy/Actions/ActionUpdate.cs index dd13df89a4..344a550922 100644 --- a/src/Umbraco.Web/LegacyActions/ActionUpdate.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ActionUpdate.cs @@ -1,8 +1,7 @@ using System; -using umbraco.interfaces; using Umbraco.Web.UI.Pages; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// This action is invoked when copying a document or media diff --git a/src/Umbraco.Web/LegacyActions/ContextMenuSeperator.cs b/src/Umbraco.Web/_Legacy/Actions/ContextMenuSeperator.cs similarity index 93% rename from src/Umbraco.Web/LegacyActions/ContextMenuSeperator.cs rename to src/Umbraco.Web/_Legacy/Actions/ContextMenuSeperator.cs index 8fa86a7f10..b88f81a316 100644 --- a/src/Umbraco.Web/LegacyActions/ContextMenuSeperator.cs +++ b/src/Umbraco.Web/_Legacy/Actions/ContextMenuSeperator.cs @@ -1,6 +1,4 @@ -using umbraco.interfaces; - -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// Used simply to define context menu seperator items. diff --git a/src/Umbraco.Web/LegacyActions/LegacyActionMenuItemAttribute.cs b/src/Umbraco.Web/_Legacy/Actions/LegacyActionMenuItemAttribute.cs similarity index 97% rename from src/Umbraco.Web/LegacyActions/LegacyActionMenuItemAttribute.cs rename to src/Umbraco.Web/_Legacy/Actions/LegacyActionMenuItemAttribute.cs index 2f99b17788..c3b785d47d 100644 --- a/src/Umbraco.Web/LegacyActions/LegacyActionMenuItemAttribute.cs +++ b/src/Umbraco.Web/_Legacy/Actions/LegacyActionMenuItemAttribute.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Core; -namespace Umbraco.Web.LegacyActions +namespace Umbraco.Web._Legacy.Actions { /// /// The attribute to assign to any IAction objects. diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs index 2a07daa1bf..f48d6c0621 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs @@ -12,7 +12,7 @@ using umbraco.BusinessLogic; using umbraco.cms.businesslogic.media; using umbraco.cms.businesslogic.web; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.Trees { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NodeActionsEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NodeActionsEventArgs.cs index f7256e2aff..20e54e356b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NodeActionsEventArgs.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NodeActionsEventArgs.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.Trees { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs index 8006cc4938..b3be62802f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs @@ -9,7 +9,7 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using System.Collections.Generic; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.Trees { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs index e25496c3b6..7fdf51a448 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs @@ -4,8 +4,8 @@ using umbraco.interfaces; using System.Collections.Generic; using System.Text; using Umbraco.Core; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.Trees { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs index d33d9ac1b5..5268f51d0a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs @@ -5,10 +5,10 @@ using System.Xml.Schema; using System.Collections.Generic; using System.Web.Script.Serialization; using Umbraco.Core.IO; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI.Pages; +using Umbraco.Web._Legacy.Actions; using Umbraco.Web._Legacy.Utils; -using Action = Umbraco.Web.LegacyActions.Action; +using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.cms.presentation.Trees { @@ -473,7 +473,7 @@ namespace umbraco.cms.presentation.Trees this.m_action = reader.Value; break; case TreeAttributes.menu: - this.m_menu = (!string.IsNullOrEmpty(reader.Value) ? Umbraco.Web.LegacyActions.Action.FromString(reader.Value) : null); + this.m_menu = (!string.IsNullOrEmpty(reader.Value) ? Umbraco.Web._Legacy.Actions.Action.FromString(reader.Value) : null); break; case TreeAttributes.rootSrc: this.m_rootSrc = reader.Value; @@ -518,7 +518,7 @@ namespace umbraco.cms.presentation.Trees writer.WriteAttributeString(TreeAttributes.text.ToString(), this.m_text); writer.WriteAttributeString(TreeAttributes.iconClass.ToString(), this.m_iconClass); writer.WriteAttributeString(TreeAttributes.action.ToString(), this.m_action); - writer.WriteAttributeString(TreeAttributes.menu.ToString(), (this.m_menu != null && this.m_menu.Count > 0 ? Umbraco.Web.LegacyActions.Action.ToString(this.m_menu) : "")); + writer.WriteAttributeString(TreeAttributes.menu.ToString(), (this.m_menu != null && this.m_menu.Count > 0 ? Umbraco.Web._Legacy.Actions.Action.ToString(this.m_menu) : "")); writer.WriteAttributeString(TreeAttributes.rootSrc.ToString(), this.m_rootSrc); writer.WriteAttributeString(TreeAttributes.src.ToString(), this.m_src); writer.WriteAttributeString(TreeAttributes.icon.ToString(), this.m_icon); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs index f8c88c3fb1..5e0763f45f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs @@ -7,8 +7,8 @@ using umbraco.cms.businesslogic; using umbraco.interfaces; using umbraco.cms.presentation.Trees; using Umbraco.Core; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index 337bc6b75e..c3e545dfb0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -6,8 +6,8 @@ using umbraco.interfaces; using Umbraco.Core; using Umbraco.Core.Services; using umbraco.cms.presentation.Trees; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs index 0d19afb1f2..10574550da 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs @@ -9,8 +9,8 @@ using umbraco.cms.businesslogic.packager; using umbraco.cms.presentation.Trees; using Umbraco.Core; using umbraco.interfaces; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs index d1a377b9b2..45f81308bd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs @@ -10,8 +10,8 @@ using umbraco.interfaces; using umbraco.cms.presentation.developer.RelationTypes.TreeMenu; using Umbraco.Core; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index 4ccd7f4ca4..ca8df1f392 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -8,8 +8,8 @@ using Umbraco.Core.Configuration; using umbraco.interfaces; using umbraco.cms.presentation.Trees; using Umbraco.Core.IO; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs index 4cf03171d4..cc3d878521 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs @@ -7,8 +7,8 @@ using System.Web; using umbraco.interfaces; using umbraco.cms.presentation.Trees; using Umbraco.Core; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs index 5ac390e874..b69cc767ef 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs @@ -11,7 +11,7 @@ using Umbraco.Core.Services; using umbraco.interfaces; using umbraco.cms.businesslogic.template; using umbraco.cms.presentation.Trees; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs index dd49b5f500..0f9b5c5dde 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs @@ -8,7 +8,7 @@ using umbraco.interfaces; using umbraco.cms.presentation.Trees; using Umbraco.Core.Models.Membership; using Umbraco.Web; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco { public class loadOpenTasks : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs index 566c33e22d..10432335dd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs @@ -9,8 +9,8 @@ using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Web; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs index a8f0fd7045..66a4209a52 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs @@ -5,8 +5,8 @@ using umbraco.interfaces; using umbraco.cms.presentation.Trees; using Umbraco.Core.IO; using Umbraco.Core; -using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; +using Umbraco.Web._Legacy.Actions; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs index 5648864012..e9c4bd987b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs @@ -4,9 +4,9 @@ using System.Web.Script.Serialization; using Umbraco.Core.Logging; using umbraco.interfaces; using Umbraco.Core; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Umbraco.Web._Legacy.Utils; -using Action = Umbraco.Web.LegacyActions.Action; +using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.controls.Tree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs index d9b1b976aa..b4b0a4dffa 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs @@ -5,7 +5,7 @@ using umbraco.interfaces; using System.Text; using Umbraco.Core; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; using Umbraco.Web._Legacy.Utils; namespace umbraco.controls.Tree diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs index 10657da45c..9bcee907e4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs @@ -13,7 +13,7 @@ using runtimeMacro = umbraco.macro; using System.Xml; using umbraco.cms.presentation.Trees; using Umbraco.Web.UI.Pages; -using BizLogicAction = Umbraco.Web.LegacyActions.Action; +using BizLogicAction = Umbraco.Web._Legacy.Actions.Action; using Macro = umbraco.cms.businesslogic.macro.Macro; using Template = umbraco.cms.businesslogic.template.Template; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs index 73f8e73e29..49fc01d1b7 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs @@ -9,7 +9,7 @@ using Umbraco.Web; using umbraco.cms.presentation.Trees; using Umbraco.Core; using Umbraco.Web.UI.Pages; -using BizLogicAction = Umbraco.Web.LegacyActions.Action; +using BizLogicAction = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.presentation.developer.packages { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs index f547d47ac7..b29758003d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs @@ -1,4 +1,4 @@ -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.developer.RelationTypes.TreeMenu { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs index 26ea673946..0e0ae5bc07 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs @@ -1,4 +1,4 @@ -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.developer.RelationTypes.TreeMenu { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs index 5603608738..bf5b9ed93a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs @@ -5,8 +5,8 @@ using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Web.UI.Pages; using Umbraco.Web; -using Umbraco.Web.LegacyActions; using Umbraco.Web.WebServices; +using Umbraco.Web._Legacy.Actions; namespace umbraco.dialogs diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs index 7a2b01e584..ba379e823f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs @@ -12,7 +12,7 @@ using Umbraco.Web; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.web; using Umbraco.Core; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs index 5bfc61ff09..b0aa4b4ad7 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs @@ -10,8 +10,8 @@ using Umbraco.Web; using umbraco.cms.businesslogic; using Umbraco.Core; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI.Pages; +using Umbraco.Web._Legacy.Actions; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs index 155a33d6c9..0602882ff1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using Umbraco.Core; using Umbraco.Web; using umbraco.cms.businesslogic; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI.Pages; +using Umbraco.Web._Legacy.Actions; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs index be794e3c9f..9de531ed25 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs @@ -9,9 +9,9 @@ using System.Linq; using umbraco.cms.presentation.user; using Umbraco.Web; using Umbraco.Web.UI.Pages; -using Action = Umbraco.Web.LegacyActions.Action; +using Action = Umbraco.Web._Legacy.Actions.Action; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs index 8eeaeb967d..48420d34ee 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs @@ -9,9 +9,9 @@ using umbraco.cms.businesslogic; using umbraco.cms.businesslogic.workflow; using Umbraco.Core; using Umbraco.Web; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI.Pages; -using Action = Umbraco.Web.LegacyActions.Action; +using Umbraco.Web._Legacy.Actions; +using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs index de87dee2a4..a4b099b5e5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs @@ -10,8 +10,8 @@ using System.Web.UI.WebControls; using System.Web.UI.HtmlControls; using Umbraco.Core; using Umbraco.Core.Services; -using Umbraco.Web.LegacyActions; -using Action = Umbraco.Web.LegacyActions.Action; +using Umbraco.Web._Legacy.Actions; +using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.presentation.umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index a4cda04dc3..c77f0d8e35 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -9,7 +9,7 @@ using Umbraco.Core; using Umbraco.Core.Services; using Umbraco.Core.Models; using Umbraco.Web; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.presentation.templateControls { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs index 4b74385e13..24153c0270 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs @@ -6,10 +6,10 @@ using System.Linq; using umbraco.cms.presentation.Trees; using Umbraco.Core; using Umbraco.Core.Models.Membership; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI; using Umbraco.Web.UI.Pages; -using Action = Umbraco.Web.LegacyActions.Action; +using Umbraco.Web._Legacy.Actions; +using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs index d30f71eba3..6d62bb6c48 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs @@ -4,9 +4,9 @@ using umbraco.interfaces; using umbraco.BusinessLogic; using Umbraco.Core.Models.Membership; using Umbraco.Web; -using Umbraco.Web.LegacyActions; using Umbraco.Web.UI.Controls; -using Action = Umbraco.Web.LegacyActions.Action; +using Umbraco.Web._Legacy.Actions; +using Action = Umbraco.Web._Legacy.Actions.Action; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs index b36ac5de33..dca8874515 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs @@ -7,8 +7,8 @@ using System.IO; using System.Collections.Generic; using umbraco.interfaces; using Umbraco.Core.IO; -using Umbraco.Web.LegacyActions; using Umbraco.Web.WebServices; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs index a49f2d12bd..22751c63d8 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs @@ -6,7 +6,7 @@ using Umbraco.Web; using umbraco.interfaces; using umbraco.cms.businesslogic.web; using Umbraco.Core.Models.Membership; -using Umbraco.Web.LegacyActions; +using Umbraco.Web._Legacy.Actions; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs index aacd162f47..7b3c076848 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs @@ -8,8 +8,8 @@ using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Web; -using Umbraco.Web.LegacyActions; using Umbraco.Web.WebServices; +using Umbraco.Web._Legacy.Actions; namespace umbraco.presentation.webservices {