diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 0b63d0ab80..ce507ec2df 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -278,12 +278,6 @@ namespace Umbraco.Web LogHelper.Warn("Could not initialize the DefaultServerMessenger, the application is not configured or the database is not configured"); return null; })); - - //We are going to manually remove a few cache refreshers here because we've obsoleted them and we don't want them - // to be registered more than once - CacheRefreshersResolver.Current.RemoveType(); - CacheRefreshersResolver.Current.RemoveType(); - CacheRefreshersResolver.Current.RemoveType(); SurfaceControllerResolver.Current = new SurfaceControllerResolver( PluginManager.Current.ResolveSurfaceControllers()); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs index a497c86884..63e9739fb9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs @@ -7,226 +7,4 @@ using umbraco.interfaces; namespace umbraco.presentation.cache { - - [Obsolete("This class is no longer in use, use Umbraco.Web.Cache.PageCacheRefresher instead")] - public class pageRefresher : PageCacheRefresher - { - } - - [Obsolete("This class is no longer used, use Umbraco.Web.Cache.MediaLibraryRefreshers instead")] - public class MediaLibraryRefreshers : Umbraco.Web.Cache.MediaCacheRefresher - { - - } - - [Obsolete("This class is no longer used, use Umbraco.Web.Cache.MemberLibraryRefreshers instead")] - public class MemberLibraryRefreshers : Umbraco.Web.Cache.MemberCacheRefresher - { - - } - - [Obsolete("Use Umbraco.Core.CacheRefreshersResolver instead")] - public class Factory - { - - #region Methods - - public ICacheRefresher CacheRefresher(Guid CacheRefresherId) - { - return GetNewObject(CacheRefresherId); - } - - /// - /// Gets the IcacheRefresher object with the specified Guid. - /// - /// The cache refresher guid. - /// - public ICacheRefresher GetNewObject(Guid CacheRefresherId) - { - return CacheRefreshersResolver.Current.GetById(CacheRefresherId); - } - - /// - /// Gets all ICacheRefreshers - /// - /// - public ICacheRefresher[] GetAll() - { - return CacheRefreshersResolver.Current.CacheResolvers.ToArray(); - } - - #endregion - } - - [Obsolete("This class is no longer used, use DistrubutedCache.Instance instead")] - public class dispatcher - { - public static void Refresh(Guid factoryGuid, int id) - { - DistributedCache.Instance.Refresh(factoryGuid, id); - } - - public static void Refresh(Guid factoryGuid, Guid id) - { - DistributedCache.Instance.Refresh(factoryGuid, id); - } - - public static void RefreshAll(Guid factoryGuid) - { - DistributedCache.Instance.RefreshAll(factoryGuid); - } - - public static void Remove(Guid factoryGuid, int id) - { - DistributedCache.Instance.Remove(factoryGuid, id); - } - } - - [Obsolete("This class is no longer used, it has been superceded by Umbraco.Core.Sync.ServerSyncWebServiceClient, however that is marked internal and these should not be used directly in your code.")] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Web.Services.WebServiceBindingAttribute(Name = "CacheRefresherSoap", Namespace = "http://umbraco.org/webservices/")] - public class CacheRefresher : System.Web.Services.Protocols.SoapHttpClientProtocol - { - - /// - public CacheRefresher() - { - // only set the url if the httpcontext is present, else it's set by the cache dispatcher methods (when using distributed calls) - if (System.Web.HttpContext.Current != null) - this.Url = "http://" + System.Web.HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + IOHelper.ResolveUrl(SystemDirectories.WebServices) + "/cacheRefresher.asmx"; - - } - - /// - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshAll", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public void RefreshAll(System.Guid uniqueIdentifier, string Login, string Password) - { - this.Invoke("RefreshAll", new object[] { - uniqueIdentifier, - Login, - Password}); - } - - /// - public System.IAsyncResult BeginRefreshAll(System.Guid uniqueIdentifier, string Login, string Password, System.AsyncCallback callback, object asyncState) - { - return this.BeginInvoke("RefreshAll", new object[] { - uniqueIdentifier, - Login, - Password}, callback, asyncState); - } - - /// - public void EndRefreshAll(System.IAsyncResult asyncResult) - { - this.EndInvoke(asyncResult); - } - - /// - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshByGuid", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public void RefreshByGuid(System.Guid uniqueIdentifier, System.Guid Id, string Login, string Password) - { - this.Invoke("RefreshByGuid", new object[] { - uniqueIdentifier, - Id, - Login, - Password}); - } - - /// - public System.IAsyncResult BeginRefreshByGuid(System.Guid uniqueIdentifier, System.Guid Id, string Login, string Password, System.AsyncCallback callback, object asyncState) - { - return this.BeginInvoke("RefreshByGuid", new object[] { - uniqueIdentifier, - Id, - Login, - Password}, callback, asyncState); - } - - /// - public void EndRefreshByGuid(System.IAsyncResult asyncResult) - { - this.EndInvoke(asyncResult); - } - - /// - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshById", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public void RefreshById(System.Guid uniqueIdentifier, int Id, string Login, string Password) - { - this.Invoke("RefreshById", new object[] { - uniqueIdentifier, - Id, - Login, - Password}); - } - - /// - public System.IAsyncResult BeginRefreshById(System.Guid uniqueIdentifier, int Id, string Login, string Password, System.AsyncCallback callback, object asyncState) - { - return this.BeginInvoke("RefreshById", new object[] { - uniqueIdentifier, - Id, - Login, - Password}, callback, asyncState); - } - - /// - public void EndRefreshById(System.IAsyncResult asyncResult) - { - this.EndInvoke(asyncResult); - } - - /// - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RemoveById", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public void RemoveById(System.Guid uniqueIdentifier, int Id, string Login, string Password) - { - this.Invoke("RemoveById", new object[] { - uniqueIdentifier, - Id, - Login, - Password}); - } - - /// - public System.IAsyncResult BeginRemoveById(System.Guid uniqueIdentifier, int Id, string Login, string Password, System.AsyncCallback callback, object asyncState) - { - return this.BeginInvoke("RemoveById", new object[] { - uniqueIdentifier, - Id, - Login, - Password}, callback, asyncState); - } - - /// - public void EndRemoveById(System.IAsyncResult asyncResult) - { - this.EndInvoke(asyncResult); - } - - /// - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/GetRefreshers", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public System.Xml.XmlNode GetRefreshers(string Login, string Password) - { - object[] results = this.Invoke("GetRefreshers", new object[] { - Login, - Password}); - return ((System.Xml.XmlNode)(results[0])); - } - - /// - public System.IAsyncResult BeginGetRefreshers(string Login, string Password, System.AsyncCallback callback, object asyncState) - { - return this.BeginInvoke("GetRefreshers", new object[] { - Login, - Password}, callback, asyncState); - } - - /// - public System.Xml.XmlNode EndGetRefreshers(System.IAsyncResult asyncResult) - { - object[] results = this.EndInvoke(asyncResult); - return ((System.Xml.XmlNode)(results[0])); - } - } } \ No newline at end of file