Fixes: #U4-1357 - more properties to expose context objects on SurfaceController and RenderMvcController base classes.

src/Umbraco.Web/Mvc/PluginController.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Web.Mvc;
 using Umbraco.Core;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Mvc
 {
@@ -51,6 +52,22 @@ namespace Umbraco.Web.Mvc
 			get { return UmbracoContext.Application; }
 		}
 
+		/// <summary>
+		/// Returns a ServiceContext
+		/// </summary>
+		public ServiceContext Services
+		{
+			get { return ApplicationContext.Services; }
+		}
+
+		/// <summary>
+		/// Returns a DatabaseContext
+		/// </summary>
+		public DatabaseContext DatabaseContext
+		{
+			get { return ApplicationContext.DatabaseContext; }
+		}
+
 		/// <summary>
 		/// Returns the metadata for this instance
 		/// </summary>

src/Umbraco.Web/Mvc/RenderMvcController.cs

@@ -1,7 +1,9 @@
 using System;
 using System.IO;
 using System.Web.Mvc;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 
@@ -17,6 +19,15 @@ namespace Umbraco.Web.Mvc
 		
 		private PublishedContentRequest _publishedContentRequest;
 
+		private UmbracoHelper _umbraco;
+		/// <summary>
+		/// Returns an UmbracoHelper object
+		/// </summary>
+		public UmbracoHelper Umbraco
+		{
+			get { return _umbraco ?? (_umbraco = new UmbracoHelper(UmbracoContext)); }
+		}
+
 		/// <summary>
 		/// Returns the current UmbracoContext
 		/// </summary>
@@ -25,6 +36,30 @@ namespace Umbraco.Web.Mvc
 			get { return PublishedContentRequest.RoutingContext.UmbracoContext; }
 		}
 
+		/// <summary>
+		/// Returns the current ApplicationContext
+		/// </summary>
+		public ApplicationContext ApplicationContext
+		{
+			get { return UmbracoContext.Application; }
+		}
+
+		/// <summary>
+		/// Returns a ServiceContext
+		/// </summary>
+		public ServiceContext Services
+		{
+			get { return ApplicationContext.Services; }
+		}
+
+		/// <summary>
+		/// Returns a DatabaseContext
+		/// </summary>
+		public DatabaseContext DatabaseContext
+		{
+			get { return ApplicationContext.DatabaseContext; }
+		}
+
 		//TODO: make this protected once we make PublishedContentRequest not internal after we figure out what it should actually contain
 		/// <summary>
 		/// Returns the current PublishedContentRequest