diff --git a/src/Umbraco.Web/IApplicationEventHandler.cs b/src/Umbraco.Web/IApplicationEventHandler.cs index 9ed0e3dbb9..63c34d1589 100644 --- a/src/Umbraco.Web/IApplicationEventHandler.cs +++ b/src/Umbraco.Web/IApplicationEventHandler.cs @@ -8,8 +8,26 @@ namespace Umbraco.Web /// public interface IApplicationEventHandler : IApplicationStartupHandler { + /// + /// ApplicationContext is created and other static objects that require initialization have been setup + /// + /// + /// void OnApplicationInitialized(UmbracoApplication httpApplication, ApplicationContext applicationContext); + + /// + /// All resolvers have been initialized but resolution is not frozen so they can be modified in this method + /// + /// + /// void OnApplicationStarting(UmbracoApplication httpApplication, ApplicationContext applicationContext); + + /// + /// Bootup is completed, this allows you to perform any other bootup logic required for the application. + /// Resolution is frozen so now they can be used to resolve instances. + /// + /// + /// void OnApplicationStarted(UmbracoApplication httpApplication, ApplicationContext applicationContext); } } \ No newline at end of file diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs index afa618e592..c114b286dc 100644 --- a/src/Umbraco.Web/Mvc/SurfaceController.cs +++ b/src/Umbraco.Web/Mvc/SurfaceController.cs @@ -6,52 +6,6 @@ using Umbraco.Core; namespace Umbraco.Web.Mvc { - //[PluginController("MyTestSurfaceController")] - //public class TestSurfaceController : SurfaceController - //{ - // public ActionResult Index() - // { - // return View(); - // //return Content("hello"); - // } - - // public ActionResult PostVals(TestFormModel model) - // { - // ModelState.AddModelError("name", "bad name!"); - // return CurrentUmbracoPage(); - // } - - // [ChildActionOnly] - // public ActionResult DoThis(string asdf) - // { - // return PartialView("DoThis", asdf + " DONE!"); - // } - //} - - //public class TestFormModel - //{ - // public string Name { get; set; } - //} - - //public class LocalSurfaceController : SurfaceController - //{ - // public ActionResult Index() - // { - // return View(); - // } - - // public ActionResult PostVals([Bind(Prefix = "blah")]TestFormModel model) - // { - // ModelState.AddModelError("Name", "you suck!"); - // return this.RedirectToCurrentUmbracoPage(); - // } - - // [ChildActionOnly] - // public ActionResult DoThis(string asdf) - // { - // return PartialView("DoThis", asdf + " DONE Again!"); - // } - //} /// /// The base controller that all Presentation Add-in controllers should inherit from diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 4f14a34bc6..58992253ff 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -46,7 +46,7 @@ namespace Umbraco.Web _umbracoApplication = umbracoApplication; if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication"); } - + /// /// Initialize objects before anything during the boot cycle happens ///