From 47474d31d602f9bb48716e184371cb21ebf0473c Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 22 Mar 2013 15:02:26 -0100 Subject: [PATCH] Web.PublishedCache - rename LegacyXmlCache into XmlPublishedCache --- src/Umbraco.Tests/LibraryTests.cs | 2 +- .../PublishedCache/PublishedContentCacheTests.cs | 2 +- .../PublishedCache/PublishedMediaCacheTests.cs | 2 +- src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs | 2 +- .../PublishedContent/DynamicPublishedContentTests.cs | 2 +- .../PublishedContent/PublishedContentTestBase.cs | 2 +- src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs | 5 ----- src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs | 2 +- .../PublishedContent/StronglyTypedQueryTests.cs | 2 +- src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs | 2 +- src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs | 2 +- .../Routing/NiceUrlsProviderWithDomainsTests.cs | 2 +- src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs | 2 +- src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs | 2 +- src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs | 2 +- src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs | 2 +- src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs | 2 +- src/Umbraco.Web/Cache/DomainCacheRefresher.cs | 2 +- .../PublishedContentCache.cs | 2 +- .../PublishedMediaCache.cs | 2 +- .../{LegacyXmlCache => XmlPublishedCache}/RoutesCache.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 6 +++--- src/Umbraco.Web/WebBootManager.cs | 2 +- 23 files changed, 24 insertions(+), 29 deletions(-) rename src/Umbraco.Web/PublishedCache/{LegacyXmlCache => XmlPublishedCache}/PublishedContentCache.cs (97%) rename src/Umbraco.Web/PublishedCache/{LegacyXmlCache => XmlPublishedCache}/PublishedMediaCache.cs (96%) rename src/Umbraco.Web/PublishedCache/{LegacyXmlCache => XmlPublishedCache}/RoutesCache.cs (95%) diff --git a/src/Umbraco.Tests/LibraryTests.cs b/src/Umbraco.Tests/LibraryTests.cs index ccb90d314e..6f1f13faa1 100644 --- a/src/Umbraco.Tests/LibraryTests.cs +++ b/src/Umbraco.Tests/LibraryTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using umbraco; namespace Umbraco.Tests diff --git a/src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs index ed28fce075..f25cb9b315 100644 --- a/src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs +++ b/src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Configuration; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using umbraco.BusinessLogic; diff --git a/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs index 8d75b197d3..a1d922e86d 100644 --- a/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs +++ b/src/Umbraco.Tests/PublishedCache/PublishedMediaCacheTests.cs @@ -10,7 +10,7 @@ using Umbraco.Tests.PublishedContent; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using umbraco.BusinessLogic; namespace Umbraco.Tests.PublishedCache diff --git a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs index c4c8385da0..b000466a85 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs @@ -7,7 +7,7 @@ using Umbraco.Core.IO; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using umbraco.MacroEngines; using umbraco.NodeFactory; using System.Linq; diff --git a/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs index 6a796d43a9..fdf097472d 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Models; using Umbraco.Web; using Umbraco.Web.Models; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs index 6939cbb5a0..50fc198dca 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs @@ -6,7 +6,7 @@ using Umbraco.Core.PropertyEditors; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs index 1598f1fd99..79940a82f2 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; using System.Linq; using System.Web; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Tests.TestHelpers; using Umbraco.Web; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index 129149deef..36cba1ad3e 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -19,7 +19,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Tests.UmbracoExamine; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using UmbracoExamine; using UmbracoExamine.DataServices; using umbraco.BusinessLogic; diff --git a/src/Umbraco.Tests/PublishedContent/StronglyTypedQueryTests.cs b/src/Umbraco.Tests/PublishedContent/StronglyTypedQueryTests.cs index 89da7a89f2..e437829956 100644 --- a/src/Umbraco.Tests/PublishedContent/StronglyTypedQueryTests.cs +++ b/src/Umbraco.Tests/PublishedContent/StronglyTypedQueryTests.cs @@ -9,7 +9,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.Models; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs index 2b10125af9..6be14fce80 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using NUnit.Framework; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.template; diff --git a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs index a011dd7480..9deaa12f7b 100644 --- a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs +++ b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using NUnit.Framework; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; namespace Umbraco.Tests.Routing diff --git a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs index 39f30c7368..a2c09469b3 100644 --- a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs @@ -5,7 +5,7 @@ using System.Text; using System.Configuration; using NUnit.Framework; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.language; diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs index b2dd369f72..3e1eb98d3e 100644 --- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs +++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using NUnit.Framework; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.language; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs b/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs index b3794fff57..24bc912f91 100644 --- a/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs +++ b/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs @@ -7,7 +7,7 @@ using Umbraco.Tests.Stubs; using Umbraco.Tests.TestHelpers; using System.Configuration; using Umbraco.Web; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.template; diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index 29f9c9bf10..b9dd4c1a4a 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -22,7 +22,7 @@ using Umbraco.Core.Services; using Umbraco.Tests.Stubs; using Umbraco.Web; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using umbraco.BusinessLogic; diff --git a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs index 886b4f07bd..ab787bf105 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs @@ -6,7 +6,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Tests.Stubs; using Umbraco.Web; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; namespace Umbraco.Tests.TestHelpers diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs index e8b58ba4bb..89698caa4b 100644 --- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.Caching; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; namespace Umbraco.Web.Cache { diff --git a/src/Umbraco.Web/Cache/DomainCacheRefresher.cs b/src/Umbraco.Web/Cache/DomainCacheRefresher.cs index 49d7870585..3de428658f 100644 --- a/src/Umbraco.Web/Cache/DomainCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/DomainCacheRefresher.cs @@ -2,7 +2,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; namespace Umbraco.Web.Cache { diff --git a/src/Umbraco.Web/PublishedCache/LegacyXmlCache/PublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs similarity index 97% rename from src/Umbraco.Web/PublishedCache/LegacyXmlCache/PublishedContentCache.cs rename to src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs index 5cf74137c6..ea20f6bb04 100644 --- a/src/Umbraco.Web/PublishedCache/LegacyXmlCache/PublishedContentCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs @@ -12,7 +12,7 @@ using System.Linq; using umbraco.BusinessLogic; using umbraco.presentation.preview; -namespace Umbraco.Web.PublishedCache.LegacyXmlCache +namespace Umbraco.Web.PublishedCache.XmlPublishedCache { internal class PublishedContentCache : IPublishedContentCache { diff --git a/src/Umbraco.Web/PublishedCache/LegacyXmlCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs similarity index 96% rename from src/Umbraco.Web/PublishedCache/LegacyXmlCache/PublishedMediaCache.cs rename to src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs index 759e0a2a4a..b160dcfa2f 100644 --- a/src/Umbraco.Web/PublishedCache/LegacyXmlCache/PublishedMediaCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs @@ -19,7 +19,7 @@ using umbraco; using umbraco.cms.businesslogic; using ContentType = umbraco.cms.businesslogic.ContentType; -namespace Umbraco.Web.PublishedCache.LegacyXmlCache +namespace Umbraco.Web.PublishedCache.XmlPublishedCache { /// /// An IPublishedMediaStore that first checks for the media in Examine, and then reverts to the database diff --git a/src/Umbraco.Web/PublishedCache/LegacyXmlCache/RoutesCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs similarity index 95% rename from src/Umbraco.Web/PublishedCache/LegacyXmlCache/RoutesCache.cs rename to src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs index 7c9bc7e949..8d1d88be2e 100644 --- a/src/Umbraco.Web/PublishedCache/LegacyXmlCache/RoutesCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using Umbraco.Core.ObjectResolution; -namespace Umbraco.Web.PublishedCache.LegacyXmlCache +namespace Umbraco.Web.PublishedCache.XmlPublishedCache { class RoutesCache { diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 2df353346f..363eb2f916 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -329,13 +329,13 @@ - + - + @@ -554,7 +554,7 @@ - + diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index bfe10a4277..3acba327db 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -20,7 +20,7 @@ using Umbraco.Web.Models; using Umbraco.Web.Mvc; using Umbraco.Web.PropertyEditors; using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.LegacyXmlCache; +using Umbraco.Web.PublishedCache.XmlPublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.WebApi; using umbraco.BusinessLogic;