Merge

src/Umbraco.Web/ApplicationEventsResolver.cs

@@ -1,49 +1,86 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
 
 namespace Umbraco.Web
 {
-	/// <summary>
-	/// A resolver to return all IApplicationEvents objects
-	/// </summary>
-	internal sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationStartupHandler>
-	{
+    /// <summary>
+    /// A resolver to return all IApplicationEvents objects
+    /// </summary>
+    internal sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>
+    {
 
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="applicationEventHandlers"></param>		
-		internal ApplicationEventsResolver(IEnumerable<Type> applicationEventHandlers)
-			: base(applicationEventHandlers)
-		{
+        private readonly LegacyStartupHandlerResolver _legacyResolver;
 
-		}
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="applicationEventHandlers"></param>		
+        internal ApplicationEventsResolver(IEnumerable<Type> applicationEventHandlers)
+            : base(applicationEventHandlers)
+        {
+            //create the legacy resolver and only include the legacy types
+            _legacyResolver = new LegacyStartupHandlerResolver(
+                applicationEventHandlers.Where(x => !TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>(x)));
+        }
 
-		/// <summary>
-		/// Gets the <see cref="IApplicationEventHandler"/> implementations.
-		/// </summary>
-		public IEnumerable<IApplicationEventHandler> ApplicationEventHandlers
-		{
-			get { return Values.OfType<IApplicationEventHandler>(); }
-		}
+        /// <summary>
+        /// Override in order to only return types of IApplicationEventHandler and above, 
+        /// do not include the legacy types of IApplicationStartupHandler
+        /// </summary>
+        protected override IEnumerable<Type> InstanceTypes
+        {
+            get { return base.InstanceTypes.Where(TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>); }
+        }
 
-		protected override bool SupportsClear
-		{
-			get { return false; }
-		}		
+        /// <summary>
+        /// Gets the <see cref="IApplicationEventHandler"/> implementations.
+        /// </summary>
+        public IEnumerable<IApplicationEventHandler> ApplicationEventHandlers
+        {
+            get { return Values; }
+        }
 
-		protected override bool SupportsInsert
-		{
-			get { return false; }			
-		}
+        /// <summary>
+        /// Create instances of all of the legacy startup handlers
+        /// </summary>
+        public void InstantiateLegacyStartupHanlders()
+        {
+            //this will instantiate them all
+            var handlers = _legacyResolver.LegacyStartupHandlers;
+        }
 
-		protected override bool SupportsRemove
-		{
-			get { return false; }
-		}
+        protected override bool SupportsClear
+        {
+            get { return false; }
+        }
 
-	}
+        protected override bool SupportsInsert
+        {
+            get { return false; }
+        }
+
+        protected override bool SupportsRemove
+        {
+            get { return false; }
+        }
+
+        private class LegacyStartupHandlerResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationStartupHandler>
+        {
+            internal LegacyStartupHandlerResolver(IEnumerable<Type> legacyStartupHandlers)
+                : base(legacyStartupHandlers)
+            {
+
+            }
+
+            public IEnumerable<IApplicationStartupHandler> LegacyStartupHandlers
+            {
+                get { return Values; }
+            }
+        }
+
+    }
 }

src/Umbraco.Web/WebBootManager.cs

@@ -130,6 +130,9 @@ namespace Umbraco.Web
             ApplicationEventsResolver.Current.ApplicationEventHandlers
                 .ForEach(x => x.OnApplicationStarted(_umbracoApplication, ApplicationContext));
 
+            //Now, startup all of our legacy startup handler
+            ApplicationEventsResolver.Current.InstantiateLegacyStartupHanlders();
+
             // we're ready to serve content!
             ApplicationContext.IsReady = true;