From 0a18306d40751c39651e20af09915e7c2aead97a Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 1 May 2018 00:45:05 +1000 Subject: [PATCH] More xslt removal --- src/Umbraco.Core/Cache/CacheKeys.cs | 46 +----- .../RepositoryCompositionRoot.cs | 1 - src/Umbraco.Core/Constants-Applications.cs | 4 +- src/Umbraco.Core/Constants-Composing.cs | 1 - src/Umbraco.Core/IO/FileSystems.cs | 15 +- src/Umbraco.Core/IO/SystemDirectories.cs | 2 - src/Umbraco.Core/Models/IXsltFile.cs | 7 - src/Umbraco.Core/Models/XsltFile.cs | 32 ----- .../Repositories/IXsltFileRepository.cs | 13 -- .../Implement/XsltFileRepository.cs | 133 ------------------ .../Runtime/CoreRuntimeComponent.cs | 1 - src/Umbraco.Core/Services/IFileService.cs | 23 --- .../Services/Implement/FileService.cs | 51 +------ src/Umbraco.Core/UdiEntityType.cs | 4 +- src/Umbraco.Core/UdiGetterExtensions.cs | 16 +-- src/Umbraco.Core/Umbraco.Core.csproj | 4 - src/Umbraco.Tests/IO/IoHelperTests.cs | 1 - src/Umbraco.Tests/TestHelpers/TestObjects.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 43 ------ .../umbraco/developer/Xslt/editXslt.aspx | 68 --------- .../umbraco/developer/Xslt/getXsltStatus.asmx | 1 - .../developer/Xslt/xsltChooseExtension.aspx | 44 ------ .../developer/Xslt/xsltInsertValueOf.aspx | 62 -------- .../umbraco/developer/Xslt/xsltVisualize.aspx | 70 --------- .../umbraco/developer/autoDoc.aspx | 23 --- src/Umbraco.Web.UI/umbraco/xslt/Web.config | 18 --- .../umbraco/xslt/macroGetCurrent.xsl | 23 --- .../umbraco/xslt/macroGetSubs.xsl | 38 ----- .../umbraco/xslt/searchResult.xslt | 32 ----- .../umbraco/xslt/sqlNodeHierachy.xslt | 85 ----------- .../umbraco/xslt/templates/Breadcrumb.xslt | 34 ----- .../umbraco/xslt/templates/Clean.xslt | 21 --- .../templates/ListSubPagesAsThumbnails.xslt | 33 ----- .../templates/ListSubPagesByDateAndLimit.xslt | 36 ----- .../templates/ListSubPagesByDocumentType.xslt | 32 ----- .../xslt/templates/ListSubPagesByLevel.xslt | 32 ----- .../ListSubPagesFromAChangableSource.xslt | 33 ----- .../ListSubPagesFromCurrentPage.xslt | 29 ---- .../ListThumbnailsFromCurrentPage.xslt | 31 ---- .../ListWholeStructureFromCurrentPage.xslt | 30 ---- .../xslt/templates/NavigationPrototype.xslt | 40 ------ .../umbraco/xslt/templates/RSSFeed.xslt | 92 ------------ .../umbraco/xslt/templates/RelatedLinks.xslt | 51 ------- .../xslt/templates/Schema2/Breadcrumb.xslt | 34 ----- .../umbraco/xslt/templates/Schema2/Clean.xslt | 21 --- .../Schema2/ListSubPagesAsThumbnails.xslt | 33 ----- .../Schema2/ListSubPagesByDateAndLimit.xslt | 36 ----- .../Schema2/ListSubPagesByDocumentType.xslt | 32 ----- .../Schema2/ListSubPagesByLevel.xslt | 32 ----- .../ListSubPagesFromAChangableSource.xslt | 33 ----- .../Schema2/ListSubPagesFromCurrentPage.xslt | 29 ---- .../ListThumbnailsFromCurrentPage.xslt | 31 ---- .../ListWholeStructureFromCurrentPage.xslt | 30 ---- .../Schema2/NavigationPrototype.xslt | 40 ------ .../xslt/templates/Schema2/RSSFeed.xslt | 92 ------------ .../xslt/templates/Schema2/RelatedLinks.xslt | 51 ------- .../xslt/templates/Schema2/Sitemap.xslt | 42 ------ .../templates/Schema2/TablePrototype.xslt | 54 ------- .../umbraco/xslt/templates/Sitemap.xslt | 42 ------ .../xslt/templates/TablePrototype.xslt | 54 ------- .../Cache/ContentCacheRefresher.cs | 14 +- .../Cache/DataTypeCacheRefresher.cs | 3 - src/Umbraco.Web/Cache/MacroCacheRefresher.cs | 5 - .../FolderAndFilePermissionsCheck.cs | 3 +- .../Install/FilePermissionHelper.cs | 2 +- 65 files changed, 12 insertions(+), 2058 deletions(-) delete mode 100644 src/Umbraco.Core/Models/IXsltFile.cs delete mode 100644 src/Umbraco.Core/Models/XsltFile.cs delete mode 100644 src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs delete mode 100644 src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/developer/Xslt/getXsltStatus.asmx delete mode 100644 src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/developer/autoDoc.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/Web.config delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/macroGetCurrent.xsl delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/macroGetSubs.xsl delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/searchResult.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/sqlNodeHierachy.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Breadcrumb.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Clean.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesAsThumbnails.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDateAndLimit.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDocumentType.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByLevel.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromAChangableSource.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromCurrentPage.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListThumbnailsFromCurrentPage.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/ListWholeStructureFromCurrentPage.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/NavigationPrototype.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/RSSFeed.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/RelatedLinks.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Breadcrumb.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Clean.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesAsThumbnails.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDateAndLimit.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDocumentType.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByLevel.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromAChangableSource.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromCurrentPage.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListThumbnailsFromCurrentPage.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListWholeStructureFromCurrentPage.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/NavigationPrototype.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RSSFeed.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RelatedLinks.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Sitemap.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/TablePrototype.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/Sitemap.xslt delete mode 100644 src/Umbraco.Web.UI/umbraco/xslt/templates/TablePrototype.xslt diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs index 68b4c3b157..bba5655b7a 100644 --- a/src/Umbraco.Core/Cache/CacheKeys.cs +++ b/src/Umbraco.Core/Cache/CacheKeys.cs @@ -22,9 +22,7 @@ namespace Umbraco.Core.Cache [UmbracoWillObsolete("This cache key is only used for the legacy 'library' caching, remove in v8")] public const string MediaCacheKey = "UL_GetMedia"; - - public const string MacroXsltCacheKey = "macroXslt_"; - + [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")] public const string MacroCacheKey = "UmbracoMacroCache"; @@ -39,54 +37,14 @@ namespace Umbraco.Core.Cache [UmbracoWillObsolete("This cache key is only used for legacy template business logic caching, remove in v8")] public const string TemplateFrontEndCacheKey = "template"; - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string TemplateBusinessLogicCacheKey = "UmbracoTemplateCache"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string UserContextCacheKey = "UmbracoUserContext"; - public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout"; - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string UserCacheKey = "UmbracoUser"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string UserGroupPermissionsCacheKey = "UmbracoUserGroupPermissions"; - [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")] public const string ContentTypeCacheKey = "UmbracoContentType"; [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")] public const string ContentTypePropertiesCacheKey = "ContentType_PropertyTypes_Content:"; - - [Obsolete("No longer used and will be removed in v8")] - public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string LanguageCacheKey = "UmbracoLanguageCache"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string DomainCacheKey = "UmbracoDomainList"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string StylesheetCacheKey = "UmbracoStylesheet"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty"; - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - [EditorBrowsable(EditorBrowsableState.Never)] - public const string DataTypeCacheKey = "UmbracoDataTypeDefinition"; - public const string DataTypePreValuesCacheKey = "UmbracoPreVal"; - + public const string IdToKeyCacheKey = "UI2K__"; public const string KeyToIdCacheKey = "UK2I__"; } diff --git a/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs index 56538a8058..26a95af801 100644 --- a/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs +++ b/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs @@ -76,7 +76,6 @@ namespace Umbraco.Core.Composing.CompositionRoots container.RegisterSingleton(); container.RegisterSingleton(); container.RegisterSingleton(); - container.RegisterSingleton(); } } } diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs index 4c859469fd..7d8476989a 100644 --- a/src/Umbraco.Core/Constants-Applications.cs +++ b/src/Umbraco.Core/Constants-Applications.cs @@ -121,9 +121,7 @@ public const string Templates = "templates"; public const string RelationTypes = "relationTypes"; - - public const string Xslt = "xslt"; - + public const string Languages = "languages"; /// diff --git a/src/Umbraco.Core/Constants-Composing.cs b/src/Umbraco.Core/Constants-Composing.cs index 734a715c2d..1e8c9886d2 100644 --- a/src/Umbraco.Core/Constants-Composing.cs +++ b/src/Umbraco.Core/Constants-Composing.cs @@ -21,7 +21,6 @@ public const string StylesheetFileSystem = "StylesheetFileSystem"; public const string MasterpageFileSystem = "MasterpageFileSystem"; public const string ViewFileSystem = "ViewFileSystem"; - public const string XsltFileSystem = "XsltFileSystem"; public const string JavascriptLibraryFileSystem = "JavascriptLibraryFileSystem"; } } diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs index 39e7fa30fc..2366bde7e2 100644 --- a/src/Umbraco.Core/IO/FileSystems.cs +++ b/src/Umbraco.Core/IO/FileSystems.cs @@ -26,7 +26,6 @@ namespace Umbraco.Core.IO private ShadowWrapper _partialViewsFileSystem; private ShadowWrapper _stylesheetsFileSystem; private ShadowWrapper _scriptsFileSystem; - private ShadowWrapper _xsltFileSystem; private ShadowWrapper _masterPagesFileSystem; private ShadowWrapper _mvcViewsFileSystem; private ShadowWrapper _javaScriptLibraryFileSystem; @@ -103,16 +102,7 @@ namespace Umbraco.Core.IO return _scriptsFileSystem; } } - - public IFileSystem XsltFileSystem - { - get - { - if (Volatile.Read(ref _wkfsInitialized) == false) EnsureWellKnownFileSystems(); - return _xsltFileSystem; - } - } - + public IFileSystem MasterPagesFileSystem { get @@ -163,7 +153,6 @@ namespace Umbraco.Core.IO var partialViewsFileSystem = new PhysicalFileSystem(SystemDirectories.PartialViews); var stylesheetsFileSystem = new PhysicalFileSystem(SystemDirectories.Css); var scriptsFileSystem = new PhysicalFileSystem(SystemDirectories.Scripts); - var xsltFileSystem = new PhysicalFileSystem(SystemDirectories.Xslt); var masterPagesFileSystem = new PhysicalFileSystem(SystemDirectories.Masterpages); var mvcViewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews); var javaScriptLibraryFileSystem = new PhysicalFileSystem(SystemDirectories.JavaScriptLibrary); @@ -172,7 +161,6 @@ namespace Umbraco.Core.IO _partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, "Views/Partials", () => IsScoped()); _stylesheetsFileSystem = new ShadowWrapper(stylesheetsFileSystem, "css", () => IsScoped()); _scriptsFileSystem = new ShadowWrapper(scriptsFileSystem, "scripts", () => IsScoped()); - _xsltFileSystem = new ShadowWrapper(xsltFileSystem, "xslt", () => IsScoped()); _masterPagesFileSystem = new ShadowWrapper(masterPagesFileSystem, "masterpages", () => IsScoped()); _mvcViewsFileSystem = new ShadowWrapper(mvcViewsFileSystem, "Views", () => IsScoped()); _javascriptLibraryFileSystem = new ShadowWrapper(javaScriptLibraryFileSystem, "Lib", () => IsScoped()); @@ -373,7 +361,6 @@ namespace Umbraco.Core.IO wrappers[i++] = _partialViewsFileSystem; wrappers[i++] = _stylesheetsFileSystem; wrappers[i++] = _scriptsFileSystem; - wrappers[i++] = _xsltFileSystem; wrappers[i++] = _masterPagesFileSystem; wrappers[i] = _mvcViewsFileSystem; diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs index 7d3bfd3ae0..37eb1a09b9 100644 --- a/src/Umbraco.Core/IO/SystemDirectories.cs +++ b/src/Umbraco.Core/IO/SystemDirectories.cs @@ -46,8 +46,6 @@ namespace Umbraco.Core.IO public static string WebServices => IOHelper.ReturnPath("umbracoWebservicesPath", Umbraco.EnsureEndsWith("/") + "webservices"); - public static string Xslt => IOHelper.ReturnPath("umbracoXsltPath", "~/xslt"); - //by default the packages folder should exist in the data folder public static string Packages => IOHelper.ReturnPath("umbracoPackagesPath", Data + IOHelper.DirSepChar + "packages"); diff --git a/src/Umbraco.Core/Models/IXsltFile.cs b/src/Umbraco.Core/Models/IXsltFile.cs deleted file mode 100644 index 028b5581c9..0000000000 --- a/src/Umbraco.Core/Models/IXsltFile.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Core.Models -{ - public interface IXsltFile : IFile - { - - } -} diff --git a/src/Umbraco.Core/Models/XsltFile.cs b/src/Umbraco.Core/Models/XsltFile.cs deleted file mode 100644 index a88cd2c127..0000000000 --- a/src/Umbraco.Core/Models/XsltFile.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Runtime.Serialization; - -namespace Umbraco.Core.Models -{ - /// - /// Represents a XSLT file - /// - [Serializable] - [DataContract(IsReference = true)] - public class XsltFile : File, IXsltFile - { - public XsltFile(string path) - : this(path, (Func) null) - { } - - internal XsltFile(string path, Func getFileContent) - : base(path, getFileContent) - { } - - /// - /// Indicates whether the current entity has an identity, which in this case is a path/name. - /// - /// - /// Overrides the default Entity identity check. - /// - public override bool HasIdentity - { - get { return string.IsNullOrEmpty(Path) == false; } - } - } -} diff --git a/src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs deleted file mode 100644 index 2e9e840036..0000000000 --- a/src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.IO; -using Umbraco.Core.Models; - -namespace Umbraco.Core.Persistence.Repositories -{ - public interface IXsltFileRepository : IReadRepository, IWriteRepository - { - bool ValidateXsltFile(XsltFile xsltFile); - Stream GetFileContentStream(string filepath); - void SetFileContent(string filepath, Stream content); - long GetFileSize(string filepath); - } -} diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs deleted file mode 100644 index 75d92eabf6..0000000000 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs +++ /dev/null @@ -1,133 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using LightInject; -using Umbraco.Core.IO; -using Umbraco.Core.Models; - -namespace Umbraco.Core.Persistence.Repositories.Implement -{ - /// - /// Represents the XsltFile Repository - /// - internal class XsltFileRepository : FileRepository, IXsltFileRepository - { - public XsltFileRepository([Inject("XsltFileSystem")] IFileSystem fileSystem) - : base(fileSystem) - { } - - public override XsltFile Get(string id) - { - var path = FileSystem.GetRelativePath(id); - - path = path.EnsureEndsWith(".xslt"); - - if (FileSystem.FileExists(path) == false) - return null; - - var created = FileSystem.GetCreated(path).UtcDateTime; - var updated = FileSystem.GetLastModified(path).UtcDateTime; - - var xsltFile = new XsltFile(path, file => GetFileContent(file.OriginalPath)) - { - Key = path.EncodeAsGuid(), - CreateDate = created, - UpdateDate = updated, - Id = path.GetHashCode(), - VirtualPath = FileSystem.GetUrl(path) - }; - - // reset dirty initial properties (U4-1946) - xsltFile.ResetDirtyProperties(false); - - return xsltFile; - } - - public override void Save(XsltFile entity) - { - base.Save(entity); - - // ensure that from now on, content is lazy-loaded - if (entity.GetFileContent == null) - entity.GetFileContent = file => GetFileContent(file.OriginalPath); - } - - public override IEnumerable GetMany(params string[] ids) - { - ids = ids - .Select(x => StringExtensions.EnsureEndsWith(x, ".xslt")) - .Distinct() - .ToArray(); - - if (ids.Any()) - { - foreach (var id in ids) - { - yield return Get(id); - } - } - else - { - var files = FindAllFiles("", "*.xslt"); - foreach (var file in files) - { - yield return Get(file); - } - } - } - - /// - /// Gets a list of all that exist at the relative path specified. - /// - /// - /// If null or not specified, will return the XSLT files at the root path relative to the IFileSystem - /// - /// - public IEnumerable GetXsltFilesAtPath(string rootPath = null) - { - return FileSystem.GetFiles(rootPath ?? string.Empty, "*.xslt").Select(Get); - } - - private static readonly List ValidExtensions = new List { "xslt" }; - - public bool ValidateXsltFile(XsltFile xsltFile) - { - // get full path - string fullPath; - try - { - // may throw for security reasons - fullPath = FileSystem.GetFullPath(xsltFile.Path); - } - catch - { - return false; - } - - // validate path and extension - var validDir = SystemDirectories.Xslt; - var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir); - var isValidExtension = IOHelper.VerifyFileExtension(xsltFile.Path, ValidExtensions); - return isValidPath && isValidExtension; - } - - public Stream GetFileContentStream(string filepath) - { - if (FileSystem.FileExists(filepath) == false) return null; - - try - { - return FileSystem.OpenFile(filepath); - } - catch - { - return null; // deal with race conds - } - } - - public void SetFileContent(string filepath, Stream content) - { - FileSystem.AddFile(filepath, content, true); - } - } -} diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs index eeacba2b7c..fbcc9a74cc 100644 --- a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs +++ b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs @@ -52,7 +52,6 @@ namespace Umbraco.Core.Runtime composition.Container.RegisterSingleton(factory => factory.GetInstance().StylesheetsFileSystem, Constants.Composing.FileSystems.StylesheetFileSystem); composition.Container.RegisterSingleton(factory => factory.GetInstance().MasterPagesFileSystem, Constants.Composing.FileSystems.MasterpageFileSystem); composition.Container.RegisterSingleton(factory => factory.GetInstance().MvcViewsFileSystem, Constants.Composing.FileSystems.ViewFileSystem); - composition.Container.RegisterSingleton(factory => factory.GetInstance().XsltFileSystem, Constants.Composing.FileSystems.XsltFileSystem); // register manifest parser, will be injected in collection builders where needed composition.Container.RegisterSingleton(); diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs index 91ac7c25ea..1f938c8e27 100644 --- a/src/Umbraco.Core/Services/IFileService.cs +++ b/src/Umbraco.Core/Services/IFileService.cs @@ -18,8 +18,6 @@ namespace Umbraco.Core.Services IPartialView GetPartialView(string path); IPartialView GetPartialViewMacro(string path); IEnumerable GetPartialViewMacros(params string[] names); - IXsltFile GetXsltFile(string path); - IEnumerable GetXsltFiles(params string[] names); Attempt CreatePartialView(IPartialView partialView, string snippetName = null, int userId = 0); Attempt CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = 0); bool DeletePartialView(string path, int userId = 0); @@ -305,27 +303,6 @@ namespace Umbraco.Core.Services /// The size of the script file. long GetScriptFileSize(string filepath); - /// - /// Gets the content of a XSLT file as a stream. - /// - /// The filesystem path to the XSLT file. - /// The content of the XSLT file. - Stream GetXsltFileContentStream(string filepath); - - /// - /// Sets the content of a XSLT file. - /// - /// The filesystem path to the XSLT file. - /// The content of the XSLT file. - void SetXsltFileContent(string filepath, Stream content); - - /// - /// Gets the size of a XSLT file. - /// - /// The filesystem path to the XSLT file. - /// The size of the XSLT file. - long GetXsltFileSize(string filepath); - /// /// Gets the content of a macro partial view as a stream. /// diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs index 8c1fa53880..09bd096f8e 100644 --- a/src/Umbraco.Core/Services/Implement/FileService.cs +++ b/src/Umbraco.Core/Services/Implement/FileService.cs @@ -24,7 +24,6 @@ namespace Umbraco.Core.Services.Implement private readonly ITemplateRepository _templateRepository; private readonly IPartialViewRepository _partialViewRepository; private readonly IPartialViewMacroRepository _partialViewMacroRepository; - private readonly IXsltFileRepository _xsltRepository; private readonly IAuditRepository _auditRepository; private const string PartialViewHeader = "@inherits Umbraco.Web.Mvc.UmbracoViewPage"; @@ -33,7 +32,7 @@ namespace Umbraco.Core.Services.Implement public FileService(IScopeProvider uowProvider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IStylesheetRepository stylesheetRepository, IScriptRepository scriptRepository, ITemplateRepository templateRepository, IPartialViewRepository partialViewRepository, IPartialViewMacroRepository partialViewMacroRepository, - IXsltFileRepository xsltRepository, IAuditRepository auditRepository) + IAuditRepository auditRepository) : base(uowProvider, logger, eventMessagesFactory) { _stylesheetRepository = stylesheetRepository; @@ -41,7 +40,6 @@ namespace Umbraco.Core.Services.Implement _templateRepository = templateRepository; _partialViewRepository = partialViewRepository; _partialViewMacroRepository = partialViewMacroRepository; - _xsltRepository = xsltRepository; _auditRepository = auditRepository; } @@ -724,22 +722,6 @@ namespace Umbraco.Core.Services.Implement } } - public IXsltFile GetXsltFile(string path) - { - using (var scope = ScopeProvider.CreateScope(autoComplete: true)) - { - return _xsltRepository.Get(path); - } - } - - public IEnumerable GetXsltFiles(params string[] names) - { - using (var scope = ScopeProvider.CreateScope(autoComplete: true)) - { - return _xsltRepository.GetMany(names).OrderBy(x => x.Name); - } - } - public Attempt CreatePartialView(IPartialView partialView, string snippetName = null, int userId = 0) { return CreatePartialViewMacro(partialView, PartialViewType.PartialView, snippetName, userId); @@ -1051,36 +1033,7 @@ namespace Umbraco.Core.Services.Implement } #endregion - - #region Xslt - - public Stream GetXsltFileContentStream(string filepath) - { - using (var scope = ScopeProvider.CreateScope(autoComplete: true)) - { - return _xsltRepository.GetFileContentStream(filepath); - } - } - - public void SetXsltFileContent(string filepath, Stream content) - { - using (var scope = ScopeProvider.CreateScope()) - { - _xsltRepository.SetFileContent(filepath, content); - scope.Complete(); - } - } - - public long GetXsltFileSize(string filepath) - { - using (var scope = ScopeProvider.CreateScope(autoComplete: true)) - { - return _xsltRepository.GetFileSize(filepath); - } - } - - #endregion - + private void Audit(AuditType type, string message, int userId, int objectId) { _auditRepository.Save(new AuditItem(objectId, message, type, userId)); diff --git a/src/Umbraco.Core/UdiEntityType.cs b/src/Umbraco.Core/UdiEntityType.cs index 34bd26b537..07bde1ba93 100644 --- a/src/Umbraco.Core/UdiEntityType.cs +++ b/src/Umbraco.Core/UdiEntityType.cs @@ -54,8 +54,7 @@ namespace Umbraco.Core { Script, UdiType.StringUdi}, { PartialView, UdiType.StringUdi}, { PartialViewMacro, UdiType.StringUdi}, - { Stylesheet, UdiType.StringUdi}, - { Xslt, UdiType.StringUdi}, + { Stylesheet, UdiType.StringUdi} }; } @@ -108,7 +107,6 @@ namespace Umbraco.Core public const string Stylesheet = "stylesheet"; public const string PartialView = "partial-view"; public const string PartialViewMacro = "partial-view-macro"; - public const string Xslt = "xslt"; public static string FromUmbracoObjectType(UmbracoObjectTypes umbracoObjectType) { diff --git a/src/Umbraco.Core/UdiGetterExtensions.cs b/src/Umbraco.Core/UdiGetterExtensions.cs index 3ba5fe6f65..5a5ccf5574 100644 --- a/src/Umbraco.Core/UdiGetterExtensions.cs +++ b/src/Umbraco.Core/UdiGetterExtensions.cs @@ -206,18 +206,7 @@ namespace Umbraco.Core return new StringUdi(entityType, entity.Path.TrimStart('/')).EnsureClosed(); } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// The entity identifier of the entity. - public static StringUdi GetUdi(this IXsltFile entity) - { - if (entity == null) throw new ArgumentNullException("entity"); - return new StringUdi(Constants.UdiEntityType.Xslt, entity.Path.TrimStart('/')).EnsureClosed(); - } - + /// /// Gets the entity identifier of the entity. /// @@ -317,9 +306,6 @@ namespace Umbraco.Core var partialView = entity as IPartialView; if (partialView != null) return partialView.GetUdi(); - var xsltFile = entity as IXsltFile; - if (xsltFile != null) return xsltFile.GetUdi(); - var contentBase = entity as IContentBase; if (contentBase != null) return contentBase.GetUdi(); diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index bbb020f308..3f67f820e1 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -686,7 +686,6 @@ - @@ -844,7 +843,6 @@ - @@ -1178,7 +1176,6 @@ - @@ -1213,7 +1210,6 @@ - diff --git a/src/Umbraco.Tests/IO/IoHelperTests.cs b/src/Umbraco.Tests/IO/IoHelperTests.cs index fb3283718e..07436eff1a 100644 --- a/src/Umbraco.Tests/IO/IoHelperTests.cs +++ b/src/Umbraco.Tests/IO/IoHelperTests.cs @@ -47,7 +47,6 @@ namespace Umbraco.Tests.IO Assert.AreEqual(IOHelper.MapPath(SystemDirectories.UmbracoClient, true), IOHelper.MapPath(SystemDirectories.UmbracoClient, false)); Assert.AreEqual(IOHelper.MapPath(SystemDirectories.UserControls, true), IOHelper.MapPath(SystemDirectories.UserControls, false)); Assert.AreEqual(IOHelper.MapPath(SystemDirectories.WebServices, true), IOHelper.MapPath(SystemDirectories.WebServices, false)); - Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Xslt, true), IOHelper.MapPath(SystemDirectories.Xslt, false)); } [Test] diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index b0676f2eb9..91002739d1 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -169,7 +169,7 @@ namespace Umbraco.Tests.TestHelpers var mediaService = GetLazyService(container, c => new MediaService(scopeProvider, mediaFileSystem, logger, eventMessagesFactory, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); var contentTypeService = GetLazyService(container, c => new ContentTypeService(scopeProvider, logger, eventMessagesFactory, contentService.Value, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); var mediaTypeService = GetLazyService(container, c => new MediaTypeService(scopeProvider, logger, eventMessagesFactory, mediaService.Value, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); - var fileService = GetLazyService(container, c => new FileService(scopeProvider, logger, eventMessagesFactory, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); + var fileService = GetLazyService(container, c => new FileService(scopeProvider, logger, eventMessagesFactory, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); var localizationService = GetLazyService(container, c => new LocalizationService(scopeProvider, logger, eventMessagesFactory, GetRepo(c), GetRepo(c), GetRepo(c))); var memberTypeService = GetLazyService(container, c => new MemberTypeService(scopeProvider, logger, eventMessagesFactory, memberService.Value, GetRepo(c), GetRepo(c), GetRepo(c))); diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 451b5c5a32..0fb48f2d93 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -288,10 +288,6 @@ - - - - @@ -412,21 +408,6 @@ - - - - - - - - - - - - - - - @@ -442,7 +423,6 @@ - @@ -559,19 +539,12 @@ - - - - - - - @@ -592,22 +565,6 @@ - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx deleted file mode 100644 index 82708b940e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx +++ /dev/null @@ -1,68 +0,0 @@ -<%@ Page Title="Edit XSLT File" MasterPageFile="../../masterpages/umbracoPage.Master" - ValidateRequest="false" Language="c#" CodeBehind="editXslt.aspx.cs" AutoEventWireup="True" - Inherits="umbraco.cms.presentation.developer.editXslt" %> -<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/getXsltStatus.asmx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/getXsltStatus.asmx deleted file mode 100644 index 7d5385af8f..0000000000 --- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/getXsltStatus.asmx +++ /dev/null @@ -1 +0,0 @@ -<%@ WebService Language="c#" Codebehind="getXsltStatus.asmx.cs" Class="umbraco.developer.getXsltStatus" %> diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx deleted file mode 100644 index dd64a4df9a..0000000000 --- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx +++ /dev/null @@ -1,44 +0,0 @@ -<%@ Page Language="c#" Codebehind="xsltChooseExtension.aspx.cs" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="True" - Inherits="umbraco.developer.xsltChooseExtension" %> -<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %> -<%@ Import Namespace="Umbraco.Web" %> - - - - - - - - - - - - - - - - - - - -

- <%= Services.TextService.Localize("or") %> <%= Services.TextService.Localize("cancel") %> -

- - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx deleted file mode 100644 index 809361560b..0000000000 --- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx +++ /dev/null @@ -1,62 +0,0 @@ -<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True" Inherits="umbraco.developer.xsltInsertValueOf" %> -<%@ Import Namespace="Umbraco.Web" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %> - - - - - - - - - - - - - - - - - - - - - - -

- <%= Services.TextService.Localize("or") %> <%= Services.TextService.Localize("cancel") %> -

- \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx deleted file mode 100644 index 752edf16c2..0000000000 --- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx +++ /dev/null @@ -1,70 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="true" - CodeBehind="xsltVisualize.aspx.cs" ValidateRequest="false" Inherits="umbraco.presentation.umbraco.developer.Xslt.xsltVisualize" %> - -<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %> -<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="Umbraco.Web" %> - - - - - - - - -
- - - - - - -
-
- - - - - - - - - - - - - - - - - -
- -
- -
- diff --git a/src/Umbraco.Web.UI/umbraco/developer/autoDoc.aspx b/src/Umbraco.Web.UI/umbraco/developer/autoDoc.aspx deleted file mode 100644 index 5fb02ef834..0000000000 --- a/src/Umbraco.Web.UI/umbraco/developer/autoDoc.aspx +++ /dev/null @@ -1,23 +0,0 @@ -<%@ Page language="c#" Codebehind="autoDoc.aspx.cs" AutoEventWireup="True" Inherits="umbraco.developer.autoDoc" %> - - - - autoDoc - - - - - - - -
- -
- - diff --git a/src/Umbraco.Web.UI/umbraco/xslt/Web.config b/src/Umbraco.Web.UI/umbraco/xslt/Web.config deleted file mode 100644 index fd6e3a816a..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/Web.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/umbraco/xslt/macroGetCurrent.xsl b/src/Umbraco.Web.UI/umbraco/xslt/macroGetCurrent.xsl deleted file mode 100644 index da4854f40a..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/macroGetCurrent.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/umbraco/xslt/macroGetSubs.xsl b/src/Umbraco.Web.UI/umbraco/xslt/macroGetSubs.xsl deleted file mode 100644 index 33ccc65125..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/macroGetSubs.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/umbraco/xslt/searchResult.xslt b/src/Umbraco.Web.UI/umbraco/xslt/searchResult.xslt deleted file mode 100644 index 17809f223b..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/searchResult.xslt +++ /dev/null @@ -1,32 +0,0 @@ - - - - - -
    - -
  1. -

    - - - - - - - - - - Node Type: -

    -

    - Last updated on - -

    -
    2. - -     -
- - diff --git a/src/Umbraco.Web.UI/umbraco/xslt/sqlNodeHierachy.xslt b/src/Umbraco.Web.UI/umbraco/xslt/sqlNodeHierachy.xslt deleted file mode 100644 index db6001e784..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/sqlNodeHierachy.xslt +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -<!DOCTYPE umbraco [ - <!ELEMENT nodes ANY> - <!ELEMENT node ANY> - <!ATTLIST node id ID #REQUIRED> -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Breadcrumb.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Breadcrumb.xslt deleted file mode 100644 index ef870ffa0c..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Breadcrumb.xslt +++ /dev/null @@ -1,34 +0,0 @@ - -]> - - - - - - - - - - - -
    - -
  • - - - -
    • -     - -
  • - -
    • -
- - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Clean.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Clean.xslt deleted file mode 100644 index ece30c8f4e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Clean.xslt +++ /dev/null @@ -1,21 +0,0 @@ - - ]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesAsThumbnails.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesAsThumbnails.xslt deleted file mode 100644 index 4d451b23c8..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesAsThumbnails.xslt +++ /dev/null @@ -1,33 +0,0 @@ - - ]> - - - - - - - - - - -
- - - - -
- -
- - Photo(s) -
- - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDateAndLimit.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDateAndLimit.xslt deleted file mode 100644 index 9fffeabb8c..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDateAndLimit.xslt +++ /dev/null @@ -1,36 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDocumentType.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDocumentType.xslt deleted file mode 100644 index d3a24e854c..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByDocumentType.xslt +++ /dev/null @@ -1,32 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByLevel.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByLevel.xslt deleted file mode 100644 index a591f1644e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesByLevel.xslt +++ /dev/null @@ -1,32 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromAChangableSource.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromAChangableSource.xslt deleted file mode 100644 index f2186853fc..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromAChangableSource.xslt +++ /dev/null @@ -1,33 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromCurrentPage.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromCurrentPage.xslt deleted file mode 100644 index cb0ec8c25e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListSubPagesFromCurrentPage.xslt +++ /dev/null @@ -1,29 +0,0 @@ - - ]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListThumbnailsFromCurrentPage.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListThumbnailsFromCurrentPage.xslt deleted file mode 100644 index 265678ee86..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListThumbnailsFromCurrentPage.xslt +++ /dev/null @@ -1,31 +0,0 @@ - - ]> - - - - - - - - - - - -
- - - -
-
- -
- - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListWholeStructureFromCurrentPage.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/ListWholeStructureFromCurrentPage.xslt deleted file mode 100644 index 0edf12a302..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/ListWholeStructureFromCurrentPage.xslt +++ /dev/null @@ -1,30 +0,0 @@ - - ]> - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/NavigationPrototype.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/NavigationPrototype.xslt deleted file mode 100644 index 7ded577dea..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/NavigationPrototype.xslt +++ /dev/null @@ -1,40 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/RSSFeed.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/RSSFeed.xslt deleted file mode 100644 index 3043f44a68..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/RSSFeed.xslt +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <?xml version="1.0" encoding="UTF-8"?> - - - - - <xsl:value-of select="$RSSTitle"/> - - - - - - - - umbraco - - - - en - - - - - - - - - - - - - - <xsl:value-of select="@nodeName"/> - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/RelatedLinks.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/RelatedLinks.xslt deleted file mode 100644 index 92df3bb6ea..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/RelatedLinks.xslt +++ /dev/null @@ -1,51 +0,0 @@ - -]> - - - - - - - - - - - - - -
    - -
  • - - - _blank - - - - - - - - - - - - - - - -
    • -     -
- - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Breadcrumb.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Breadcrumb.xslt deleted file mode 100644 index ef8f2bdfdd..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Breadcrumb.xslt +++ /dev/null @@ -1,34 +0,0 @@ - -]> - - - - - - - - - - - -
    - -
  • - - - -
    • -     - -
  • - -
    • -
- - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Clean.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Clean.xslt deleted file mode 100644 index ece30c8f4e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Clean.xslt +++ /dev/null @@ -1,21 +0,0 @@ - - ]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesAsThumbnails.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesAsThumbnails.xslt deleted file mode 100644 index b0d0890ad4..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesAsThumbnails.xslt +++ /dev/null @@ -1,33 +0,0 @@ - - ]> - - - - - - - - - - -
- - - - -
- -
- - Photo(s) -
- - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDateAndLimit.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDateAndLimit.xslt deleted file mode 100644 index 289c42f61e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDateAndLimit.xslt +++ /dev/null @@ -1,36 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDocumentType.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDocumentType.xslt deleted file mode 100644 index 4636b25885..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByDocumentType.xslt +++ /dev/null @@ -1,32 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByLevel.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByLevel.xslt deleted file mode 100644 index 96055df141..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesByLevel.xslt +++ /dev/null @@ -1,32 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromAChangableSource.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromAChangableSource.xslt deleted file mode 100644 index de1d1693ed..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromAChangableSource.xslt +++ /dev/null @@ -1,33 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromCurrentPage.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromCurrentPage.xslt deleted file mode 100644 index d97c92b960..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListSubPagesFromCurrentPage.xslt +++ /dev/null @@ -1,29 +0,0 @@ - - ]> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListThumbnailsFromCurrentPage.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListThumbnailsFromCurrentPage.xslt deleted file mode 100644 index 1c645dea3b..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListThumbnailsFromCurrentPage.xslt +++ /dev/null @@ -1,31 +0,0 @@ - - ]> - - - - - - - - - - - -
- - - -
-
- -
- - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListWholeStructureFromCurrentPage.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListWholeStructureFromCurrentPage.xslt deleted file mode 100644 index 2cd59aa663..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/ListWholeStructureFromCurrentPage.xslt +++ /dev/null @@ -1,30 +0,0 @@ - - ]> - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/NavigationPrototype.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/NavigationPrototype.xslt deleted file mode 100644 index 7ff5d40bde..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/NavigationPrototype.xslt +++ /dev/null @@ -1,40 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RSSFeed.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RSSFeed.xslt deleted file mode 100644 index d068eb4cd5..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RSSFeed.xslt +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <?xml version="1.0" encoding="UTF-8"?> - - - - - <xsl:value-of select="$RSSTitle"/> - - - - - - - - umbraco - - - - en - - - - - - - - - - - - - - <xsl:value-of select="@nodeName"/> - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RelatedLinks.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RelatedLinks.xslt deleted file mode 100644 index cbf781b1df..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/RelatedLinks.xslt +++ /dev/null @@ -1,51 +0,0 @@ - -]> - - - - - - - - - - - - - -
    - -
  • - - - _blank - - - - - - - - - - - - - - - -
    • -     -
- - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Sitemap.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Sitemap.xslt deleted file mode 100644 index 980ac7380f..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/Sitemap.xslt +++ /dev/null @@ -1,42 +0,0 @@ - - ]> - - - - - - - - - - -
- - - -
- - - - - -
    -
  • - - - - - - - -
    • -     -
- - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/TablePrototype.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/TablePrototype.xslt deleted file mode 100644 index 1307e75260..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Schema2/TablePrototype.xslt +++ /dev/null @@ -1,54 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - - - - - - - - background-color: - - - background-color: - - - - - - - -
NameCreate DateCustom Property
- - - - - - -
- - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/Sitemap.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/Sitemap.xslt deleted file mode 100644 index e212aaa4a7..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/Sitemap.xslt +++ /dev/null @@ -1,42 +0,0 @@ - - ]> - - - - - - - - - - -
- - - -
- - - - - -
    -
  • - - - - - - - -
    • -     -
- - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/xslt/templates/TablePrototype.xslt b/src/Umbraco.Web.UI/umbraco/xslt/templates/TablePrototype.xslt deleted file mode 100644 index 0d9471335b..0000000000 --- a/src/Umbraco.Web.UI/umbraco/xslt/templates/TablePrototype.xslt +++ /dev/null @@ -1,54 +0,0 @@ - - ]> - - - - - - - - - - - - - - - - - - - - - - - - - background-color: - - - background-color: - - - - - - - -
NameCreate DateCustom Property
- - - - - - -
- - - - \ No newline at end of file diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs index 257e0c9731..f44781886d 100644 --- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs @@ -80,8 +80,7 @@ namespace Umbraco.Web.Cache // when a public version changes Current.ApplicationCache.ClearPartialViewCache(); MacroCacheRefresher.ClearMacroContentCache(CacheHelper); // just the content - ClearXsltCache(); - + Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey); Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey); } @@ -145,7 +144,6 @@ namespace Umbraco.Web.Cache cacheHelper.ClearPartialViewCache(); MacroCacheRefresher.ClearMacroContentCache(cacheHelper); // just the content - ClearXsltCache(); cacheHelper.IsolatedRuntimeCache.ClearCache(); cacheHelper.IsolatedRuntimeCache.ClearCache(); @@ -153,15 +151,5 @@ namespace Umbraco.Web.Cache #endregion - #region Helpers - - private static void ClearXsltCache() - { - // todo: document where this is coming from - if (UmbracoConfig.For.UmbracoSettings().Content.UmbracoLibraryCacheDuration <= 0) return; - Current.ApplicationCache.ClearCacheObjectTypes("MS.Internal.Xml.XPath.XPathSelectionIterator"); - } - - #endregion } } diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs index 8d1a65f296..d7fd338965 100644 --- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs @@ -53,9 +53,6 @@ namespace Umbraco.Web.Cache foreach (var payload in payloads) { - if (dataTypeCache) - dataTypeCache.Result.ClearCacheByKeySearch(CacheKeys.DataTypePreValuesCacheKey + "_" + payload.Id); - _idkMap.ClearCache(payload.Id); } diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs index 402151fdb9..c7157bf9dc 100644 --- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs @@ -105,11 +105,6 @@ namespace Umbraco.Web.Cache { CacheKeys.MacroCacheKey, // umbraco.cms.businesslogic.macro.Macro objects cache CacheKeys.MacroContentCacheKey, // macro render cache - //CacheKeys.MacroControlCacheKey, - //CacheKeys.MacroHtmlCacheKey, - //CacheKeys.MacroHtmlDateAddedCacheKey, - //CacheKeys.MacroControlDateAddedCacheKey, - CacheKeys.MacroXsltCacheKey, // XsltMacroEngine transforms cache }; } diff --git a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs index 86cef17b4c..b69e5edece 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs @@ -71,8 +71,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Permissions { SystemDirectories.Umbraco, PermissionCheckRequirement.Optional }, { SystemDirectories.UmbracoClient, PermissionCheckRequirement.Optional }, { SystemDirectories.UserControls, PermissionCheckRequirement.Optional }, - { SystemDirectories.MvcViews, PermissionCheckRequirement.Optional }, - { SystemDirectories.Xslt, PermissionCheckRequirement.Optional }, + { SystemDirectories.MvcViews, PermissionCheckRequirement.Optional } }; //These are special paths to check that will restart an app domain if a file is written to them, diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs index b9252c9e65..c58c2fd4fd 100644 --- a/src/Umbraco.Web/Install/FilePermissionHelper.cs +++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.Install internal class FilePermissionHelper { // ensure that these directories exist and Umbraco can write to them - private static readonly string[] PermissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Masterpages, SystemDirectories.Xslt, SystemDirectories.UserControls, SystemDirectories.Preview }; + private static readonly string[] PermissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Masterpages, SystemDirectories.UserControls, SystemDirectories.Preview }; private static readonly string[] PackagesPermissionsDirs = { SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.UserControls, SystemDirectories.Packages }; // ensure Umbraco can write to these files (the directories must exist)