From 17906b505d10ee48fc52211adffd606f41757a4e Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sun, 18 Jan 2015 21:13:24 +0100
Subject: [PATCH 01/18] Removed code in tree synchronisation that removes
 anchor tag containing node name for certain nodes

---
 .../src/common/directives/umbtreeitem.directive.js            | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index b08476ee77..9a34b26aec 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -88,10 +88,6 @@ angular.module("umbraco.directives")
 
                 element.find("a:first").html(node.name);
 
-                if (!node.menuUrl) {
-                    element.find("a:last").remove();
-                }
-
                 if (node.style) {
                     element.find("i:first").attr("style", node.style);
                 }

From 4775b638a43b67468c8492eb4bf829986b0dbf52 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Mon, 19 Jan 2015 08:05:32 +0100
Subject: [PATCH 02/18] Reverted previous commit and changed anchor removal to
 target the correct tag (the elipsis)

---
 .../src/common/directives/umbtreeitem.directive.js            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index 9a34b26aec..a202a2c7a7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -88,6 +88,10 @@ angular.module("umbraco.directives")
 
                 element.find("a:first").html(node.name);
 
+                if (!node.menuUrl) {
+                    element.find("a.umb-options").remove();
+                }
+
                 if (node.style) {
                     element.find("i:first").attr("style", node.style);
                 }

From 12d51b292c6f92edbdad4a58a436e5b27d66c318 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 19 Jan 2015 13:40:21 +0100
Subject: [PATCH 03/18] U4-6154 - fix unpublishing a document with changes

Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
---
 .../Repositories/ContentRepository.cs         | 11 +++
 .../Interfaces/IContentRepository.cs          |  6 ++
 .../Publishing/PublishingStrategy.cs          | 93 +++++++------------
 src/Umbraco.Core/Services/ContentService.cs   |  8 ++
 4 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index d89fc79dbe..c23095ebd6 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -631,6 +631,17 @@ namespace Umbraco.Core.Persistence.Repositories
             repo.ReplaceEntityPermissions(permissionSet);
         }
 
+        public void ClearPublished(IContent content)
+        {
+            // race cond!
+            var documentDtos = Database.Fetch<DocumentDto>("WHERE nodeId=@id AND published=@published", new { id = content.Id, published = true });
+            foreach (var documentDto in documentDtos)
+            {
+                documentDto.Published = false;
+                Database.Update(documentDto);
+            }
+        }
+
         public IContent GetByLanguage(int id, string language)
         {
             var sql = GetBaseQuery(false);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
index ac0fcebbe7..5cb470b7cd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
@@ -27,6 +27,12 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="permissionSet"></param>
         void ReplaceContentPermissions(EntityPermissionSet permissionSet);
 
+        /// <summary>
+        /// Clears the published flag for a content.
+        /// </summary>
+        /// <param name="content"></param>
+        void ClearPublished(IContent content);
+
         /// <summary>
         /// Gets a specific language version of an <see cref="IContent"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Publishing/PublishingStrategy.cs b/src/Umbraco.Core/Publishing/PublishingStrategy.cs
index 899567bf8d..1c33f87c5e 100644
--- a/src/Umbraco.Core/Publishing/PublishingStrategy.cs
+++ b/src/Umbraco.Core/Publishing/PublishingStrategy.cs
@@ -303,32 +303,7 @@ namespace Umbraco.Core.Publishing
         /// <returns>True if the unpublish operation was successfull and not cancelled, otherwise false</returns>
         public override bool UnPublish(IContent content, int userId)
         {
-            if (UnPublishing.IsRaisedEventCancelled(new PublishEventArgs<IContent>(content), this))
-            {
-                LogHelper.Info<PublishingStrategy>(
-                        string.Format("Content '{0}' with Id '{1}' will not be un-published, the event was cancelled.", content.Name, content.Id));
-                return false;
-            }
-                
-
-            //If Content has a release date set to before now, it should be removed so it doesn't interrupt an unpublish
-            //Otherwise it would remain released == published
-            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value <= DateTime.Now)
-            {
-                content.ReleaseDate = null;
-
-                LogHelper.Info<PublishingStrategy>(
-                    string.Format(
-                        "Content '{0}' with Id '{1}' had its release date removed, because it was unpublished.",
-                        content.Name, content.Id));
-            }
-
-            content.ChangePublishedState(PublishedState.Unpublished);
-
-            LogHelper.Info<PublishingStrategy>(
-                string.Format("Content '{0}' with Id '{1}' has been unpublished.",
-                              content.Name, content.Id));
-            return true;
+            return UnPublishInternal(content, userId).Success;
         }
 
         /// <summary>
@@ -337,43 +312,47 @@ namespace Umbraco.Core.Publishing
         /// <param name="content">An enumerable list of <see cref="IContent"/></param>
         /// <param name="userId">Id of the User issueing the unpublish operation</param>
         /// <returns>A list of publish statuses</returns>
-        internal IEnumerable<Attempt<PublishStatus>> UnPublishInternal(IEnumerable<IContent> content, int userId)
+        private IEnumerable<Attempt<PublishStatus>> UnPublishInternal(IEnumerable<IContent> content, int userId)
         {
-            var result = new List<Attempt<PublishStatus>>();
+            return content.Select(x => UnPublishInternal(x, userId));
+        }
 
-            //Only update content thats already been published
-            foreach (var item in content.Where(x => x.Published == true))
+        private Attempt<PublishStatus> UnPublishInternal(IContent content, int userId)
+        {
+            // content should (is assumed to ) be the newest version, which may not be published
+            // don't know how to test this, so it's not verified
+            // NOTE
+            // if published != newest, then the published flags need to be reseted by whoever is calling that method
+            // at the moment it's done by the content service
+
+            //Fire UnPublishing event
+            if (UnPublishing.IsRaisedEventCancelled(new PublishEventArgs<IContent>(content), this))
             {
-                //Fire UnPublishing event
-                if (UnPublishing.IsRaisedEventCancelled(new PublishEventArgs<IContent>(item), this))
-                {
-                    LogHelper.Info<PublishingStrategy>(
-                        string.Format("Content '{0}' with Id '{1}' will not be published, the event was cancelled.", item.Name, item.Id));
-                    result.Add(Attempt.Fail(new PublishStatus(item, PublishStatusType.FailedCancelledByEvent)));
-                    continue;
-                }
-
-                //If Content has a release date set to before now, it should be removed so it doesn't interrupt an unpublish
-                //Otherwise it would remain released == published
-                if (item.ReleaseDate.HasValue && item.ReleaseDate.Value <= DateTime.Now)
-                {
-                    item.ReleaseDate = null;
-
-                    LogHelper.Info<PublishingStrategy>(
-                        string.Format("Content '{0}' with Id '{1}' had its release date removed, because it was unpublished.",
-                                      item.Name, item.Id));
-                }
-
-                item.ChangePublishedState(PublishedState.Unpublished);
-
                 LogHelper.Info<PublishingStrategy>(
-                    string.Format("Content '{0}' with Id '{1}' has been unpublished.",
-                                  item.Name, item.Id));
-
-                result.Add(Attempt.Succeed(new PublishStatus(item)));
+                    string.Format("Content '{0}' with Id '{1}' will not be unpublished, the event was cancelled.", content.Name, content.Id));
+                return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent));
             }
 
-            return result;
+            //If Content has a release date set to before now, it should be removed so it doesn't interrupt an unpublish
+            //Otherwise it would remain released == published
+            if (content.ReleaseDate.HasValue && content.ReleaseDate.Value <= DateTime.Now)
+            {
+                content.ReleaseDate = null;
+
+                LogHelper.Info<PublishingStrategy>(
+                    string.Format("Content '{0}' with Id '{1}' had its release date removed, because it was unpublished.",
+                                  content.Name, content.Id));
+            }
+
+            // if newest is published, unpublish
+            if (content.Published)
+                content.ChangePublishedState(PublishedState.Unpublished);
+
+            LogHelper.Info<PublishingStrategy>(
+                string.Format("Content '{0}' with Id '{1}' has been unpublished.",
+                              content.Name, content.Id));
+
+            return Attempt.Succeed(new PublishStatus(content));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 93069b7bd9..95ef869d3b 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1686,6 +1686,11 @@ namespace Umbraco.Core.Services
         /// <returns>True if unpublishing succeeded, otherwise False</returns>
         private bool UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
         {
+            content = GetById(content.Id); // ensure we have the newest version
+            var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
+            if (published == null)
+                return false; // already unpublished
+
             var unpublished = _publishingStrategy.UnPublish(content, userId);
             if (unpublished)
             {
@@ -1694,6 +1699,9 @@ namespace Umbraco.Core.Services
                 {
                     content.WriterId = userId;
                     repository.AddOrUpdate(content);
+                    // is published is not newest, reset the published flag on published version
+                    if (published.Version != content.Version)
+                        repository.ClearPublished(published);
                     repository.DeleteContentXml(content);
 
                     uow.Commit();

From 7b4a82eb8d6cbcdc2899f9c40103b77e34e8422c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 20 Jan 2015 19:57:13 +0100
Subject: [PATCH 04/18] U4-6154 - bugfix

---
 src/Umbraco.Core/Services/ContentService.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 95ef869d3b..966ae9f0e7 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1686,7 +1686,9 @@ namespace Umbraco.Core.Services
         /// <returns>True if unpublishing succeeded, otherwise False</returns>
         private bool UnPublishDo(IContent content, bool omitCacheRefresh = false, int userId = 0)
         {
-            content = GetById(content.Id); // ensure we have the newest version
+            var newest = GetById(content.Id); // ensure we have the newest version
+            if (content.Version != newest.Version) // but use the original object if it's already the newest version
+                content = newest;
             var published = content.Published ? content : GetPublishedVersion(content.Id); // get the published version
             if (published == null)
                 return false; // already unpublished

From 44257e361afb17fa653fc1b7923f18f0b77a4af3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 10:41:01 +1100
Subject: [PATCH 05/18] Fixes refs to Microsoft.Net.Http

---
 src/Umbraco.Core/Umbraco.Core.csproj                 |  6 ++++++
 src/Umbraco.Core/packages.config                     |  2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj               | 11 +++++++++++
 src/Umbraco.Tests/packages.config                    |  4 +++-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj             | 11 +++++++++++
 src/Umbraco.Web.UI/packages.config                   |  4 +++-
 src/Umbraco.Web/Umbraco.Web.csproj                   | 11 +++++++++++
 src/Umbraco.Web/packages.config                      |  4 +++-
 src/umbraco.MacroEngines/packages.config             |  4 +++-
 src/umbraco.MacroEngines/umbraco.MacroEngines.csproj | 11 +++++++++++
 10 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 851e573670..0562ca4e8b 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -84,10 +84,16 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Serialization" />
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index f01b9e68ba..f3f9b617f7 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net40" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index de66f44f79..c3690bad2c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -111,9 +111,15 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Serialization" />
@@ -723,6 +729,11 @@
 xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" /Y /F /E /D</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config
index d548c63204..ee4e18fda2 100644
--- a/src/Umbraco.Tests/packages.config
+++ b/src/Umbraco.Tests/packages.config
@@ -14,7 +14,9 @@
   <package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
   <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index c9c2732bba..0c7e0797c8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -207,10 +207,16 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
@@ -2588,4 +2594,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
     </ReadLinesFromFile>
     <Exec WorkingDirectory="$(ProjectDir)\..\..\build\" Command="BuildBelle.bat $(VersionNumber)" ConsoleToMSBuild="true" IgnoreExitCode="true" ContinueOnError="WarnAndContinue" />
   </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 680878e107..885c26f6a7 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -17,8 +17,10 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.Web.Helpers" version="1.0.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ac7ee60e4c..a3e5122a06 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -167,9 +167,15 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
@@ -2170,4 +2176,9 @@
     <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index 9adab52a05..05e2b17ca2 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -14,7 +14,9 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
diff --git a/src/umbraco.MacroEngines/packages.config b/src/umbraco.MacroEngines/packages.config
index ca995d7c13..8d9f3cdb4c 100644
--- a/src/umbraco.MacroEngines/packages.config
+++ b/src/umbraco.MacroEngines/packages.config
@@ -10,7 +10,9 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
index f6b611a6c8..2b874a155e 100644
--- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
+++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
@@ -74,9 +74,15 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -233,6 +239,11 @@
     </PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From bbcca7f3e53020bf213f16f1ef48169a5ece6819 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 13:26:09 +1100
Subject: [PATCH 06/18] fixes test

---
 src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs
index 97ed516846..6e4f3e8c12 100644
--- a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs
+++ b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs
@@ -341,7 +341,7 @@ namespace Umbraco.Tests.Services
         }
 
         [Test]
-        public void Using_Dictionary_Throws_When_No_Culture_Found()
+        public void Using_Dictionary_Returns_Default_Text__When_No_Culture_Found()
         {
             var culture = CultureInfo.GetCultureInfo("en-US");
             var txtService = new LocalizedTextService(
@@ -360,7 +360,7 @@ namespace Umbraco.Tests.Services
                     }
                 });
 
-            Assert.Throws<NullReferenceException>(() => txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
+            Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
         }
 
         [Test]

From 7545c0c1da6aff5c85078f2c6c34ec44310d3050 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 17:03:56 +1100
Subject: [PATCH 07/18] Adds the DomainRepository with tests

---
 src/Umbraco.Core/Models/Content.cs            |   5 +-
 src/Umbraco.Core/Models/DeepCloneHelper.cs    |  19 -
 .../Models/DoNotCloneAttribute.cs             |  23 ++
 src/Umbraco.Core/Models/IDomain.cs            |  12 +
 src/Umbraco.Core/Models/UmbracoDomain.cs      |  69 ++++
 .../Persistence/Factories/LanguageFactory.cs  |   8 +-
 .../Repositories/ContentRepository.cs         |  54 +--
 .../DataTypeDefinitionRepository.cs           |  29 +-
 .../Repositories/DictionaryRepository.cs      |  23 +-
 .../Repositories/DomainRepository.cs          | 328 ++++++++++++++++++
 .../Interfaces/IDomainRepository.cs           |  11 +
 .../Repositories/LanguageRepository.cs        |   5 +-
 .../Repositories/MediaRepository.cs           |  18 +-
 .../Repositories/MemberRepository.cs          |  15 +
 .../Repositories/RelationRepository.cs        |  11 +
 .../Repositories/RepositoryBase.cs            |  32 +-
 .../Repositories/UserRepository.cs            |  13 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   5 +
 .../Upgrades/ValidateV7TagsUpgradeTest.cs     |   8 +-
 .../Querying/ContentTypeSqlMappingTests.cs    |   6 +-
 .../Repositories/AuditRepositoryTest.cs       |  14 +-
 .../Repositories/ContentRepositoryTest.cs     |   8 +-
 .../Repositories/ContentTypeRepositoryTest.cs |  14 +-
 .../DataTypeDefinitionRepositoryTest.cs       |  18 +-
 .../Repositories/DictionaryRepositoryTest.cs  |   4 +-
 .../Repositories/DomainRepositoryTest.cs      | 241 +++++++++++++
 .../Repositories/LanguageRepositoryTest.cs    |   2 +-
 .../Repositories/MacroRepositoryTest.cs       |  36 +-
 .../Repositories/MediaRepositoryTest.cs       |   6 +-
 .../Repositories/MediaTypeRepositoryTest.cs   |   2 +-
 .../Repositories/MemberRepositoryTest.cs      |   8 +-
 .../Repositories/MemberTypeRepositoryTest.cs  |   2 +-
 .../Repositories/RelationRepositoryTest.cs    |   8 +-
 .../RelationTypeRepositoryTest.cs             |   4 +-
 .../ServerRegistrationRepositoryTest.cs       |   4 +-
 .../Repositories/TagRepositoryTest.cs         |  16 +-
 .../Repositories/TaskRepositoryTest.cs        |  16 +-
 .../Repositories/TemplateRepositoryTest.cs    |   8 +-
 .../Repositories/UserRepositoryTest.cs        |  14 +-
 .../Repositories/UserTypeRepositoryTest.cs    |   4 +-
 .../Services/ContentServicePerformanceTest.cs |  32 +-
 .../Services/ContentServiceTests.cs           |   8 +-
 .../Services/MacroServiceTests.cs             |   2 +-
 .../Services/ThreadSafetyServiceTest.cs       |   2 +-
 .../TestHelpers/BaseDatabaseFactoryTest.cs    |   8 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 src/umbraco.cms/businesslogic/web/Domain.cs   |   1 +
 47 files changed, 977 insertions(+), 200 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/DoNotCloneAttribute.cs
 create mode 100644 src/Umbraco.Core/Models/IDomain.cs
 create mode 100644 src/Umbraco.Core/Models/UmbracoDomain.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
 create mode 100644 src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs

diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 13d6bd71c9..9133377f5f 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -160,10 +160,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Language of the data contained within this Content object.
         /// </summary>
-        /// <remarks>
-        /// Left internal until multilingual support is implemented.
-        /// </remarks>
-        [DataMember]
+        [Obsolete("This is not used and will be removed from the codebase in future versions")]
         public string Language
         {
             get { return _language; }
diff --git a/src/Umbraco.Core/Models/DeepCloneHelper.cs b/src/Umbraco.Core/Models/DeepCloneHelper.cs
index eb3be9d145..0e0e260c06 100644
--- a/src/Umbraco.Core/Models/DeepCloneHelper.cs
+++ b/src/Umbraco.Core/Models/DeepCloneHelper.cs
@@ -7,25 +7,6 @@ using System.Reflection;
 
 namespace Umbraco.Core.Models
 {
-    /// <summary>
-    /// Used to attribute properties that have a setter and are a reference type
-    /// that should be ignored for cloning when using the DeepCloneHelper
-    /// </summary>
-    /// <remarks>
-    /// 
-    /// This attribute must be used:
-    /// * when the property is backed by a field but the result of the property is the un-natural data stored in the field
-    ///  
-    /// This attribute should not be used:
-    /// * when the property is virtual
-    /// * when the setter performs additional required logic other than just setting the underlying field
-    /// 
-    /// </remarks>
-    internal class DoNotCloneAttribute : Attribute
-    {
-        
-    }
-
     public static class DeepCloneHelper
     {
         /// <summary>
diff --git a/src/Umbraco.Core/Models/DoNotCloneAttribute.cs b/src/Umbraco.Core/Models/DoNotCloneAttribute.cs
new file mode 100644
index 0000000000..a27df59b03
--- /dev/null
+++ b/src/Umbraco.Core/Models/DoNotCloneAttribute.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Used to attribute properties that have a setter and are a reference type
+    /// that should be ignored for cloning when using the DeepCloneHelper
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// This attribute must be used:
+    /// * when the property is backed by a field but the result of the property is the un-natural data stored in the field
+    ///  
+    /// This attribute should not be used:
+    /// * when the property is virtual
+    /// * when the setter performs additional required logic other than just setting the underlying field
+    /// 
+    /// </remarks>
+    internal class DoNotCloneAttribute : Attribute
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/IDomain.cs b/src/Umbraco.Core/Models/IDomain.cs
new file mode 100644
index 0000000000..29978d9cf6
--- /dev/null
+++ b/src/Umbraco.Core/Models/IDomain.cs
@@ -0,0 +1,12 @@
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IDomain : IAggregateRoot, IRememberBeingDirty, ICanBeDirty
+    {
+        ILanguage DefaultLanguage { get; set; }
+        string DomainName { get; set; }
+        IContent RootContent { get; set; }
+        bool IsWildcard { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
new file mode 100644
index 0000000000..90c94cb4c6
--- /dev/null
+++ b/src/Umbraco.Core/Models/UmbracoDomain.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Reflection;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    //TODO: Need to custom serialize this
+
+    [Serializable]
+    [DataContract(IsReference = true)]
+    public class UmbracoDomain : Entity, IDomain
+    {
+        private IContent _content;
+        private ILanguage _language;
+        private string _domainName;
+
+        private static readonly PropertyInfo DefaultLanguageSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, ILanguage>(x => x.DefaultLanguage);
+        private static readonly PropertyInfo DomainNameSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, string>(x => x.DomainName);
+        private static readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, IContent>(x => x.RootContent);
+
+        [DataMember]
+        public ILanguage DefaultLanguage
+        {
+            get { return _language; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _language = value;
+                    return _language;
+                }, _language, DefaultLanguageSelector);
+            }
+        }
+
+        [DataMember]
+        public string DomainName
+        {
+            get { return _domainName; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _domainName = value;
+                    return _domainName;
+                }, _domainName, DomainNameSelector);
+            }
+        }
+
+        [DataMember]
+        public IContent RootContent
+        {
+            get { return _content; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _content = value;
+                    return _content;
+                }, _content, ContentSelector);
+            }
+        }
+
+        public bool IsWildcard
+        {
+            get { return string.IsNullOrWhiteSpace(DomainName) || DomainName.StartsWith("*"); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Factories/LanguageFactory.cs b/src/Umbraco.Core/Persistence/Factories/LanguageFactory.cs
index 0287a58b78..54c8aa30a8 100644
--- a/src/Umbraco.Core/Persistence/Factories/LanguageFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/LanguageFactory.cs
@@ -6,11 +6,9 @@ namespace Umbraco.Core.Persistence.Factories
 {
     internal class LanguageFactory 
     {
-        #region Implementation of IEntityFactory<Language,LanguageDto>
-
         public ILanguage BuildEntity(LanguageDto dto)
         {
-            var lang = new Language(dto.IsoCode){CultureName = dto.CultureName, Id = dto.Id};
+            var lang = new Language(dto.IsoCode) { CultureName = dto.CultureName, Id = dto.Id };
             //on initial construction we don't want to have dirty properties tracked
             // http://issues.umbraco.org/issue/U4-1946
             lang.ResetDirtyProperties(false);
@@ -19,13 +17,11 @@ namespace Umbraco.Core.Persistence.Factories
 
         public LanguageDto BuildDto(ILanguage entity)
         {
-            var dto = new LanguageDto{ CultureName = entity.CultureName, IsoCode = entity.IsoCode};
+            var dto = new LanguageDto { CultureName = entity.CultureName, IsoCode = entity.IsoCode };
             if (entity.HasIdentity)
                 dto.Id = short.Parse(entity.Id.ToString(CultureInfo.InvariantCulture));
 
             return dto;
         }
-
-        #endregion
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index 77228039f9..741634157d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 .Where(GetBaseWhereClause(), new { Id = id })
                 .Where<DocumentDto>(x => x.Newest)
                 .OrderByDescending<ContentVersionDto>(x => x.VersionDate);
-            
+
             var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto>(sql).FirstOrDefault();
 
             if (dto == null)
@@ -79,7 +79,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var sql = GetBaseQuery(false);
             if (ids.Any())
             {
-                sql.Where("umbracoNode.id in (@ids)", new {ids = ids});
+                sql.Where("umbracoNode.id in (@ids)", new { ids = ids });
             }
 
             //we only want the newest ones with this method
@@ -115,7 +115,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 .On<ContentVersionDto, ContentDto>(left => left.NodeId, right => right.NodeId)
                 .InnerJoin<NodeDto>()
                 .On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId );
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
             return sql;
         }
 
@@ -260,7 +260,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 .Where<DocumentDto>(x => x.Newest != true);
             var dto = Database.Fetch<DocumentDto, ContentVersionDto>(sql).FirstOrDefault();
 
-            if(dto == null) return;
+            if (dto == null) return;
 
             using (var transaction = Database.GetTransaction())
             {
@@ -311,7 +311,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             //Ensure unique name on the same level
             entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
-            
+
             //Ensure that strings don't contain characters that are invalid in XML
             entity.SanitizeEntityPropertiesForXmlStorage();
 
@@ -332,7 +332,7 @@ namespace Umbraco.Core.Persistence.Repositories
             nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
             nodeDto.SortOrder = sortOrder;
             var o = Database.IsNew(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
-        
+
             //Update with new correct path
             nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
             Database.Update(nodeDto);
@@ -353,14 +353,14 @@ namespace Umbraco.Core.Persistence.Repositories
             if (parentPermissions.Any())
             {
                 var userPermissions = (
-                    from perm in parentPermissions 
-                    from p in perm.AssignedPermissions 
+                    from perm in parentPermissions
+                    from p in perm.AssignedPermissions
                     select new EntityPermissionSet.UserPermission(perm.UserId, p)).ToList();
 
                 permissionsRepo.ReplaceEntityPermissions(new EntityPermissionSet(entity.Id, userPermissions));
                 //flag the entity's permissions changed flag so we can track those changes.
                 //Currently only used for the cache refreshers to detect if we should refresh all user permissions cache.
-                ((Content) entity).PermissionsChanged = true;
+                ((Content)entity).PermissionsChanged = true;
             }
 
             //Create the Content specific data - cmsContent
@@ -408,8 +408,8 @@ namespace Umbraco.Core.Persistence.Repositories
 
         protected override void PersistUpdatedItem(IContent entity)
         {
-            var publishedState = ((Content) entity).PublishedState;
-            
+            var publishedState = ((Content)entity).PublishedState;
+
             //check if we need to make any database changes at all
             if (entity.RequiresSaving(publishedState) == false)
             {
@@ -444,7 +444,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 var maxSortOrder =
                     Database.ExecuteScalar<int>(
                         "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                        new {ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId});
+                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
                 entity.SortOrder = maxSortOrder + 1;
 
                 //Question: If we move a node, should we update permissions to inherit from the new parent if the parent has permissions assigned?
@@ -476,7 +476,7 @@ namespace Umbraco.Core.Persistence.Repositories
             //If Published state has changed then previous versions should have their publish state reset.
             //If state has been changed to unpublished the previous versions publish state should also be reset.
             //if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
-            if (entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, shouldCreateNewVersion))            
+            if (entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, shouldCreateNewVersion))
             {
                 var publishedDocs = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND published = @IsPublished", new { Id = entity.Id, IsPublished = true });
                 foreach (var doc in publishedDocs)
@@ -543,7 +543,7 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 foreach (var property in entity.Properties)
                 {
-                    if(keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
 
                     property.Id = keyDictionary[property.PropertyTypeId];
                 }
@@ -632,7 +632,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             return GetByVersion(dto.ContentVersionDto.VersionId);
         }
-        
+
         /// <summary>
         /// Assigns a single permission to the current content item for the specified user ids
         /// </summary>
@@ -706,12 +706,12 @@ namespace Umbraco.Core.Persistence.Repositories
 
             var args = new List<object>();
             var sbWhere = new StringBuilder("AND (cmsDocument.newest = 1)");
-            
+
             if (filter.IsNullOrWhiteSpace() == false)
             {
                 sbWhere.Append(" AND (cmsDocument." + SqlSyntax.GetQuotedColumnName("text") + " LIKE @" + args.Count + ")");
                 args.Add("%" + filter + "%");
-            }          
+            }
 
             Func<Tuple<string, object[]>> filterCallback = () => new Tuple<string, object[]>(sbWhere.ToString(), args.ToArray());
 
@@ -721,7 +721,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 filterCallback);
 
         }
-        
+
         #endregion
 
         #region IRecycleBinRepository members
@@ -800,7 +800,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="template"></param>
         /// <param name="propCollection"></param>
         /// <returns></returns>
-        private IContent CreateContentFromDto(DocumentDto dto, 
+        private IContent CreateContentFromDto(DocumentDto dto,
             IContentType contentType,
             ITemplate template,
             Models.PropertyCollection propCollection)
@@ -873,7 +873,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 var results = dtos.OrderBy(x => x.Text, new SimilarNodeNameComparer());
                 foreach (var dto in results)
                 {
-                    if(id != 0 && id == dto.NodeId) continue;
+                    if (id != 0 && id == dto.NodeId) continue;
 
                     if (dto.Text.ToLowerInvariant().Equals(currentName.ToLowerInvariant()))
                     {
@@ -886,5 +886,19 @@ namespace Umbraco.Core.Persistence.Repositories
             return currentName;
         }
 
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _contentTypeRepository.Dispose();
+            _templateRepository.Dispose();
+            _tagRepository.Dispose();
+            _contentPreviewRepository.Dispose();
+            _contentXmlRepository.Dispose();
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
index d2f4b3bebe..15f7f0f878 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
         protected override IDataTypeDefinition PerformGet(int id)
         {
-            return GetAll(new[] {id}).FirstOrDefault();
+            return GetAll(new[] { id }).FirstOrDefault();
         }
 
         protected override IEnumerable<IDataTypeDefinition> PerformGetAll(params int[] ids)
@@ -150,7 +150,7 @@ namespace Umbraco.Core.Persistence.Repositories
             //Cannot add a duplicate data type
             var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
 INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
-WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + "= @name", new {name = entity.Name});
+WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + "= @name", new { name = entity.Name });
             if (exists > 0)
             {
                 throw new DuplicateNameException("A data type with the name " + entity.Name + " already exists");
@@ -196,7 +196,7 @@ WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + "= @name", new {na
             var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
 INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
 WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + @"= @name
-AND umbracoNode.id <> @id", 
+AND umbracoNode.id <> @id",
                     new { id = entity.Id, name = entity.Name });
             if (exists > 0)
             {
@@ -254,7 +254,7 @@ AND umbracoNode.id <> @id",
             }
 
             //Delete the pre-values
-            Database.Delete<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new {Id = entity.Id});
+            Database.Delete<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new { Id = entity.Id });
 
             //Delete Content specific data
             Database.Delete<DataTypeDto>("WHERE nodeId = @Id", new { Id = entity.Id });
@@ -329,7 +329,7 @@ AND umbracoNode.id <> @id",
 
         public void AddOrUpdatePreValues(IDataTypeDefinition dataType, IDictionary<string, PreValue> values)
         {
-            var currentVals = new DataTypePreValueDto[]{};
+            var currentVals = new DataTypePreValueDto[] { };
             if (dataType.HasIdentity)
             {
                 //first just get all pre-values for this data type so we can compare them to see if we need to insert or update or replace
@@ -337,7 +337,7 @@ AND umbracoNode.id <> @id",
                                    .From<DataTypePreValueDto>()
                                    .Where<DataTypePreValueDto>(dto => dto.DataTypeNodeId == dataType.Id)
                                    .OrderBy<DataTypePreValueDto>(dto => dto.SortOrder);
-                currentVals = Database.Fetch<DataTypePreValueDto>(sql).ToArray();    
+                currentVals = Database.Fetch<DataTypePreValueDto>(sql).ToArray();
             }
 
             //already existing, need to be updated
@@ -409,7 +409,7 @@ AND umbracoNode.id <> @id",
             //the key will be: "UmbracoPreValDATATYPEID-CSVOFPREVALIDS
 
             var key = GetPrefixedCacheKey(dataTypeId)
-                      + string.Join(",", collection.FormatAsDictionary().Select(x => x.Value.Id).ToArray());                      
+                      + string.Join(",", collection.FormatAsDictionary().Select(x => x.Value.Id).ToArray());
 
             //store into cache
             _cacheHelper.RuntimeCache.InsertCacheItem(key, () => collection,
@@ -429,7 +429,7 @@ AND umbracoNode.id <> @id",
             public string Value { get; set; }
             public string Alias { get; set; }
             public IDataTypeDefinition DataType { get; set; }
-            public int SortOrder { get; set; }         
+            public int SortOrder { get; set; }
         }
 
         /// <summary>
@@ -476,7 +476,7 @@ AND umbracoNode.id <> @id",
             protected override Guid NodeObjectTypeId
             {
                 get { throw new NotImplementedException(); }
-            } 
+            }
             #endregion
 
             protected override void PersistDeletedItem(PreValueEntity entity)
@@ -579,6 +579,17 @@ AND id <> @id",
             }
         }
 
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _contentTypeRepository.Dispose();
+            _preValRepository.Dispose();
+        }
     }
 
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
index 4c70d339b6..a8dac969d3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
@@ -224,14 +224,18 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public IDictionaryItem Get(Guid uniqueId)
         {
-            var uniqueIdRepo = new DictionaryByUniqueIdRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax);
-            return uniqueIdRepo.Get(uniqueId);
+            using (var uniqueIdRepo = new DictionaryByUniqueIdRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                return uniqueIdRepo.Get(uniqueId);    
+            }
         }
 
         public IDictionaryItem Get(string key)
         {
-            var keyRepo = new DictionaryByKeyRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax);
-            return keyRepo.Get(key);
+            using (var keyRepo = new DictionaryByKeyRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                return keyRepo.Get(key);    
+            }
         }
 
         private class DictionaryByUniqueIdRepository : SimpleGetRepository<Guid, IDictionaryItem, DictionaryDto>
@@ -315,5 +319,16 @@ namespace Umbraco.Core.Persistence.Repositories
                 return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("key") + " in (@ids)";
             }
         }
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _languageRepository.Dispose();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
new file mode 100644
index 0000000000..36fadcf6a6
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    internal class DomainRepository : PetaPocoRepositoryBase<int, IDomain>, IDomainRepository
+    {
+        private readonly IContentRepository _contentRepository;
+        private readonly ILanguageRepository _languageRepository;
+
+        public DomainRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax, IContentRepository contentRepository, ILanguageRepository languageRepository)
+            : base(work, cache, logger, sqlSyntax)
+        {
+            _contentRepository = contentRepository;
+            _languageRepository = languageRepository;
+        }
+
+        /// <summary>
+        /// Override the cache, this repo will not perform any cache, the caching is taken care of in the inner repository
+        /// </summary>
+        /// <remarks>
+        /// This is required because IDomain is a deep object and we dont' want to cache it since it contains an ILanguage and an IContent, when these
+        /// are deep cloned the object graph that will be cached will be huge. Instead we'll have an internal repository that caches the simple
+        /// Domain structure and we'll use the other repositories to resolve the entities to attach
+        /// </remarks>
+        protected override IRuntimeCacheProvider RuntimeCache
+        {
+            get { return new NullCacheProvider(); }
+        }
+
+        protected override IDomain PerformGet(int id)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+                return factory.BuildDomainEntity(repo.Get(id), _contentRepository, _languageRepository);
+            }
+        }
+
+        protected override IEnumerable<IDomain> PerformGetAll(params int[] ids)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+                return factory.BuildDomainEntities(repo.GetAll(ids).ToArray(), _contentRepository, _languageRepository);
+            }
+        }
+
+        protected override IEnumerable<IDomain> PerformGetByQuery(IQuery<IDomain> query)
+        {
+            throw new NotSupportedException("This repository does not support this method");
+        }
+
+        protected override Sql GetBaseQuery(bool isCount)
+        {
+            var sql = new Sql();
+            sql.Select(isCount ? "COUNT(*)" : "*").From<DomainDto>(SqlSyntax);
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoDomains.id = @Id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+                {
+                    "DELETE FROM umbracoDomain WHERE id = @Id"
+                };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        protected override void PersistNewItem(IDomain entity)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+                var cacheableEntity = factory.BuildEntity(entity);
+                repo.PersistNewItem(cacheableEntity);
+                //re-map the id
+                entity.Id = cacheableEntity.Id;
+                entity.ResetDirtyProperties();
+            }
+        }
+
+        protected override void PersistUpdatedItem(IDomain entity)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+                repo.PersistUpdatedItem(factory.BuildEntity(entity));
+                entity.ResetDirtyProperties();
+            }
+        }
+
+        public IEnumerable<IDomain> GetAll(bool includeWildcards)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+                return factory.BuildDomainEntities(repo.GetAll().ToArray(), _contentRepository, _languageRepository)
+                    .Where(x => includeWildcards || x.IsWildcard == false);
+            }
+        }
+
+        public IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+
+                var query = new Query<CacheableDomain>().Where(x => x.RootContentId == contentId);
+
+                return factory.BuildDomainEntities(repo.GetByQuery(query).ToArray(), _contentRepository, _languageRepository)
+                    .Where(x => includeWildcards || x.IsWildcard == false);
+            }
+        }
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _contentRepository.Dispose();
+            _languageRepository.Dispose();
+        }
+
+        /// <summary>
+        /// A simple domain model that is cacheable without a large object graph
+        /// </summary>
+        internal class CacheableDomain : Entity, IAggregateRoot
+        {
+            public int? DefaultLanguageId { get; set; }
+            public string DomainName { get; set; }
+            public int? RootContentId { get; set; }
+        }
+
+        /// <summary>
+        /// Inner repository responsible for CRUD for domains that allows caching simple data
+        /// </summary>
+        private class CachedDomainRepository : PetaPocoRepositoryBase<int, CacheableDomain>
+        {
+            private readonly DomainRepository _domainRepo;
+
+            public CachedDomainRepository(DomainRepository domainRepo, IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
+                : base(work, cache, logger, sqlSyntax)
+            {
+                _domainRepo = domainRepo;
+            }
+
+            protected override CacheableDomain PerformGet(int id)
+            {
+                var sql = GetBaseQuery(false);
+                sql.Where(GetBaseWhereClause(), new { Id = id });
+
+                var dto = Database.FirstOrDefault<DomainDto>(sql);
+                if (dto == null)
+                    return null;
+
+                var entity = ConvertFromDto(dto);
+
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                ((Entity)entity).ResetDirtyProperties(false);
+
+                return entity;
+            }
+
+            protected override IEnumerable<CacheableDomain> PerformGetAll(params int[] ids)
+            {
+                var sql = GetBaseQuery(false).Where("umbracoDomains.id > 0");
+                if (ids.Any())
+                {
+                    sql.Where("umbracoDomains.id in (@ids)", new { ids = ids });
+                }
+
+                return Database.Fetch<DomainDto>(sql).Select(ConvertFromDto);
+            }
+
+            protected override IEnumerable<CacheableDomain> PerformGetByQuery(IQuery<CacheableDomain> query)
+            {
+                var sqlClause = GetBaseQuery(false);
+                var translator = new SqlTranslator<CacheableDomain>(sqlClause, query);
+                var sql = translator.Translate();
+                return Database.Fetch<DomainDto>(sql).Select(ConvertFromDto);
+            }
+
+            protected override Sql GetBaseQuery(bool isCount)
+            {
+                return _domainRepo.GetBaseQuery(isCount);
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                return _domainRepo.GetBaseWhereClause();
+            }
+
+            protected override IEnumerable<string> GetDeleteClauses()
+            {
+                return _domainRepo.GetDeleteClauses();
+            }
+
+            protected override Guid NodeObjectTypeId
+            {
+                get { throw new NotImplementedException(); }
+            }
+
+            protected override void PersistNewItem(CacheableDomain entity)
+            {
+                entity.AddingEntity();
+
+                var factory = new DomainModelFactory();
+                var dto = factory.BuildDto(entity);
+
+                var id = Convert.ToInt32(Database.Insert(dto));
+                entity.Id = id;
+
+                entity.ResetDirtyProperties();
+            }
+
+            protected override void PersistUpdatedItem(CacheableDomain entity)
+            {
+                entity.UpdatingEntity();
+
+                var factory = new DomainModelFactory();
+                var dto = factory.BuildDto(entity);
+
+                Database.Update(dto);
+
+                entity.ResetDirtyProperties();
+            }
+
+            private CacheableDomain ConvertFromDto(DomainDto dto)
+            {
+                var factory = new DomainModelFactory();
+                var entity = factory.BuildEntity(dto);
+                return entity;
+            }
+        }
+
+        internal class DomainModelFactory
+        {
+            public IEnumerable<IDomain> BuildDomainEntities(CacheableDomain[] cacheableDomains, IContentRepository contentRepository, ILanguageRepository languageRepository)
+            {
+                var contentIds = cacheableDomains.Select(x => x.RootContentId).Where(x => x.HasValue).Select(x => x.Value).Distinct().ToArray();
+                var langIds = cacheableDomains.Select(x => x.DefaultLanguageId).Where(x => x.HasValue).Select(x => x.Value).Distinct().ToArray();
+                var contentItems = contentRepository.GetAll(contentIds);
+                var langItems = languageRepository.GetAll(langIds);
+
+                return cacheableDomains
+                    .WhereNotNull()
+                    .Select(cacheableDomain => new UmbracoDomain
+                    {
+                        Id = cacheableDomain.Id,
+                        //lookup from repo - this will be cached
+                        DefaultLanguage = cacheableDomain.DefaultLanguageId.HasValue ? langItems.FirstOrDefault(l => l.Id == cacheableDomain.DefaultLanguageId.Value) : null,
+                        DomainName = cacheableDomain.DomainName,
+                        //lookup from repo - this will be cached
+                        RootContent = cacheableDomain.RootContentId.HasValue ? contentItems.FirstOrDefault(l => l.Id == cacheableDomain.RootContentId.Value) : null,
+                    });
+            }
+
+            public IDomain BuildDomainEntity(CacheableDomain cacheableDomain, IContentRepository contentRepository, ILanguageRepository languageRepository)
+            {
+                if (cacheableDomain == null) return null;
+
+                return new UmbracoDomain
+                {
+                    Id = cacheableDomain.Id,
+                    //lookup from repo - this will be cached
+                    DefaultLanguage = cacheableDomain.DefaultLanguageId.HasValue ? languageRepository.Get(cacheableDomain.DefaultLanguageId.Value) : null,
+                    DomainName = cacheableDomain.DomainName,
+                    //lookup from repo - this will be cached
+                    RootContent = cacheableDomain.RootContentId.HasValue ? contentRepository.Get(cacheableDomain.RootContentId.Value) : null
+                };
+            }
+
+            public CacheableDomain BuildEntity(IDomain entity)
+            {
+                var domain = new CacheableDomain
+                {
+                    Id = entity.Id,
+                    DefaultLanguageId = entity.DefaultLanguage == null ? null : (int?)entity.DefaultLanguage.Id,
+                    DomainName = entity.DomainName,
+                    RootContentId = entity.RootContent == null ? null : (int?)entity.RootContent.Id
+                };
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                domain.ResetDirtyProperties(false);
+                return domain;
+            }
+
+            public CacheableDomain BuildEntity(DomainDto dto)
+            {
+                var domain = new CacheableDomain { Id = dto.Id, DefaultLanguageId = dto.DefaultLanguage, DomainName = dto.DomainName, RootContentId = dto.RootStructureId };
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                domain.ResetDirtyProperties(false);
+                return domain;
+            }
+
+            public DomainDto BuildDto(CacheableDomain entity)
+            {
+                var dto = new DomainDto { DefaultLanguage = entity.DefaultLanguageId, DomainName = entity.DomainName, Id = entity.Id, RootStructureId = entity.RootContentId };
+                return dto;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
new file mode 100644
index 0000000000..d19355632f
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IDomainRepository : IRepositoryQueryable<int, IDomain>
+    {
+        IEnumerable<IDomain> GetAll(bool includeWildcards);
+        IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
index 898dae9497..7e74c2a0d0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
@@ -70,7 +70,7 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var sql = new Sql();
             sql.Select(isCount ? "COUNT(*)" : "*")
-               .From<LanguageDto>();
+               .From<LanguageDto>(SqlSyntax);
             return sql;
         }
 
@@ -200,6 +200,9 @@ namespace Umbraco.Core.Persistence.Repositories
             }
         }
 
+        /// <summary>
+        /// Inner repository for looking up languages by culture name, this deals with caching by a string key
+        /// </summary>
         private class LanguageByCultureNameRepository : SimpleGetRepository<string, ILanguage, LanguageDto>
         {
             private readonly LanguageRepository _languageRepository;
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
index e5334bfac2..9f9ac2e3bf 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
@@ -217,7 +217,7 @@ namespace Umbraco.Core.Persistence.Repositories
                         var id = contentTypeId;
                         var query = Query<IMedia>.Builder.Where(x => x.ContentTypeId == id && x.Trashed == false);
                         RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
-                    }                    
+                    }
                 }
 
                 tr.Complete();
@@ -434,7 +434,7 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             get { return Constants.System.RecycleBinMedia; }
         }
-      
+
         #endregion
 
         /// <summary>
@@ -581,6 +581,18 @@ namespace Umbraco.Core.Persistence.Repositories
             return currentName;
         }
 
-        
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _mediaTypeRepository.Dispose();
+            _tagRepository.Dispose();
+            _contentXmlRepository.Dispose();
+            _contentPreviewRepository.Dispose();
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
index 8c08bf38c2..79d35d99a4 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
@@ -782,5 +782,20 @@ namespace Umbraco.Core.Persistence.Repositories
             ((Entity)member).ResetDirtyProperties(false);
             return member;
         }
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _memberTypeRepository.Dispose();
+            _tagRepository.Dispose();
+            _memberGroupRepository.Dispose();
+            _contentXmlRepository.Dispose();
+            _contentPreviewRepository.Dispose();
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
index c9a6c2f96a..69e0307c09 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
@@ -146,5 +146,16 @@ namespace Umbraco.Core.Persistence.Repositories
         }
 
         #endregion
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _relationTypeRepository.Dispose();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
index 10a9e1fe2c..a6bbff353a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
@@ -46,6 +46,14 @@ namespace Umbraco.Core.Persistence.Repositories
             get { return _cache; }
         }
 
+        /// <summary>
+        /// The runtime cache used for this repo - by standard this is the runtime cache exposed by the CacheHelper but can be overridden
+        /// </summary>
+        protected virtual IRuntimeCacheProvider RuntimeCache
+        {
+            get { return _cache.RuntimeCache; }
+        }
+
         public static string GetCacheIdKey<T>(object id)
         {
             return string.Format("{0}{1}", GetCacheTypeKey<T>(), id);
@@ -77,7 +85,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <summary>
         /// Adds or Updates an entity of type TEntity
         /// </summary>
-        /// <remarks>This method is backed by an <see cref="IRepositoryCacheProvider"/> cache</remarks>
+        /// <remarks>This method is backed by an <see cref="IRuntimeCacheProvider"/> cache</remarks>
         /// <param name="entity"></param>
         public void AddOrUpdate(TEntity entity)
         {
@@ -105,13 +113,13 @@ namespace Umbraco.Core.Persistence.Repositories
 
         protected abstract TEntity PerformGet(TId id);
         /// <summary>
-        /// Gets an entity by the passed in Id
+        /// Gets an entity by the passed in Id utilizing the repository's runtime cache
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         public TEntity Get(TId id)
         {
-            return RepositoryCache.RuntimeCache.GetCacheItem<TEntity>(
+            return RuntimeCache.GetCacheItem<TEntity>(
                 GetCacheIdKey<TEntity>(id), () =>
                 {
                     var entity = PerformGet(id);
@@ -149,14 +157,14 @@ namespace Umbraco.Core.Persistence.Repositories
 
             if (ids.Any())
             {
-                var entities = ids.Select(x => RepositoryCache.RuntimeCache.GetCacheItem<TEntity>(GetCacheIdKey<TEntity>(x))).ToArray();
+                var entities = ids.Select(x => RuntimeCache.GetCacheItem<TEntity>(GetCacheIdKey<TEntity>(x))).ToArray();
                 
                 if (ids.Count().Equals(entities.Count()) && entities.Any(x => x == null) == false)
                     return entities.Select(x => (TEntity)x);
             }
             else
             {
-                var allEntities = RepositoryCache.RuntimeCache.GetCacheItemsByKeySearch<TEntity>(GetCacheTypeKey<TEntity>()).ToArray();
+                var allEntities = RuntimeCache.GetCacheItemsByKeySearch<TEntity>(GetCacheTypeKey<TEntity>()).ToArray();
 
                 if (allEntities.Any())
                 {
@@ -185,7 +193,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 if (entity != null)
                 {
                     var localCopy = entity;
-                    RepositoryCache.RuntimeCache.InsertCacheItem(GetCacheIdKey<TEntity>(entity.Id), () => localCopy);
+                    RuntimeCache.InsertCacheItem(GetCacheIdKey<TEntity>(entity.Id), () => localCopy);
                 }
             }
 
@@ -213,7 +221,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <returns></returns>
         public bool Exists(TId id)
         {
-            var fromCache = RepositoryCache.RuntimeCache.GetCacheItem<TEntity>(GetCacheIdKey<TEntity>(id));
+            var fromCache = RuntimeCache.GetCacheItem<TEntity>(GetCacheIdKey<TEntity>(id));
             if (fromCache != null)
             {
                 return true;
@@ -245,13 +253,13 @@ namespace Umbraco.Core.Persistence.Repositories
             try
             {
                 PersistNewItem((TEntity)entity);
-                RepositoryCache.RuntimeCache.InsertCacheItem(GetCacheIdKey<TEntity>(entity.Id), () => entity);
+                RuntimeCache.InsertCacheItem(GetCacheIdKey<TEntity>(entity.Id), () => entity);
             }
             catch (Exception)
             {
                 //if an exception is thrown we need to remove the entry from cache, this is ONLY a work around because of the way
                 // that we cache entities: http://issues.umbraco.org/issue/U4-4259
-                RepositoryCache.RuntimeCache.ClearCacheItem(GetCacheIdKey<TEntity>(entity.Id));
+                RuntimeCache.ClearCacheItem(GetCacheIdKey<TEntity>(entity.Id));
                 throw;
             }
 
@@ -266,14 +274,14 @@ namespace Umbraco.Core.Persistence.Repositories
             try
             {
                 PersistUpdatedItem((TEntity)entity);
-                RepositoryCache.RuntimeCache.InsertCacheItem(GetCacheIdKey<TEntity>(entity.Id), () => entity);
+                RuntimeCache.InsertCacheItem(GetCacheIdKey<TEntity>(entity.Id), () => entity);
             }
             catch (Exception)
             {
                 //if an exception is thrown we need to remove the entry from cache, this is ONLY a work around because of the way
                 // that we cache entities: http://issues.umbraco.org/issue/U4-4259
                 //RepositoryCache.Delete(typeof(TEntity), entity);
-                RepositoryCache.RuntimeCache.ClearCacheItem(GetCacheIdKey<TEntity>(entity.Id));
+                RuntimeCache.ClearCacheItem(GetCacheIdKey<TEntity>(entity.Id));
                 throw;
             }
 
@@ -286,7 +294,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public virtual void PersistDeletedItem(IEntity entity)
         {
             PersistDeletedItem((TEntity)entity);
-            RepositoryCache.RuntimeCache.ClearCacheItem(GetCacheIdKey<TEntity>(entity.Id));
+            RuntimeCache.ClearCacheItem(GetCacheIdKey<TEntity>(entity.Id));
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
index e56771fc7d..fb66dc7ade 100644
--- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
@@ -374,6 +374,17 @@ namespace Umbraco.Core.Persistence.Repositories
                     var userFactory = new UserFactory(userType);
                     return userFactory.BuildEntity(dto);
                 });
-        } 
+        }
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _userTypeRepository.Dispose();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 0562ca4e8b..87f57ab344 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -320,10 +320,15 @@
     <Compile Include="IDisposeOnRequestEnd.cs" />
     <Compile Include="Models\AuditItem.cs" />
     <Compile Include="Models\AuditType.cs" />
+    <Compile Include="Models\UmbracoDomain.cs" />
+    <Compile Include="Models\DoNotCloneAttribute.cs" />
+    <Compile Include="Models\IDomain.cs" />
     <Compile Include="Persistence\Factories\TaskFactory.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\RemoveStylesheetDataAndTables.cs" />
     <Compile Include="Persistence\Repositories\AuditRepository.cs" />
+    <Compile Include="Persistence\Repositories\DomainRepository.cs" />
     <Compile Include="Persistence\Repositories\Interfaces\IAuditRepository.cs" />
+    <Compile Include="Persistence\Repositories\Interfaces\IDomainRepository.cs" />
     <Compile Include="Persistence\Repositories\Interfaces\ITaskRepository.cs" />
     <Compile Include="Persistence\Repositories\TaskRepository.cs" />
     <Compile Include="ServiceProviderExtensions.cs" />
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/ValidateV7TagsUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/ValidateV7TagsUpgradeTest.cs
index e8fccc48f8..f784dc3bea 100644
--- a/src/Umbraco.Tests/Migrations/Upgrades/ValidateV7TagsUpgradeTest.cs
+++ b/src/Umbraco.Tests/Migrations/Upgrades/ValidateV7TagsUpgradeTest.cs
@@ -25,10 +25,10 @@ namespace Umbraco.Tests.Migrations.Upgrades
     {
         private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
-            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, contentTypeRepository, templateRepository, tagRepository);
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
+            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
index c8b4a54b96..e5c74e4faa 100644
--- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
+++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Persistence.Querying
             IDictionary<int, IEnumerable<ContentTypeRepository.ContentTypeQueryMapper.AssociatedTemplate>> allAssociatedTemplates;
             IDictionary<int, IEnumerable<int>> allParentContentTypeIds;
             var contentTypes = ContentTypeRepository.ContentTypeQueryMapper.MapContentTypes(
-                new[] {99997, 99998}, DatabaseContext.Database, SqlSyntaxProvider, out allAssociatedTemplates, out allParentContentTypeIds)
+                new[] {99997, 99998}, DatabaseContext.Database, SqlSyntax, out allAssociatedTemplates, out allParentContentTypeIds)
                 .ToArray();
 
             var contentType1 = contentTypes.SingleOrDefault(x => x.Id == 99997);
@@ -111,7 +111,7 @@ namespace Umbraco.Tests.Persistence.Querying
 
             IDictionary<int, IEnumerable<int>> allParentContentTypeIds;
             var contentTypes = ContentTypeRepository.ContentTypeQueryMapper.MapMediaTypes(
-                new[] { 99997, 99998 }, DatabaseContext.Database, SqlSyntaxProvider, out allParentContentTypeIds)
+                new[] { 99997, 99998 }, DatabaseContext.Database, SqlSyntax, out allParentContentTypeIds)
                 .ToArray();
 
             var contentType1 = contentTypes.SingleOrDefault(x => x.Id == 99997);
@@ -172,7 +172,7 @@ namespace Umbraco.Tests.Persistence.Querying
 
             IDictionary<int, PropertyTypeCollection> allPropTypeCollection;
             IDictionary<int, PropertyGroupCollection> allPropGroupCollection;
-            ContentTypeRepository.ContentTypeQueryMapper.MapGroupsAndProperties(new[] { 99999 }, DatabaseContext.Database, SqlSyntaxProvider, out allPropTypeCollection, out allPropGroupCollection);
+            ContentTypeRepository.ContentTypeQueryMapper.MapGroupsAndProperties(new[] { 99999 }, DatabaseContext.Database, SqlSyntax, out allPropTypeCollection, out allPropGroupCollection);
 
             var propGroupCollection = allPropGroupCollection[99999];
             var propTypeCollection = allPropTypeCollection[99999];
diff --git a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
index c3cefc1e35..08012a24c4 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
@@ -1,10 +1,22 @@
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Xml.Linq;
 using NUnit.Framework;
+using umbraco;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
+using umbraco.editorControls.tinyMCE3;
+using umbraco.interfaces;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
@@ -17,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 repo.AddOrUpdate(new AuditItem(-1, "This is a System audit trail", AuditType.System, 0));
                 unitOfWork.Commit();
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
index da2fedfb00..f74f70cce2 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
@@ -44,10 +44,10 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
-            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, contentTypeRepository, templateRepository, tagRepository);
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax);
+            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, templateRepository);
+            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 79061564cc..058dd0330e 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -39,17 +39,17 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
-            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, contentTypeRepository, templateRepository, tagRepository);
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
+            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
             return repository;
         }
 
         private ContentTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
-            var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
             return contentTypeRepository;
         }
 
@@ -62,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
+            using (var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
             using (var repository = CreateRepository(unitOfWork))
             {
                 var templates = new[]
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
index 4cc05efd5e..ec2d1b981c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
@@ -34,9 +34,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             var dataTypeDefinitionRepository = new DataTypeDefinitionRepository(
                 unitOfWork, CacheHelper.CreateDisabledCacheHelper(),
                 CacheHelper.CreateDisabledCacheHelper(),
-                Mock.Of<ILogger>(), SqlSyntaxProvider,
-                new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider,
-                    new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>())));
+                Mock.Of<ILogger>(), SqlSyntax,
+                new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax,
+                    new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>())));
             return dataTypeDefinitionRepository;
         }
 
@@ -363,9 +363,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             Func<DataTypeDefinitionRepository> creator = () => new DataTypeDefinitionRepository(
                 unitOfWork, CacheHelper.CreateDisabledCacheHelper(),
                 cache,
-                Mock.Of<ILogger>(), SqlSyntaxProvider,
-                new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider,
-                    new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>())));
+                Mock.Of<ILogger>(), SqlSyntax,
+                new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax,
+                    new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>())));
 
             DataTypeDefinition dtd;
             using (var repository = creator())
@@ -402,9 +402,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             Func<DataTypeDefinitionRepository> creator = () => new DataTypeDefinitionRepository(
                 unitOfWork, CacheHelper.CreateDisabledCacheHelper(),
                 cache,
-                Mock.Of<ILogger>(), SqlSyntaxProvider,
-                new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider,
-                    new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>())));
+                Mock.Of<ILogger>(), SqlSyntax,
+                new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax,
+                    new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>())));
 
             DataTypeDefinition dtd;
             using (var repository = creator())
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
index b520997ba9..25fcc5e13a 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private DictionaryRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out LanguageRepository languageRepository)
         {
-            languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
+            languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
             var dictionaryRepository = new DictionaryRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), new SqlCeSyntaxProvider(), languageRepository);
             return dictionaryRepository;
         }
@@ -341,7 +341,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            var languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
+            var languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
             var repository = new DictionaryRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), new SqlCeSyntaxProvider(), languageRepository);
 
             var languageNo = new Language("nb-NO") { CultureName = "nb-NO" };
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
new file mode 100644
index 0000000000..351136c5e5
--- /dev/null
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -0,0 +1,241 @@
+using System.Collections.Generic;
+using System.Linq;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+
+namespace Umbraco.Tests.Persistence.Repositories
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture]
+    public class DomainRepositoryTest : BaseDatabaseFactoryTest
+    {
+        private DomainRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out ContentRepository contentRepository, out LanguageRepository languageRepository)
+        {
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax);
+            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, templateRepository);
+            contentRepository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
+            languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax);
+            var domainRepository = new DomainRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, contentRepository, languageRepository);
+            return domainRepository;
+        }
+
+        private int CreateTestData(string isoName, out ContentType ct)
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = new Language(isoName);
+                langRepo.AddOrUpdate(lang);
+
+                ct = MockedContentTypes.CreateBasicContentType("test", "Test");
+                contentTypeRepo.AddOrUpdate(ct);
+                var content = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
+                contentRepo.AddOrUpdate(content);
+                unitOfWork.Commit();
+                return content.Id;
+            }
+        }
+
+        [Test]
+        public void Can_Create_And_Get_By_Id()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = langRepo.GetByIsoCode("en-AU");
+                var content = contentRepo.Get(contentId);
+
+                var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                repo.AddOrUpdate(domain);
+                unitOfWork.Commit();
+
+                //re-get
+                domain = repo.Get(domain.Id);
+
+                Assert.NotNull(domain);
+                Assert.IsTrue(domain.HasIdentity);
+                Assert.Greater(domain.Id, 0);
+                Assert.AreEqual("test.com", domain.DomainName);
+                Assert.AreEqual(content.Id, domain.RootContent.Id);
+                Assert.AreEqual(lang.Id, domain.DefaultLanguage.Id);
+            }
+
+
+        }
+
+        [Test]
+        public void Can_Update()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId1 = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var content1 = contentRepo.Get(contentId1);
+
+                //more test data
+                var lang1 = langRepo.GetByIsoCode("en-AU");
+                var lang2 = new Language("es");
+                langRepo.AddOrUpdate(lang2);
+                var content2 = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
+                contentRepo.AddOrUpdate(content2);
+                unitOfWork.Commit();
+
+
+                var domain = (IDomain)new UmbracoDomain { RootContent = content1, DefaultLanguage = lang1, DomainName = "test.com" };
+                repo.AddOrUpdate(domain);
+                unitOfWork.Commit();
+
+                //re-get
+                domain = repo.Get(domain.Id);
+
+                domain.DomainName = "blah.com";
+                domain.RootContent = content2;
+                domain.DefaultLanguage = lang2;
+                repo.AddOrUpdate(domain);
+                unitOfWork.Commit();
+
+                //re-get
+                domain = repo.Get(domain.Id);
+
+                Assert.AreEqual("blah.com", domain.DomainName);
+                Assert.AreEqual(content2.Id, domain.RootContent.Id);
+                Assert.AreEqual(lang2.Id, domain.DefaultLanguage.Id);
+            }
+
+
+        }
+
+        [Test]
+        public void Get_All()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = langRepo.GetByIsoCode("en-AU");
+                var content = contentRepo.Get(contentId);
+
+                for (int i = 0; i < 10; i++)
+                {
+                    var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test " + i + ".com" };
+                    repo.AddOrUpdate(domain);
+                    unitOfWork.Commit();
+                }
+
+                var all = repo.GetAll();
+
+                Assert.AreEqual(10, all.Count());
+            }
+        }
+
+        [Test]
+        public void Get_All_Ids()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = langRepo.GetByIsoCode("en-AU");
+                var content = contentRepo.Get(contentId);
+
+                var ids = new List<int>();
+                for (int i = 0; i < 10; i++)
+                {
+                    var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test " + i + ".com" };
+                    repo.AddOrUpdate(domain);
+                    unitOfWork.Commit();
+                    ids.Add(domain.Id);
+                }
+
+                var all = repo.GetAll(ids.Take(8).ToArray());
+
+                Assert.AreEqual(8, all.Count());
+            }
+        }
+
+        [Test]
+        public void Get_All_Without_Wildcards()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = langRepo.GetByIsoCode("en-AU");
+                var content = contentRepo.Get(contentId);
+
+                for (int i = 0; i < 10; i++)
+                {
+                    var domain = (IDomain)new UmbracoDomain
+                    {
+                        RootContent = content,
+                        DefaultLanguage = lang,
+                        DomainName =  (i%2==0) ? "test " + i + ".com" : ("*" + i)
+                    };
+                    repo.AddOrUpdate(domain);
+                    unitOfWork.Commit();
+                }
+
+                var all = repo.GetAll(false);
+
+                Assert.AreEqual(5, all.Count());
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
index e07dc79141..e4c403b280 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private LanguageRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            return new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);            
+            return new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);            
         }
 
      
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
index 005b1a211a..251fb7c566 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var unitOfWork = provider.GetUnitOfWork();
 
             // Act
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = new Macro("test1", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
                 repository.AddOrUpdate(macro);
@@ -52,7 +52,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var unitOfWork = provider.GetUnitOfWork();
 
             // Act
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = repository.Get(1);
                 macro.Alias = "test2";
@@ -70,7 +70,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var unitOfWork = provider.GetUnitOfWork();
 
             // Act
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Assert
                 Assert.That(repository, Is.Not.Null);
@@ -83,7 +83,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var macro = repository.Get(1);
@@ -113,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var macros = repository.GetAll();
@@ -130,7 +130,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var query = Query<IMacro>.Builder.Where(x => x.Alias.ToUpper() == "TEST1");
@@ -147,7 +147,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var query = Query<IMacro>.Builder.Where(x => x.Name.StartsWith("Test"));
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var macro = new Macro("test", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
@@ -185,7 +185,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var macro = repository.Get(2);
@@ -226,7 +226,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var macro = repository.Get(3);
@@ -247,7 +247,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 // Act
                 var exists = repository.Exists(3);
@@ -265,7 +265,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
@@ -292,7 +292,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
@@ -317,7 +317,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
@@ -342,7 +342,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 var prop1 = new MacroProperty("blah1", "New1", 4, "test.editor");
@@ -373,7 +373,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
@@ -401,7 +401,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
@@ -430,7 +430,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.GetUnitOfWork())
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
                 repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index 753d0171c2..5267cb1ca8 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -40,9 +40,9 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private MediaRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
         {
-            mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var repository = new MediaRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, mediaTypeRepository, tagRepository);
+            mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var repository = new MediaRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
index 7ad3bb59f9..918577635c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private MediaTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            return new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);            
+            return new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);            
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
index c8be935f36..9769a91cb2 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
@@ -35,10 +35,10 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private MemberRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MemberTypeRepository memberTypeRepository, out MemberGroupRepository memberGroupRepository)
         {
-            memberTypeRepository = new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            memberGroupRepository = new MemberGroupRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, CacheHelper.CreateDisabledCacheHelper());
-            var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var repository = new MemberRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, memberTypeRepository, memberGroupRepository, tagRepo);
+            memberTypeRepository = new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            memberGroupRepository = new MemberGroupRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, CacheHelper.CreateDisabledCacheHelper());
+            var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var repository = new MemberRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, memberTypeRepository, memberGroupRepository, tagRepo);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
index 2ec84225b5..1360500d96 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private MemberTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            return new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);            
+            return new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);            
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
index 685e4fa6ef..82eec202ae 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
@@ -32,8 +32,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private RelationRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out RelationTypeRepository relationTypeRepository)
         {
-            relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var repository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, relationTypeRepository);
+            relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var repository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, relationTypeRepository);
             return repository;
         }
 
@@ -267,8 +267,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var relationRepository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, relationTypeRepository);
+            var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var relationRepository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, relationTypeRepository);
 
             relationTypeRepository.AddOrUpdate(relateContent);
             relationTypeRepository.AddOrUpdate(relateContentType);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
index 15bf31291d..2a95957ea8 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private RelationTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            return new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
+            return new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
         }
 
 
@@ -235,7 +235,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
+            var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
 
             repository.AddOrUpdate(relateContent);//Id 2
             repository.AddOrUpdate(relateContentType);//Id 3
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
index cbd8aa9deb..9433c9a2b6 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private ServerRegistrationRepository CreateRepositor(IDatabaseUnitOfWork unitOfWork)
         {
-            return new ServerRegistrationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
+            return new ServerRegistrationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
         }
 
         [Test]
@@ -246,7 +246,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.GetUnitOfWork())
-            using (var repository = new ServerRegistrationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new ServerRegistrationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 repository.AddOrUpdate(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
                 repository.AddOrUpdate(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
index f6714728ce..93089b6e93 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private TagRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
             return tagRepository;
         }
 
@@ -939,18 +939,18 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private ContentRepository CreateContentRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
-            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, contentTypeRepository, templateRepository, tagRepository);
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
+            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
             return repository;
         }
 
         private MediaRepository CreateMediaRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
         {
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var repository = new MediaRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, mediaTypeRepository, tagRepository);
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var repository = new MediaRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository);
             return repository;
         }
     }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
index 4bb55ba472..c1ad6375d6 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var created = DateTime.Now;
                 repo.AddOrUpdate(new Task(new TaskType("asdfasdf"))
@@ -49,7 +49,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var task = new Task(new TaskType("asdfasdf"))
                 {
@@ -79,7 +79,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var task = new Task(new TaskType("asdfasdf"))
                 {
@@ -107,7 +107,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var found = repo.GetAll().ToArray();
                 Assert.AreEqual(20, found.Count());
@@ -122,7 +122,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var found = repo.GetTasks(includeClosed: true).ToArray();
                 Assert.AreEqual(15, found.Count());
@@ -137,7 +137,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var found = repo.GetTasks(itemId:-20).ToArray();
                 Assert.AreEqual(10, found.Count());
@@ -152,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 var found = repo.GetTasks(includeClosed: false);
                 Assert.AreEqual(10, found.Count());
@@ -163,7 +163,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntaxProvider))
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
             {
                 for (int i = 0; i < count; i++)
                 {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
index 4987309e34..a8cc8b41e3 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private ITemplateRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, ITemplatesSection templatesSection = null)
         {
-            return new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, _masterPageFileSystem, _viewsFileSystem,
+            return new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, _masterPageFileSystem, _viewsFileSystem,
                 templatesSection ?? Mock.Of<ITemplatesSection>(t => t.DefaultRenderingEngine == RenderingEngine.Mvc));
         }
 
@@ -404,9 +404,9 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             using (var templateRepository = CreateRepository(unitOfWork))
             {
-                var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-                var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
-                var contentRepo = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, contentTypeRepository, templateRepository, tagRepository);
+                var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+                var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
+                var contentRepo = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
 
                 using (contentRepo)
                 {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 7f6051a62e..1d26e59113 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -34,8 +34,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private UserRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out UserTypeRepository userTypeRepository)
         {
-            userTypeRepository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, userTypeRepository);
+            userTypeRepository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, userTypeRepository);
             return repository;
         }
 
@@ -175,8 +175,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
                 var id = user.Id;
 
-                using (var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
-                using (var repository2 = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, utRepo))
+                using (var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
+                using (var repository2 = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, utRepo))
                 {
                     repository2.Delete(user);
                     unitOfWork.Commit();
@@ -483,8 +483,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
-            using (var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, utRepo))
+            using (var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
+            using (var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, utRepo))
             { 
 
                 // Act
@@ -534,7 +534,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
+            using (var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
             {
                 var userType = MockedUserType.CreateUserType();
                 repository.AddOrUpdate(userType);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
index c84397049d..5efc139931 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private UserTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
         {
-            return new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);            
+            return new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);            
         }
 
         [Test]
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
                 var id = userType.Id;
 
-                using (var repository2 = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
+                using (var repository2 = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
                 {
                     repository2.Delete(userType);
                     unitOfWork.Commit();
diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
index d7509cf68e..4a26d917e1 100644
--- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
@@ -148,10 +148,10 @@ namespace Umbraco.Tests.Services
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
 
-            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
-            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, tRepository))
-            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, ctRepository, tRepository, tagRepo))
+            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
+            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
+            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository))
+            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo))
             {
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
@@ -179,10 +179,10 @@ namespace Umbraco.Tests.Services
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
-            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, tRepository))
-            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, ctRepository, tRepository, tagRepo))
+            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
+            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
+            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository))
+            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo))
             {
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
@@ -209,10 +209,10 @@ namespace Umbraco.Tests.Services
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
 
-            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
-            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, tRepository))
-            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, ctRepository, tRepository, tagRepo))
+            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
+            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
+            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository))
+            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo))
             {
 
                 // Act
@@ -242,10 +242,10 @@ namespace Umbraco.Tests.Services
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
-            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, tRepository))
-            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntaxProvider, ctRepository, tRepository, tagRepo))
+            using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
+            using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax))
+            using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository))
+            using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo))
             {
 
                 // Act
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 5c469cdcd8..e517d835cd 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1442,10 +1442,10 @@ namespace Umbraco.Tests.Services
 
         private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
-            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider);
-            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider, contentTypeRepository, templateRepository, tagRepository);
+            var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
+            contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
+            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository);
             return repository;
         }
     }
diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs
index 4d4a0ee4f0..5e52140bb5 100644
--- a/src/Umbraco.Tests/Services/MacroServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Services
 
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.GetUnitOfWork())
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntaxProvider))
+            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
             {
                 repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
                 repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
index add40b19cc..7077cf19ce 100644
--- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
+++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Tests.Services
 			//here we are going to override the ServiceContext because normally with our test cases we use a 
 			//global Database object but this is NOT how it should work in the web world or in any multi threaded scenario.
 			//we need a new Database object for each thread.
-            var repositoryFactory = new RepositoryFactory(cacheHelper, Logger, SqlSyntaxProvider, SettingsForTests.GenerateMockSettings());
+            var repositoryFactory = new RepositoryFactory(cacheHelper, Logger, SqlSyntax, SettingsForTests.GenerateMockSettings());
 			_uowProvider = new PerThreadPetaPocoUnitOfWorkProvider(_dbFactory);
             ApplicationContext.Services = new ServiceContext(
                 repositoryFactory,
diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index ba2d8a4aa4..d89e645c1f 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -73,11 +73,11 @@ namespace Umbraco.Tests.TestHelpers
                 GetDbProviderName(),
                 Logger);
 
-            var repositoryFactory = new RepositoryFactory(cacheHelper, Logger, SqlSyntaxProvider, SettingsForTests.GenerateMockSettings());
+            var repositoryFactory = new RepositoryFactory(cacheHelper, Logger, SqlSyntax, SettingsForTests.GenerateMockSettings());
 
             _appContext = new ApplicationContext(
                 //assign the db context
-                new DatabaseContext(dbFactory, Logger, SqlSyntaxProvider, "System.Data.SqlServerCe.4.0"),
+                new DatabaseContext(dbFactory, Logger, SqlSyntax, "System.Data.SqlServerCe.4.0"),
                 //assign the service context
                 new ServiceContext(repositoryFactory, new PetaPocoUnitOfWorkProvider(dbFactory), new FileUnitOfWorkProvider(), new PublishingStrategy(), cacheHelper, Logger),
                 cacheHelper,
@@ -101,7 +101,7 @@ namespace Umbraco.Tests.TestHelpers
             }
         }
 
-        protected virtual ISqlSyntaxProvider SqlSyntaxProvider
+        protected virtual ISqlSyntaxProvider SqlSyntax
         {
             get { return new SqlCeSyntaxProvider(); }
         }
@@ -240,7 +240,7 @@ namespace Umbraco.Tests.TestHelpers
                 || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewDbFileAndSchemaPerFixture)))
             {
 
-                var schemaHelper = new DatabaseSchemaHelper(DatabaseContext.Database, Logger, SqlSyntaxProvider);
+                var schemaHelper = new DatabaseSchemaHelper(DatabaseContext.Database, Logger, SqlSyntax);
                 //Create the umbraco database and its base data
                 schemaHelper.CreateDatabaseSchema(false, ApplicationContext);
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index c3690bad2c..78abd56a66 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -175,6 +175,7 @@
     <Compile Include="AttemptTests.cs" />
     <Compile Include="Cache\CacheRefresherTests.cs" />
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
+    <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\TaskRepositoryTest.cs" />
     <Compile Include="Resolvers\ResolverBaseTest.cs" />
     <Compile Include="Strings\StylesheetHelperTests.cs" />
diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs
index 8c3e630285..27d3f3bde4 100644
--- a/src/umbraco.cms/businesslogic/web/Domain.cs
+++ b/src/umbraco.cms/businesslogic/web/Domain.cs
@@ -20,6 +20,7 @@ namespace umbraco.cms.businesslogic.web
     /// <summary>
     /// Summary description for Domain.
     /// </summary>
+    [Obsolete("Use Umbraco.Core.Models.IDomain instead")]
     public class Domain
     {
         private Language _language;

From 512e59871e2c3c8bc533d0b8295d529d18799286 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 17:43:03 +1100
Subject: [PATCH 08/18] Fixed issues relating to domain repository and added
 more tests, starts creating DomainService

---
 .../Persistence/Mappers/DomainMapper.cs       |  29 ++++
 .../Persistence/Mappers/LanguageMapper.cs     |   2 -
 .../Persistence/Mappers/MapperAttribute.cs    |  18 ---
 .../Persistence/Mappers/ModelDtoMapper.cs     |  86 -----------
 .../Repositories/DomainRepository.cs          |  23 ++-
 .../Interfaces/IDomainRepository.cs           |   2 +-
 src/Umbraco.Core/Services/ContentService.cs   |   8 +-
 src/Umbraco.Core/Services/DomainService.cs    |  27 ++++
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +
 .../Repositories/DomainRepositoryTest.cs      | 138 ++++++++++++++++++
 10 files changed, 220 insertions(+), 115 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/Mappers/DomainMapper.cs
 delete mode 100644 src/Umbraco.Core/Persistence/Mappers/MapperAttribute.cs
 delete mode 100644 src/Umbraco.Core/Persistence/Mappers/ModelDtoMapper.cs
 create mode 100644 src/Umbraco.Core/Services/DomainService.cs

diff --git a/src/Umbraco.Core/Persistence/Mappers/DomainMapper.cs b/src/Umbraco.Core/Persistence/Mappers/DomainMapper.cs
new file mode 100644
index 0000000000..15d0852158
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Mappers/DomainMapper.cs
@@ -0,0 +1,29 @@
+using System.Collections.Concurrent;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Repositories;
+
+namespace Umbraco.Core.Persistence.Mappers
+{
+    [MapperFor(typeof(DomainRepository.CacheableDomain))]
+    public sealed class DomainMapper : BaseMapper
+    {
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+
+        public DomainMapper()
+        {
+            BuildMap();
+        }
+
+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
+        internal override void BuildMap()
+        {
+            CacheMap<DomainRepository.CacheableDomain, DomainDto>(src => src.Id, dto => dto.Id);
+            CacheMap<DomainRepository.CacheableDomain, DomainDto>(src => src.RootContentId, dto => dto.RootStructureId);
+            CacheMap<DomainRepository.CacheableDomain, DomainDto>(src => src.DefaultLanguageId, dto => dto.DefaultLanguage);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Mappers/LanguageMapper.cs b/src/Umbraco.Core/Persistence/Mappers/LanguageMapper.cs
index b891bc7ec8..0832aace89 100644
--- a/src/Umbraco.Core/Persistence/Mappers/LanguageMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/LanguageMapper.cs
@@ -16,8 +16,6 @@ namespace Umbraco.Core.Persistence.Mappers
     {
         private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
 
-        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
-        // otherwise that would fail because there is no public constructor.
         public LanguageMapper()
         {
             BuildMap();
diff --git a/src/Umbraco.Core/Persistence/Mappers/MapperAttribute.cs b/src/Umbraco.Core/Persistence/Mappers/MapperAttribute.cs
deleted file mode 100644
index b9e033ac88..0000000000
--- a/src/Umbraco.Core/Persistence/Mappers/MapperAttribute.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Persistence.Mappers
-{
-    /// <summary>
-    /// An attribute used to decorate entities in order to associate with a mapper
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
-    internal sealed class MapperAttribute : Attribute
-    {
-        public Type MapperType { get; private set; }
-
-        public MapperAttribute(Type mapperType)
-        {
-            MapperType = mapperType;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Mappers/ModelDtoMapper.cs b/src/Umbraco.Core/Persistence/Mappers/ModelDtoMapper.cs
deleted file mode 100644
index 6f43b8e304..0000000000
--- a/src/Umbraco.Core/Persistence/Mappers/ModelDtoMapper.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Reflection;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Mappers
-{
-    internal class ModelDtoMapper : IMapper
-    {
-        public void GetTableInfo(Type t, TableInfo ti)
-        { }
-
-        public bool MapPropertyToColumn(PropertyInfo pi, ref string columnName, ref bool resultColumn)
-        {
-            if (pi.DeclaringType == typeof(Content) || pi.DeclaringType == typeof(IContent))
-            {
-                switch (pi.Name)
-                {
-                    case "Trashed":
-                        columnName = "[umbracoNode].[trashed]";
-                        return true;
-                    case "ParentId":
-                        columnName = "[umbracoNode].[parentID]";
-                        return true;
-                    case "UserId":
-                        columnName = "[umbracoNode].[nodeUser]";
-                        return true;
-                    case "Level":
-                        columnName = "[umbracoNode].[level]";
-                        return true;
-                    case "Path":
-                        columnName = "[umbracoNode].[path]";
-                        return true;
-                    case "SortOrder":
-                        columnName = "[umbracoNode].[sortOrder]";
-                        return true;
-                    case "NodeId":
-                        columnName = "[umbracoNode].[id]";
-                        return true;
-                    case "Published":
-                        columnName = "[cmsDocument].[published]";
-                        return true;
-                    case "Key":
-                        columnName = "[umbracoNode].[uniqueID]";
-                        return true;
-                    case "CreateDate":
-                        columnName = "[umbracoNode].[createDate]";
-                        return true;
-                    case "Name":
-                        columnName = "[umbracoNode].[text]";
-                        return true;
-                }
-            }
-
-            if (pi.DeclaringType == typeof(ContentType) || pi.DeclaringType == typeof(IContentType))
-            {
-                switch (pi.Name)
-                {
-                    case "Alias":
-                        columnName = "[cmsContentType].[alias]";
-                        return true;
-                    case "Icon":
-                        columnName = "[cmsContentType].[icon]";
-                        return true;
-                    case "Thumbnail":
-                        columnName = "[cmsContentType].[thumbnail]";
-                        return true;
-                    case "Description":
-                        columnName = "[cmsContentType].[description]";
-                        return true;
-                }
-            }
-
-            return true;
-        }
-
-        public Func<object, object> GetFromDbConverter(PropertyInfo pi, Type sourceType)
-        {
-            return null;
-        }
-
-        public Func<object, object> GetToDbConverter(Type sourceType)
-        {
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
index 36fadcf6a6..d447f6dfb7 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
@@ -72,13 +72,18 @@ namespace Umbraco.Core.Persistence.Repositories
             return "umbracoDomains.id = @Id";
         }
 
+        protected override void PersistDeletedItem(IDomain entity)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var factory = new DomainModelFactory();
+                repo.PersistDeletedItem(factory.BuildEntity(entity));
+            }
+        }
+
         protected override IEnumerable<string> GetDeleteClauses()
         {
-            var list = new List<string>
-                {
-                    "DELETE FROM umbracoDomain WHERE id = @Id"
-                };
-            return list;
+            throw new NotImplementedException();
         }
 
         protected override Guid NodeObjectTypeId
@@ -119,7 +124,7 @@ namespace Umbraco.Core.Persistence.Repositories
             }
         }
 
-        public IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards)
+        public IEnumerable<IDomain> GetAssignedDomains(int contentId, bool includeWildcards)
         {
             using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
             {
@@ -216,7 +221,11 @@ namespace Umbraco.Core.Persistence.Repositories
 
             protected override IEnumerable<string> GetDeleteClauses()
             {
-                return _domainRepo.GetDeleteClauses();
+                var list = new List<string>
+                {
+                    "DELETE FROM umbracoDomains WHERE id = @Id"
+                };
+                return list;
             }
 
             protected override Guid NodeObjectTypeId
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
index d19355632f..f4fcbdfdfc 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
@@ -6,6 +6,6 @@ namespace Umbraco.Core.Persistence.Repositories
     public interface IDomainRepository : IRepositoryQueryable<int, IDomain>
     {
         IEnumerable<IDomain> GetAll(bool includeWildcards);
-        IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards);
+        IEnumerable<IDomain> GetAssignedDomains(int contentId, bool includeWildcards);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index e5a99cf038..e2d465b955 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -22,12 +22,18 @@ using Umbraco.Core.Publishing;
 
 namespace Umbraco.Core.Services
 {
+    public interface IDomainService : IService
+    {
+        IEnumerable<IDomain> GetAll(bool includeWildcards);
+        IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards);
+    }
+
     /// <summary>
     /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
     /// </summary>
     public class ContentService : RepositoryService, IContentService
     {
-       
+
         private readonly IPublishingStrategy _publishingStrategy;
         private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
         private readonly IDataTypeService _dataTypeService;
diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs
new file mode 100644
index 0000000000..59432de2ba
--- /dev/null
+++ b/src/Umbraco.Core/Services/DomainService.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Services
+{
+    public class DomainService : RepositoryService, IDomainService
+    {
+        public DomainService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger)
+            : base(provider, repositoryFactory, logger)
+        {
+        }
+
+        public IEnumerable<IDomain> GetAll(bool includeWildcards)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 87f57ab344..b948e33201 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -324,6 +324,7 @@
     <Compile Include="Models\DoNotCloneAttribute.cs" />
     <Compile Include="Models\IDomain.cs" />
     <Compile Include="Persistence\Factories\TaskFactory.cs" />
+    <Compile Include="Persistence\Mappers\DomainMapper.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\RemoveStylesheetDataAndTables.cs" />
     <Compile Include="Persistence\Repositories\AuditRepository.cs" />
     <Compile Include="Persistence\Repositories\DomainRepository.cs" />
@@ -340,6 +341,7 @@
     <Compile Include="Logging\ProfilingLogger.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\MigrateStylesheetDataToFile.cs" />
     <Compile Include="Services\AuditService.cs" />
+    <Compile Include="Services\DomainService.cs" />
     <Compile Include="Services\IAuditService.cs" />
     <Compile Include="Services\ITaskService.cs" />
     <Compile Include="Services\RepositoryService.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index 351136c5e5..3385cb8ce5 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using umbraco.cms.businesslogic.contentitem;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
@@ -85,6 +86,41 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
 
 
+        }
+
+        [Test]
+        public void Can_Delete()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = langRepo.GetByIsoCode("en-AU");
+                var content = contentRepo.Get(contentId);
+
+                var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                repo.AddOrUpdate(domain);
+                unitOfWork.Commit();
+
+                repo.Delete(domain);
+                unitOfWork.Commit();
+
+                //re-get
+                domain = repo.Get(domain.Id);
+
+
+                Assert.IsNull(domain);                
+            }
+
+
         }
 
         [Test]
@@ -237,5 +273,107 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void Get_All_For_Content()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var contentItems = new List<IContent>();
+
+                var lang = langRepo.GetByIsoCode("en-AU");
+                contentItems.Add(contentRepo.Get(contentId));
+                
+                //more test data (3 content items total)
+                for (int i = 0; i < 2; i++)
+                {
+                    var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
+                    contentRepo.AddOrUpdate(c);
+                    unitOfWork.Commit();
+                    contentItems.Add(c);
+                }
+                
+                for (int i = 0; i < 10; i++)
+                {
+                    var domain = (IDomain)new UmbracoDomain
+                    {
+                        RootContent = (i % 2 == 0) ? contentItems[0] : contentItems[1],
+                        DefaultLanguage = lang,
+                        DomainName = (i % 2 == 0) ? "test " + i + ".com" : ("*" + i)
+                    };
+                    repo.AddOrUpdate(domain);
+                    unitOfWork.Commit();
+                }
+
+                var all1 = repo.GetAssignedDomains(contentItems[0].Id, true);
+                Assert.AreEqual(5, all1.Count());
+                
+                var all2 = repo.GetAssignedDomains(contentItems[1].Id, true);
+                Assert.AreEqual(5, all2.Count());
+
+                var all3 = repo.GetAssignedDomains(contentItems[2].Id, true);
+                Assert.AreEqual(0, all3.Count());
+            }
+        }
+
+        [Test]
+        public void Get_All_For_Content_Without_Wildcards()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var contentItems = new List<IContent>();
+
+                var lang = langRepo.GetByIsoCode("en-AU");
+                contentItems.Add(contentRepo.Get(contentId));
+
+                //more test data (3 content items total)
+                for (int i = 0; i < 2; i++)
+                {
+                    var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
+                    contentRepo.AddOrUpdate(c);
+                    unitOfWork.Commit();
+                    contentItems.Add(c);
+                }
+
+                for (int i = 0; i < 10; i++)
+                {
+                    var domain = (IDomain)new UmbracoDomain
+                    {
+                        RootContent = (i % 2 == 0) ? contentItems[0] : contentItems[1],
+                        DefaultLanguage = lang,
+                        DomainName = (i % 2 == 0) ? "test " + i + ".com" : ("*" + i)
+                    };
+                    repo.AddOrUpdate(domain);
+                    unitOfWork.Commit();
+                }
+
+                var all1 = repo.GetAssignedDomains(contentItems[0].Id, false);
+                Assert.AreEqual(5, all1.Count());
+
+                var all2 = repo.GetAssignedDomains(contentItems[1].Id, false);
+                Assert.AreEqual(0, all2.Count());
+
+            }
+        }
+
     }
 }
\ No newline at end of file

From ae92c8219d4a282ac1c392f4b6bcc3598831e54b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 18:35:08 +1100
Subject: [PATCH 09/18] Gets legacy domain api wrapping new api, updates
 DomainService with required methods.

---
 .../Repositories/DomainRepository.cs          |  13 +
 .../Interfaces/IDomainRepository.cs           |   1 +
 .../Persistence/RepositoryFactory.cs          |   4 +
 src/Umbraco.Core/Services/ContentService.cs   |   6 -
 src/Umbraco.Core/Services/DomainService.cs    |  76 +++++-
 src/Umbraco.Core/Services/IDomainService.cs   |  16 ++
 src/Umbraco.Core/Services/ServiceContext.cs   |  17 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 src/Umbraco.Tests/MockTests.cs                |   8 +-
 .../Repositories/DomainRepositoryTest.cs      |  34 +++
 .../businesslogic/language/Language.cs        |  43 ++--
 src/umbraco.cms/businesslogic/web/Domain.cs   | 229 ++++++++++--------
 12 files changed, 308 insertions(+), 140 deletions(-)
 create mode 100644 src/Umbraco.Core/Services/IDomainService.cs

diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
index d447f6dfb7..93d6d82341 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
@@ -114,6 +115,15 @@ namespace Umbraco.Core.Persistence.Repositories
             }
         }
 
+        public bool Exists(string domainName)
+        {
+            using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
+            {
+                var query = new Query<CacheableDomain>().Where(x => x.DomainName.InvariantEquals(domainName));
+                return repo.GetByQuery(query).Any();
+            }
+        }
+
         public IEnumerable<IDomain> GetAll(bool includeWildcards)
         {
             using (var repo = new CachedDomainRepository(this, UnitOfWork, RepositoryCache, Logger, SqlSyntax))
@@ -235,6 +245,9 @@ namespace Umbraco.Core.Persistence.Repositories
 
             protected override void PersistNewItem(CacheableDomain entity)
             {
+                var exists = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoDomains WHERE domainName = @domainName", new {domainName = entity.DomainName});
+                if (exists > 0) throw new DuplicateNameException(string.Format("The domain name {0} is already assigned", entity.DomainName));
+
                 entity.AddingEntity();
 
                 var factory = new DomainModelFactory();
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
index f4fcbdfdfc..030251d805 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
@@ -5,6 +5,7 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IDomainRepository : IRepositoryQueryable<int, IDomain>
     {
+        bool Exists(string domainName);
         IEnumerable<IDomain> GetAll(bool includeWildcards);
         IEnumerable<IDomain> GetAssignedDomains(int contentId, bool includeWildcards);
     }
diff --git a/src/Umbraco.Core/Persistence/RepositoryFactory.cs b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
index fa39f013ca..fbd91e5f31 100644
--- a/src/Umbraco.Core/Persistence/RepositoryFactory.cs
+++ b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
@@ -263,5 +263,9 @@ namespace Umbraco.Core.Persistence
             return new EntityRepository(uow);
         }
 
+        public IDomainRepository CreateDomainRepository(IDatabaseUnitOfWork uow)
+        {
+            return new DomainRepository(uow, _cacheHelper, _logger, _sqlSyntax, CreateContentRepository(uow), CreateLanguageRepository(uow));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index e2d465b955..f86739aeb8 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -22,12 +22,6 @@ using Umbraco.Core.Publishing;
 
 namespace Umbraco.Core.Services
 {
-    public interface IDomainService : IService
-    {
-        IEnumerable<IDomain> GetAll(bool includeWildcards);
-        IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards);
-    }
-
     /// <summary>
     /// Represents the Content Service, which is an easy access to operations involving <see cref="IContent"/>
     /// </summary>
diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs
index 59432de2ba..86d883bd48 100644
--- a/src/Umbraco.Core/Services/DomainService.cs
+++ b/src/Umbraco.Core/Services/DomainService.cs
@@ -1,12 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
 {
+    //TODO: Add events!
+
     public class DomainService : RepositoryService, IDomainService
     {
         public DomainService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger)
@@ -14,14 +18,78 @@ namespace Umbraco.Core.Services
         {
         }
 
-        public IEnumerable<IDomain> GetAll(bool includeWildcards)
+        public bool Exists(string domainName)
         {
-            throw new NotImplementedException();
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                return repo.Exists(domainName);
+            } 
         }
 
-        public IEnumerable<IDomain> GetDomainsForContent(int contentId, bool includeWildcards)
+        public void Delete(IDomain domain)
         {
-            throw new NotImplementedException();
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                repository.Delete(domain);
+                uow.Commit();
+            }
+        }
+
+        public IDomain GetByName(string name)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                return repository.GetByQuery(new Query<IDomain>().Where(x => x.DomainName.InvariantEquals(name))).FirstOrDefault();
+            }
+        }
+
+        public IDomain GetById(int id)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                return repo.Get(id);
+            }
+        }
+
+        public IEnumerable<IDomain> GetAll(bool includeWildcards)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                return repo.GetAll(includeWildcards);
+            }
+        }
+
+        public IEnumerable<IDomain> GetAssignedDomains(int contentId, bool includeWildcards)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                return repo.GetAssignedDomains(contentId, includeWildcards);
+            }
+        }
+
+        public void Save(IDomain domainEntity, bool raiseEvents = true)
+        {
+            if (raiseEvents)
+            {
+                //if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
+                //    return;
+            }
+
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateDomainRepository(uow))
+            {
+                repository.AddOrUpdate(domainEntity);
+                uow.Commit();
+            }
+
+            //if (raiseEvents)
+            //    Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/IDomainService.cs b/src/Umbraco.Core/Services/IDomainService.cs
new file mode 100644
index 0000000000..7026eca041
--- /dev/null
+++ b/src/Umbraco.Core/Services/IDomainService.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services
+{
+    public interface IDomainService : IService
+    {
+        bool Exists(string domainName);
+        void Delete(IDomain domain);
+        IDomain GetByName(string name);
+        IDomain GetById(int id);
+        IEnumerable<IDomain> GetAll(bool includeWildcards);
+        IEnumerable<IDomain> GetAssignedDomains(int contentId, bool includeWildcards);
+        void Save(IDomain domainEntity, bool raiseEvents = true);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index c4e2d83796..4cbe9e6b37 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Core.Services
     /// </summary>
     public class ServiceContext
     {
+        private Lazy<IDomainService> _domainService; 
         private Lazy<IAuditService> _auditService; 
         private Lazy<ILocalizedTextService> _localizedTextService;
         private Lazy<ITagService> _tagService;
@@ -60,6 +61,7 @@ namespace Umbraco.Core.Services
         /// <param name="notificationService"></param>
         /// <param name="localizedTextService"></param>
         /// <param name="auditService"></param>
+        /// <param name="domainService"></param>
         public ServiceContext(
             IContentService contentService, 
             IMediaService mediaService, 
@@ -79,7 +81,8 @@ namespace Umbraco.Core.Services
             ITagService tagService,
             INotificationService notificationService,             
             ILocalizedTextService localizedTextService,
-            IAuditService auditService)
+            IAuditService auditService,
+            IDomainService domainService)
         {
             _auditService = new Lazy<IAuditService>(() => auditService);
             _localizedTextService = new Lazy<ILocalizedTextService>(() => localizedTextService);     
@@ -100,6 +103,7 @@ namespace Umbraco.Core.Services
             _memberService = new Lazy<IMemberService>(() => memberService);
             _userService = new Lazy<IUserService>(() => userService);
             _notificationService = new Lazy<INotificationService>(() => notificationService);
+            _domainService = new Lazy<IDomainService>(() => domainService);
         }
 
         internal ServiceContext(
@@ -129,6 +133,9 @@ namespace Umbraco.Core.Services
             var provider = dbUnitOfWorkProvider;
             var fileProvider = fileUnitOfWorkProvider;
 
+            if (_domainService == null)
+                _domainService = new Lazy<IDomainService>(() => new DomainService(provider, repositoryFactory, logger));
+
             if (_auditService == null)
                 _auditService = new Lazy<IAuditService>(() => new AuditService(provider, repositoryFactory, logger));
 
@@ -198,6 +205,14 @@ namespace Umbraco.Core.Services
 
         }
 
+        /// <summary>
+        /// Gets the <see cref="IDomainService"/>
+        /// </summary>
+        public IDomainService DomainService
+        {
+            get { return _domainService.Value; }
+        }
+
         /// <summary>
         /// Gets the <see cref="IAuditService"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b948e33201..6fc8a8f888 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -343,6 +343,7 @@
     <Compile Include="Services\AuditService.cs" />
     <Compile Include="Services\DomainService.cs" />
     <Compile Include="Services\IAuditService.cs" />
+    <Compile Include="Services\IDomainService.cs" />
     <Compile Include="Services\ITaskService.cs" />
     <Compile Include="Services\RepositoryService.cs" />
     <Compile Include="Services\TaskService.cs" />
diff --git a/src/Umbraco.Tests/MockTests.cs b/src/Umbraco.Tests/MockTests.cs
index 68a01810fa..6a91efcb7b 100644
--- a/src/Umbraco.Tests/MockTests.cs
+++ b/src/Umbraco.Tests/MockTests.cs
@@ -54,6 +54,7 @@ namespace Umbraco.Tests
                 new RelationService(
                     new Mock<IDatabaseUnitOfWorkProvider>().Object,
                     new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), Mock.Of<IUmbracoSettingsSection>()),
+                    Mock.Of<ILogger>(), 
                     new Mock<IEntityService>().Object),
                 new Mock<IMemberGroupService>().Object,
                 new Mock<IMemberTypeService>().Object,
@@ -64,7 +65,8 @@ namespace Umbraco.Tests
                 new Mock<ITagService>().Object,
                 new Mock<INotificationService>().Object,
                 Mock.Of<ILocalizedTextService>(),
-                Mock.Of<IAuditService>());
+                Mock.Of<IAuditService>(),
+                Mock.Of<IDomainService>());
             Assert.Pass();
         }
 
@@ -103,6 +105,7 @@ namespace Umbraco.Tests
                     new RelationService(
                         new Mock<IDatabaseUnitOfWorkProvider>().Object,
                         new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), Mock.Of<IUmbracoSettingsSection>()),
+                        Mock.Of<ILogger>(), 
                         new Mock<IEntityService>().Object),
                     new Mock<IMemberGroupService>().Object,
                     new Mock<IMemberTypeService>().Object,
@@ -113,7 +116,8 @@ namespace Umbraco.Tests
                     new Mock<ITagService>().Object,
                     new Mock<INotificationService>().Object,
                     Mock.Of<ILocalizedTextService>(),
-                    Mock.Of<IAuditService>()),
+                    Mock.Of<IAuditService>(),
+                    Mock.Of<IDomainService>()),
                 CacheHelper.CreateDisabledCacheHelper(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
             
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index 3385cb8ce5..66f9589d31 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
@@ -86,6 +87,39 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
 
 
+        }
+
+        [Test]
+        public void Cant_Create_Duplicate_Domain_Name()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+
+            ContentType ct;
+            var contentId = CreateTestData("en-AU", out ct);
+
+            ContentRepository contentRepo;
+            LanguageRepository langRepo;
+            ContentTypeRepository contentTypeRepo;
+
+            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            {
+                var lang = langRepo.GetByIsoCode("en-AU");
+                var content = contentRepo.Get(contentId);
+
+                var domain1 = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                repo.AddOrUpdate(domain1);
+                unitOfWork.Commit();
+
+                var domain2 = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                repo.AddOrUpdate(domain2);
+
+                Assert.Throws<DuplicateNameException>(unitOfWork.Commit);
+
+
+            }
+
+
         }
 
         [Test]
diff --git a/src/umbraco.cms/businesslogic/language/Language.cs b/src/umbraco.cms/businesslogic/language/Language.cs
index c00fbbc85b..c5badc001b 100644
--- a/src/umbraco.cms/businesslogic/language/Language.cs
+++ b/src/umbraco.cms/businesslogic/language/Language.cs
@@ -6,6 +6,7 @@ using System.Xml;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Services;
 using umbraco.DataLayer;
@@ -28,7 +29,8 @@ namespace umbraco.cms.businesslogic.language
     {
         #region Private members
 
-        private Umbraco.Core.Models.ILanguage _lang;
+        internal ILanguage LanguageEntity { get; private set; }
+
         #endregion
 
         #region Constants and static members
@@ -54,8 +56,8 @@ namespace umbraco.cms.businesslogic.language
         /// <param name="id">The id.</param>
         public Language(int id)
         {
-            _lang = ApplicationContext.Current.Services.LocalizationService.GetLanguageById(id);
-            if (_lang == null)
+            LanguageEntity = ApplicationContext.Current.Services.LocalizationService.GetLanguageById(id);
+            if (LanguageEntity == null)
             {
                 throw new ArgumentException("No language found with the specified id");
             }
@@ -66,6 +68,11 @@ namespace umbraco.cms.businesslogic.language
         /// </summary>
         internal Language() { }
 
+        internal Language(ILanguage langEntity)
+        {
+            LanguageEntity = langEntity;
+        }
+
         #endregion
 
         #region Static methods
@@ -85,7 +92,7 @@ namespace umbraco.cms.businesslogic.language
                     CultureName = culture.DisplayName
                 };
                 ApplicationContext.Current.Services.LocalizationService.Save(lang);
-                var ct = new Language { _lang = lang };
+                var ct = new Language(lang);
                 ct.OnNew(new NewEventArgs());
             }
         }
@@ -111,10 +118,7 @@ namespace umbraco.cms.businesslogic.language
         /// </remarks>
         public static IEnumerable<Language> GetAllAsList()
         {
-            var all = ApplicationContext.Current.Services.LocalizationService.GetAllLanguages().Select(x => new Language
-            {
-                _lang = x
-            }).ToArray();
+            var all = ApplicationContext.Current.Services.LocalizationService.GetAllLanguages().Select(x => new Language(x)).ToArray();
             return all;
         }
       
@@ -128,10 +132,7 @@ namespace umbraco.cms.businesslogic.language
         {
             var found = ApplicationContext.Current.Services.LocalizationService.GetLanguageByIsoCode(cultureCode);
             if (found == null) return null;
-            var lang = new Language
-            {
-                _lang = found
-            };
+            var lang = new Language(found);
             return lang;
         }
 
@@ -174,7 +175,7 @@ namespace umbraco.cms.businesslogic.language
         /// </summary>
         public int id
         {
-            get { return _lang.Id; }
+            get { return LanguageEntity.Id; }
         }
 
         /// <summary>
@@ -182,10 +183,10 @@ namespace umbraco.cms.businesslogic.language
         /// </summary>
         public string CultureAlias
         {
-            get { return _lang.IsoCode; }
+            get { return LanguageEntity.IsoCode; }
             set
             {
-                _lang.IsoCode = value;
+                LanguageEntity.IsoCode = value;
             }
         }
 
@@ -194,7 +195,7 @@ namespace umbraco.cms.businesslogic.language
         /// </summary>
         public string FriendlyName
         {
-            get { return _lang.CultureInfo.DisplayName; }
+            get { return LanguageEntity.CultureInfo.DisplayName; }
         } 
         #endregion
 
@@ -233,7 +234,7 @@ namespace umbraco.cms.businesslogic.language
             FireBeforeSave(e);
 
             //Do the update!
-            ApplicationContext.Current.Services.LocalizationService.Save(_lang);
+            ApplicationContext.Current.Services.LocalizationService.Save(LanguageEntity);
 
             if (!e.Cancel)
             {
@@ -258,15 +259,15 @@ namespace umbraco.cms.businesslogic.language
 
                 if (!e.Cancel)
                 {
-                    ApplicationContext.Current.Services.LocalizationService.Delete(_lang);
+                    ApplicationContext.Current.Services.LocalizationService.Delete(LanguageEntity);
 
                     FireAfterDelete(e);
                 }
             }
             else
             {
-                var e = new DataException("Cannot remove language " + _lang.CultureInfo.DisplayName + " because it's attached to a domain on a node");
-                LogHelper.Error<Language>("Cannot remove language " + _lang.CultureInfo.DisplayName + " because it's attached to a domain on a node", e);
+                var e = new DataException("Cannot remove language " + LanguageEntity.CultureInfo.DisplayName + " because it's attached to a domain on a node");
+                LogHelper.Error<Language>("Cannot remove language " + LanguageEntity.CultureInfo.DisplayName + " because it's attached to a domain on a node", e);
                 throw e;
             }           
         }
@@ -279,7 +280,7 @@ namespace umbraco.cms.businesslogic.language
         public XmlNode ToXml(XmlDocument xd)
         {
             var serializer = new EntityXmlSerializer();
-            var xml = serializer.Serialize(_lang);
+            var xml = serializer.Serialize(LanguageEntity);
             return xml.GetXmlNode(xd);
         } 
         #endregion
diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs
index 27d3f3bde4..eea2fc2bb8 100644
--- a/src/umbraco.cms/businesslogic/web/Domain.cs
+++ b/src/umbraco.cms/businesslogic/web/Domain.cs
@@ -2,17 +2,18 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.BusinessLogic.Actions;
 using umbraco.cms.businesslogic.cache;
-using umbraco.cms.businesslogic.language;
+using Umbraco.Core.Models;
 using umbraco.interfaces;
 using umbraco.DataLayer;
 using System.Runtime.CompilerServices;
-
+using Language = umbraco.cms.businesslogic.language.Language;
 
 
 namespace umbraco.cms.businesslogic.web
@@ -20,97 +21,90 @@ namespace umbraco.cms.businesslogic.web
     /// <summary>
     /// Summary description for Domain.
     /// </summary>
-    [Obsolete("Use Umbraco.Core.Models.IDomain instead")]
+    [Obsolete("Use Umbraco.Core.Models.IDomain and Umbraco.Core.Services.IDomainService instead")]
     public class Domain
     {
-        private Language _language;
-        private string _name;
-        private int _root;
-        private int _id;
-
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
+        public IDomain DomainEntity { get; set; }
+        //private Language _language;
+        //private string _name;
+        //private int _root;
+        //private int _id;
 
 		/// <summary>
 		/// Empty ctor used for unit tests to create a custom domain
 		/// </summary>
 		internal Domain()
-		{
-			
+		{			
 		}
 
-		public Domain(int Id)
+        internal Domain(IDomain domain)
         {
-            InitDomain(Id);
+            DomainEntity = domain;
+        }
+
+        public Domain(int Id)
+        {
+            DomainEntity = ApplicationContext.Current.Services.DomainService.GetById(Id);
+            if (DomainEntity == null)
+            {
+                throw new Exception(string.Format("Domain name '{0}' does not exists", Id));
+            }
         }
 
         public Domain(string DomainName)
         {
-            object result = SqlHelper.ExecuteScalar<object>(
-				"select id from umbracoDomains where domainName = @DomainName",
-				SqlHelper.CreateParameter("@DomainName", DomainName));
-            if (result == null || !(result is int))
-                throw new Exception(string.Format("Domain name '{0}' does not exists", DomainName));
-            InitDomain((int) result);
-        }
-
-        private void InitDomain(int id)
-        {
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(
-				"select domainDefaultLanguage, domainRootStructureID, domainName from umbracoDomains where id = @ID",
-				SqlHelper.CreateParameter("@ID", id)))
+            DomainEntity = ApplicationContext.Current.Services.DomainService.GetByName(DomainName);
+            if (DomainEntity == null)
             {
-                if (dr.Read())
-                {
-                    _id = id;
-                    _language = new Language(dr.GetInt("domainDefaultLanguage"));
-                    _name = dr.GetString("domainName");
-                    _root = dr.GetInt("domainRootStructureID");
-                }
+                throw new Exception(string.Format("Domain name '{0}' does not exists", DomainName));
             }
         }
 
+        //private void InitDomain(int id)
+        //{
+        //    using (IRecordsReader dr = SqlHelper.ExecuteReader(
+        //        "select domainDefaultLanguage, domainRootStructureID, domainName from umbracoDomains where id = @ID",
+        //        SqlHelper.CreateParameter("@ID", id)))
+        //    {
+        //        if (dr.Read())
+        //        {
+        //            _id = id;
+        //            _language = new Language(dr.GetInt("domainDefaultLanguage"));
+        //            _name = dr.GetString("domainName");
+        //            _root = dr.GetInt("domainRootStructureID");
+        //        }
+        //    }
+        //}
+
         public string Name
         {
-            get { return _name; }
-            set
-            {
-                SqlHelper.ExecuteNonQuery("update umbracoDomains set domainName = @domainName where id = @id",
-                                          SqlHelper.CreateParameter("@domainName", value),
-                                          SqlHelper.CreateParameter("@id",_id));
-                _name = value;
-            }
+            get { return DomainEntity.DomainName; }
+            set { DomainEntity.DomainName = value; }
         }
 
         public Language Language
         {
-            get { return _language; }
-            set
-            {
-                SqlHelper.ExecuteNonQuery("update umbracoDomains set domainDefaultLanguage = @language where id = @id",
-                                          SqlHelper.CreateParameter("@language", value.id),
-                                          SqlHelper.CreateParameter("@id", _id));
-                _language = value;
-            }
+            get { return new Language(DomainEntity.DefaultLanguage); }
+            set { DomainEntity.DefaultLanguage = value.LanguageEntity; }
         }
 
         public int RootNodeId
         {
-            get { return _root; }
+            get { return DomainEntity.RootContent.Id; }
             set
             {
-                SqlHelper.ExecuteNonQuery(string.Format(
-                                            "update umbracoDomains set domainRootStructureID = '{0}' where id = {1}",
-                                            value, _id));
-                _root = value;
+                var content = ApplicationContext.Current.Services.ContentService.GetById(value);
+                if (content == null)
+                {
+                    throw new NullReferenceException("No content found with id " + value);
+                }
+                DomainEntity.RootContent = content;
             }
         }
 
         public int Id
         {
-            get { return _id; }
+            get { return DomainEntity.Id; }
         }
 
         public void Delete()
@@ -118,9 +112,10 @@ namespace umbraco.cms.businesslogic.web
             var e = new DeleteEventArgs();
             FireBeforeDelete(e);
 
-            if (!e.Cancel) 
+            if (!e.Cancel)
             {
-                SqlHelper.ExecuteNonQuery(string.Format("delete from umbracoDomains where id = {0}", Id));
+                ApplicationContext.Current.Services.DomainService.Delete(DomainEntity);
+
                 FireAfterDelete(e);
             }
         }
@@ -130,8 +125,9 @@ namespace umbraco.cms.businesslogic.web
             FireBeforeSave(e);
 
             if (!e.Cancel) 
-            {              
-                //Add save method here at some point so this actually does something besides fire events... 
+            {
+                ApplicationContext.Current.Services.DomainService.Save(DomainEntity);
+
                 FireAfterSave(e);
             }
         }
@@ -146,80 +142,101 @@ namespace umbraco.cms.businesslogic.web
 
         public static IEnumerable<Domain> GetDomains(bool includeWildcards)
         {
-            var domains = ApplicationContext.Current.ApplicationCache.GetCacheItem(
-                CacheKeys.DomainCacheKey,
-                TimeSpan.FromMinutes(30),
-                () =>
-                    {
-                        var result = new List<Domain>();
-                        using (var dr = SqlHelper.ExecuteReader("SELECT id, domainName FROM umbracoDomains ORDER BY id"))
-                        {
-                            while (dr.Read())
-                            {
-                                var domainName = dr.GetString("domainName");
-                                var domainId = dr.GetInt("id");
-                                if (result.Find(d => d.Name == domainName) == null)
-                                    result.Add(new Domain(domainId));
-                                else
-                                {
-                                    LogHelper.Warn<Domain>(string.Format("Domain already exists in list ({0})", domainName));
-                                }
-                            }
-                        }
-                        return result;
-                    });
+            return ApplicationContext.Current.Services.DomainService.GetAll(includeWildcards)
+                .Select(x => new Domain(x));
 
-            if (!includeWildcards)
-                domains = domains.Where(d => !d.IsWildcard).ToList();
+            //var domains = ApplicationContext.Current.ApplicationCache.GetCacheItem(
+            //    CacheKeys.DomainCacheKey,
+            //    TimeSpan.FromMinutes(30),
+            //    () =>
+            //        {
+            //            var result = new List<Domain>();
+            //            using (var dr = SqlHelper.ExecuteReader("SELECT id, domainName FROM umbracoDomains ORDER BY id"))
+            //            {
+            //                while (dr.Read())
+            //                {
+            //                    var domainName = dr.GetString("domainName");
+            //                    var domainId = dr.GetInt("id");
+            //                    if (result.Find(d => d.Name == domainName) == null)
+            //                        result.Add(new Domain(domainId));
+            //                    else
+            //                    {
+            //                        LogHelper.Warn<Domain>(string.Format("Domain already exists in list ({0})", domainName));
+            //                    }
+            //                }
+            //            }
+            //            return result;
+            //        });
 
-            return domains;
+            //if (!includeWildcards)
+            //    domains = domains.Where(d => !d.IsWildcard).ToList();
+
+            //return domains;
         }
 
         public static Domain GetDomain(string DomainName)
         {
-            return GetDomains().FirstOrDefault(d => d.Name.InvariantEquals(DomainName));
+            var found = ApplicationContext.Current.Services.DomainService.GetByName(DomainName);
+            return found == null ? null : new Domain(found);
         }
 
         public static int GetRootFromDomain(string DomainName)
         {
-        	Domain d = GetDomain(DomainName);
-			if (d == null) return -1;
-        	return d._root;
+            var found = ApplicationContext.Current.Services.DomainService.GetByName(DomainName);
+            return found == null ? -1 : found.RootContent.Id;
         }
 
         public static Domain[] GetDomainsById(int nodeId)
         {
-			return GetDomains().Where(d => d._root == nodeId).ToArray();
+            return ApplicationContext.Current.Services.DomainService.GetAssignedDomains(nodeId, true)
+                .Select(x => new Domain(x))
+                .ToArray();
         }
 
         public static Domain[] GetDomainsById(int nodeId, bool includeWildcards)
         {
-            return GetDomains(includeWildcards).Where(d => d._root == nodeId).ToArray();
+            return ApplicationContext.Current.Services.DomainService.GetAssignedDomains(nodeId, includeWildcards)
+                .Select(x => new Domain(x))
+                .ToArray();
         }
 
         public static bool Exists(string DomainName)
         {
-			return GetDomain(DomainName) != null;
+            return ApplicationContext.Current.Services.DomainService.Exists(DomainName);
         }
 
         public static void MakeNew(string DomainName, int RootNodeId, int LanguageId)
         {
-            if (Exists(DomainName.ToLower()))
-                throw new Exception("Domain " + DomainName + " already exists!");
-            
-            //need to check if the language exists first
-            if (Language.GetAllAsList().SingleOrDefault(x => x.id == LanguageId) == null)
+            var content = ApplicationContext.Current.Services.ContentService.GetById(RootNodeId);
+            if (content == null) throw new NullReferenceException("No content exists with id " + RootNodeId);
+            var lang = ApplicationContext.Current.Services.LocalizationService.GetLanguageById(LanguageId);
+            if (lang == null) throw new NullReferenceException("No language exists with id " + LanguageId);
+
+            var domain = new UmbracoDomain
             {
-                throw new ArgumentException("No language exists for the LanguageId specified");
-            }
+                DomainName = DomainName,
+                RootContent = content,
+                DefaultLanguage = lang
+            };
+            ApplicationContext.Current.Services.DomainService.Save(domain);
+
+            //if (Exists(DomainName.ToLower()))
+            //    throw new Exception("Domain " + DomainName + " already exists!");
+            
+            ////need to check if the language exists first
+            //if (Language.GetAllAsList().SingleOrDefault(x => x.id == LanguageId) == null)
+            //{
+            //    throw new ArgumentException("No language exists for the LanguageId specified");
+            //}
                 
-            SqlHelper.ExecuteNonQuery("insert into umbracoDomains (domainDefaultLanguage, domainRootStructureID, domainName) values (@domainDefaultLanguage, @domainRootStructureID, @domainName)",
-                                      SqlHelper.CreateParameter("@domainDefaultLanguage", LanguageId),
-                                      SqlHelper.CreateParameter("@domainRootStructureID", RootNodeId),
-                                      SqlHelper.CreateParameter("@domainName", DomainName.ToLower()));
+            //SqlHelper.ExecuteNonQuery("insert into umbracoDomains (domainDefaultLanguage, domainRootStructureID, domainName) values (@domainDefaultLanguage, @domainRootStructureID, @domainName)",
+            //                          SqlHelper.CreateParameter("@domainDefaultLanguage", LanguageId),
+            //                          SqlHelper.CreateParameter("@domainRootStructureID", RootNodeId),
+            //                          SqlHelper.CreateParameter("@domainName", DomainName.ToLower()));
 
             var e = new NewEventArgs();
-            new Domain(DomainName).OnNew(e);
+            var legacyModel = new Domain(domain);
+            legacyModel.OnNew(e);
         }
 
         #endregion

From 6b9930df6ade7d3ccdd2efbefd988b91ce173ab2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 18:36:57 +1100
Subject: [PATCH 10/18] removed commented out code

---
 src/umbraco.cms/businesslogic/web/Domain.cs | 66 +--------------------
 1 file changed, 2 insertions(+), 64 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs
index eea2fc2bb8..17df5fd194 100644
--- a/src/umbraco.cms/businesslogic/web/Domain.cs
+++ b/src/umbraco.cms/businesslogic/web/Domain.cs
@@ -25,11 +25,7 @@ namespace umbraco.cms.businesslogic.web
     public class Domain
     {
         public IDomain DomainEntity { get; set; }
-        //private Language _language;
-        //private string _name;
-        //private int _root;
-        //private int _id;
-
+       
 		/// <summary>
 		/// Empty ctor used for unit tests to create a custom domain
 		/// </summary>
@@ -60,22 +56,6 @@ namespace umbraco.cms.businesslogic.web
             }
         }
 
-        //private void InitDomain(int id)
-        //{
-        //    using (IRecordsReader dr = SqlHelper.ExecuteReader(
-        //        "select domainDefaultLanguage, domainRootStructureID, domainName from umbracoDomains where id = @ID",
-        //        SqlHelper.CreateParameter("@ID", id)))
-        //    {
-        //        if (dr.Read())
-        //        {
-        //            _id = id;
-        //            _language = new Language(dr.GetInt("domainDefaultLanguage"));
-        //            _name = dr.GetString("domainName");
-        //            _root = dr.GetInt("domainRootStructureID");
-        //        }
-        //    }
-        //}
-
         public string Name
         {
             get { return DomainEntity.DomainName; }
@@ -144,34 +124,6 @@ namespace umbraco.cms.businesslogic.web
         {
             return ApplicationContext.Current.Services.DomainService.GetAll(includeWildcards)
                 .Select(x => new Domain(x));
-
-            //var domains = ApplicationContext.Current.ApplicationCache.GetCacheItem(
-            //    CacheKeys.DomainCacheKey,
-            //    TimeSpan.FromMinutes(30),
-            //    () =>
-            //        {
-            //            var result = new List<Domain>();
-            //            using (var dr = SqlHelper.ExecuteReader("SELECT id, domainName FROM umbracoDomains ORDER BY id"))
-            //            {
-            //                while (dr.Read())
-            //                {
-            //                    var domainName = dr.GetString("domainName");
-            //                    var domainId = dr.GetInt("id");
-            //                    if (result.Find(d => d.Name == domainName) == null)
-            //                        result.Add(new Domain(domainId));
-            //                    else
-            //                    {
-            //                        LogHelper.Warn<Domain>(string.Format("Domain already exists in list ({0})", domainName));
-            //                    }
-            //                }
-            //            }
-            //            return result;
-            //        });
-
-            //if (!includeWildcards)
-            //    domains = domains.Where(d => !d.IsWildcard).ToList();
-
-            //return domains;
         }
 
         public static Domain GetDomain(string DomainName)
@@ -220,20 +172,6 @@ namespace umbraco.cms.businesslogic.web
             };
             ApplicationContext.Current.Services.DomainService.Save(domain);
 
-            //if (Exists(DomainName.ToLower()))
-            //    throw new Exception("Domain " + DomainName + " already exists!");
-            
-            ////need to check if the language exists first
-            //if (Language.GetAllAsList().SingleOrDefault(x => x.id == LanguageId) == null)
-            //{
-            //    throw new ArgumentException("No language exists for the LanguageId specified");
-            //}
-                
-            //SqlHelper.ExecuteNonQuery("insert into umbracoDomains (domainDefaultLanguage, domainRootStructureID, domainName) values (@domainDefaultLanguage, @domainRootStructureID, @domainName)",
-            //                          SqlHelper.CreateParameter("@domainDefaultLanguage", LanguageId),
-            //                          SqlHelper.CreateParameter("@domainRootStructureID", RootNodeId),
-            //                          SqlHelper.CreateParameter("@domainName", DomainName.ToLower()));
-
             var e = new NewEventArgs();
             var legacyModel = new Domain(domain);
             legacyModel.OnNew(e);
@@ -292,7 +230,7 @@ namespace umbraco.cms.businesslogic.web
         /// <returns>A value indicating whether the domain is a wildcard domain.</returns>
         public bool IsWildcard
         {
-            get { return string.IsNullOrWhiteSpace(Name) || Name.StartsWith("*"); }
+            get { return DomainEntity.IsWildcard; }
         }
 
         #endregion

From e13e86b25f403a21c5d9ab7daf509d7a21a62370 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 21 Jan 2015 19:49:22 +1100
Subject: [PATCH 11/18] Gets the legacy domain stuff wrapping the new apis,
 updates the DomainHelper to use the new apis without any statics and thus
 updates everything else referencing that, updates the pcr engine to have the
 propery ctor params with all required services instead of using statics.

---
 src/Umbraco.Core/Models/IDomain.cs            |  2 +-
 src/Umbraco.Core/Models/UmbracoDomain.cs      |  4 +-
 .../Repositories/DomainRepository.cs          |  6 +-
 .../Repositories/LanguageRepository.cs        |  5 +
 .../Repositories/DomainRepositoryTest.cs      | 26 +++---
 .../PublishedContentRequestEngineTests.cs     | 27 +++++-
 .../PublishedContentCache.cs                  | 18 ++--
 src/Umbraco.Web/Routing/AliasUrlProvider.cs   |  6 +-
 src/Umbraco.Web/Routing/DefaultUrlProvider.cs | 10 +-
 src/Umbraco.Web/Routing/DomainAndUri.cs       | 35 +++++--
 src/Umbraco.Web/Routing/DomainHelper.cs       | 72 ++++++--------
 .../Routing/PublishedContentRequest.cs        | 23 +++--
 .../Routing/PublishedContentRequestEngine.cs  | 93 +++++++++++--------
 src/Umbraco.Web/Routing/SiteDomainHelper.cs   |  1 -
 .../WebServices/DomainsApiController.cs       | 54 ++++++++---
 .../umbraco/dialogs/AssignDomain2.aspx.cs     | 15 +--
 src/umbraco.cms/businesslogic/web/Domain.cs   |  6 +-
 17 files changed, 249 insertions(+), 154 deletions(-)

diff --git a/src/Umbraco.Core/Models/IDomain.cs b/src/Umbraco.Core/Models/IDomain.cs
index 29978d9cf6..9fb3e8019d 100644
--- a/src/Umbraco.Core/Models/IDomain.cs
+++ b/src/Umbraco.Core/Models/IDomain.cs
@@ -4,7 +4,7 @@ namespace Umbraco.Core.Models
 {
     public interface IDomain : IAggregateRoot, IRememberBeingDirty, ICanBeDirty
     {
-        ILanguage DefaultLanguage { get; set; }
+        ILanguage Language { get; set; }
         string DomainName { get; set; }
         IContent RootContent { get; set; }
         bool IsWildcard { get; }
diff --git a/src/Umbraco.Core/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
index 90c94cb4c6..d2f5772e93 100644
--- a/src/Umbraco.Core/Models/UmbracoDomain.cs
+++ b/src/Umbraco.Core/Models/UmbracoDomain.cs
@@ -15,12 +15,12 @@ namespace Umbraco.Core.Models
         private ILanguage _language;
         private string _domainName;
 
-        private static readonly PropertyInfo DefaultLanguageSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, ILanguage>(x => x.DefaultLanguage);
+        private static readonly PropertyInfo DefaultLanguageSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, ILanguage>(x => x.Language);
         private static readonly PropertyInfo DomainNameSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, string>(x => x.DomainName);
         private static readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, IContent>(x => x.RootContent);
 
         [DataMember]
-        public ILanguage DefaultLanguage
+        public ILanguage Language
         {
             get { return _language; }
             set
diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
index 93d6d82341..fd29c81c71 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
@@ -294,7 +294,7 @@ namespace Umbraco.Core.Persistence.Repositories
                     {
                         Id = cacheableDomain.Id,
                         //lookup from repo - this will be cached
-                        DefaultLanguage = cacheableDomain.DefaultLanguageId.HasValue ? langItems.FirstOrDefault(l => l.Id == cacheableDomain.DefaultLanguageId.Value) : null,
+                        Language = cacheableDomain.DefaultLanguageId.HasValue ? langItems.FirstOrDefault(l => l.Id == cacheableDomain.DefaultLanguageId.Value) : null,
                         DomainName = cacheableDomain.DomainName,
                         //lookup from repo - this will be cached
                         RootContent = cacheableDomain.RootContentId.HasValue ? contentItems.FirstOrDefault(l => l.Id == cacheableDomain.RootContentId.Value) : null,
@@ -309,7 +309,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 {
                     Id = cacheableDomain.Id,
                     //lookup from repo - this will be cached
-                    DefaultLanguage = cacheableDomain.DefaultLanguageId.HasValue ? languageRepository.Get(cacheableDomain.DefaultLanguageId.Value) : null,
+                    Language = cacheableDomain.DefaultLanguageId.HasValue ? languageRepository.Get(cacheableDomain.DefaultLanguageId.Value) : null,
                     DomainName = cacheableDomain.DomainName,
                     //lookup from repo - this will be cached
                     RootContent = cacheableDomain.RootContentId.HasValue ? contentRepository.Get(cacheableDomain.RootContentId.Value) : null
@@ -321,7 +321,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 var domain = new CacheableDomain
                 {
                     Id = entity.Id,
-                    DefaultLanguageId = entity.DefaultLanguage == null ? null : (int?)entity.DefaultLanguage.Id,
+                    DefaultLanguageId = entity.Language == null ? null : (int?)entity.Language.Id,
                     DomainName = entity.DomainName,
                     RootContentId = entity.RootContent == null ? null : (int?)entity.RootContent.Id
                 };
diff --git a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
index 7e74c2a0d0..1403d5e6c4 100644
--- a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
@@ -51,6 +51,11 @@ namespace Umbraco.Core.Persistence.Repositories
                 sql.Where("umbracoLanguage.id in (@ids)", new { ids = ids });
             }
 
+            //this needs to be sorted since that is the way legacy worked - default language is the first one!!
+            //even though legacy didn't sort, it should be by id
+            sql.OrderBy<LanguageDto>(dto => dto.Id, SqlSyntax);
+
+            
             return Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto);
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index 66f9589d31..af0c3b86b5 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -71,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
-                var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -83,7 +83,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.Greater(domain.Id, 0);
                 Assert.AreEqual("test.com", domain.DomainName);
                 Assert.AreEqual(content.Id, domain.RootContent.Id);
-                Assert.AreEqual(lang.Id, domain.DefaultLanguage.Id);
+                Assert.AreEqual(lang.Id, domain.Language.Id);
             }
 
 
@@ -107,11 +107,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
-                var domain1 = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                var domain1 = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
                 repo.AddOrUpdate(domain1);
                 unitOfWork.Commit();
 
-                var domain2 = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                var domain2 = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
                 repo.AddOrUpdate(domain2);
 
                 Assert.Throws<DuplicateNameException>(unitOfWork.Commit);
@@ -140,7 +140,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
-                var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test.com" };
+                var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -183,7 +183,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
 
 
-                var domain = (IDomain)new UmbracoDomain { RootContent = content1, DefaultLanguage = lang1, DomainName = "test.com" };
+                var domain = (IDomain)new UmbracoDomain { RootContent = content1, Language = lang1, DomainName = "test.com" };
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -192,7 +192,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 domain.DomainName = "blah.com";
                 domain.RootContent = content2;
-                domain.DefaultLanguage = lang2;
+                domain.Language = lang2;
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -201,7 +201,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 Assert.AreEqual("blah.com", domain.DomainName);
                 Assert.AreEqual(content2.Id, domain.RootContent.Id);
-                Assert.AreEqual(lang2.Id, domain.DefaultLanguage.Id);
+                Assert.AreEqual(lang2.Id, domain.Language.Id);
             }
 
 
@@ -227,7 +227,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test " + i + ".com" };
+                    var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test " + i + ".com" };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
                 }
@@ -259,7 +259,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var ids = new List<int>();
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain { RootContent = content, DefaultLanguage = lang, DomainName = "test " + i + ".com" };
+                    var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test " + i + ".com" };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
                     ids.Add(domain.Id);
@@ -294,7 +294,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     var domain = (IDomain)new UmbracoDomain
                     {
                         RootContent = content,
-                        DefaultLanguage = lang,
+                        Language = lang,
                         DomainName =  (i%2==0) ? "test " + i + ".com" : ("*" + i)
                     };
                     repo.AddOrUpdate(domain);
@@ -341,7 +341,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     var domain = (IDomain)new UmbracoDomain
                     {
                         RootContent = (i % 2 == 0) ? contentItems[0] : contentItems[1],
-                        DefaultLanguage = lang,
+                        Language = lang,
                         DomainName = (i % 2 == 0) ? "test " + i + ".com" : ("*" + i)
                     };
                     repo.AddOrUpdate(domain);
@@ -393,7 +393,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     var domain = (IDomain)new UmbracoDomain
                     {
                         RootContent = (i % 2 == 0) ? contentItems[0] : contentItems[1],
-                        DefaultLanguage = lang,
+                        Language = lang,
                         DomainName = (i % 2 == 0) ? "test " + i + ".com" : ("*" + i)
                     };
                     repo.AddOrUpdate(domain);
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentRequestEngineTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentRequestEngineTests.cs
index 25fa7df5f7..ff72ad1d1e 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentRequestEngineTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentRequestEngineTests.cs
@@ -16,7 +16,11 @@ namespace Umbraco.Tests.PublishedContent
         [Test]
         public void Ctor_Throws_On_Null_PCR()
         {
-            Assert.Throws<ArgumentException>(() => new PublishedContentRequestEngine(null));
+            Assert.Throws<ArgumentException>(() => new PublishedContentRequestEngine(
+                ServiceContext.DomainService,
+                ServiceContext.LocalizationService,
+                ProfilingLogger,
+                null));
         }
 
         [Test]
@@ -25,6 +29,9 @@ namespace Umbraco.Tests.PublishedContent
             var routeCtx = GetRoutingContext("/test");
 
             var pcre = new PublishedContentRequestEngine(
+                ServiceContext.DomainService,
+                ServiceContext.LocalizationService,
+                ProfilingLogger,
                 new PublishedContentRequest(
                     routeCtx.UmbracoContext.CleanedUmbracoUrl, routeCtx));
 
@@ -42,7 +49,11 @@ namespace Umbraco.Tests.PublishedContent
             pcr.PublishedContent = pc.Object;
             pcr.Culture = new CultureInfo("en-AU");
             pcr.SetRedirect("/hello");
-            var pcre = new PublishedContentRequestEngine(pcr);
+            var pcre = new PublishedContentRequestEngine(
+                ServiceContext.DomainService,
+                ServiceContext.LocalizationService,
+                ProfilingLogger,
+                pcr);
 
             var result = pcre.ConfigureRequest();
             Assert.IsFalse(result);
@@ -57,7 +68,11 @@ namespace Umbraco.Tests.PublishedContent
             var pc = GetPublishedContentMock();
             pcr.PublishedContent = pc.Object;
             pcr.Culture = new CultureInfo("en-AU");
-            var pcre = new PublishedContentRequestEngine(pcr);
+            var pcre = new PublishedContentRequestEngine(
+                ServiceContext.DomainService,
+                ServiceContext.LocalizationService,
+                ProfilingLogger,
+                pcr);
 
             pcre.ConfigureRequest();
             
@@ -74,7 +89,11 @@ namespace Umbraco.Tests.PublishedContent
             var pc = GetPublishedContentMock();
             pcr.Culture = new CultureInfo("en-AU");
             pcr.PublishedContent = pc.Object;
-            var pcre = new PublishedContentRequestEngine(pcr);
+            var pcre = new PublishedContentRequestEngine(
+                ServiceContext.DomainService,
+                ServiceContext.LocalizationService,
+                ProfilingLogger,
+                pcr);
 
             pcre.ConfigureRequest();
 
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
index f3b133a645..71c27f2bee 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
@@ -54,10 +54,12 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             content = content ?? DetermineIdByRoute(umbracoContext, preview, route, hideTopLevelNode.Value);
 
             // cache if we have a content and not previewing
-            if (content != null && !preview)
+            if (content != null && preview == false)
             {
                 var domainRootNodeId = route.StartsWith("/") ? -1 : int.Parse(route.Substring(0, route.IndexOf('/')));
-                var iscanon = !UnitTesting && !DomainHelper.ExistsDomainInPath(DomainHelper.GetAllDomains(false), content.Path, domainRootNodeId);
+                var iscanon = 
+                    UnitTesting == false 
+                    && DomainHelper.ExistsDomainInPath(umbracoContext.Application.Services.DomainService.GetAll(false), content.Path, domainRootNodeId) == false;
                 // and only if this is the canonical url (the one GetUrl would return)
                 if (iscanon)
                     _routesCache.Store(contentId, route);
@@ -79,7 +81,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             route = DetermineRouteById(umbracoContext, preview, contentId);
 
             // cache if we have a route and not previewing
-            if (route != null && !preview)
+            if (route != null && preview == false)
                 _routesCache.Store(contentId, route);
 
             return route;
@@ -120,12 +122,14 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             if (node == null)
                 return null;
 
+            var domainHelper = new DomainHelper(umbracoContext.Application.Services.DomainService);
+
             // walk up from that node until we hit a node with a domain,
             // or we reach the content root, collecting urls in the way
             var pathParts = new List<string>();
             var n = node;
-            var hasDomains = DomainHelper.NodeHasDomains(n.Id);
-            while (!hasDomains && n != null) // n is null at root
+            var hasDomains = domainHelper.NodeHasDomains(n.Id);
+            while (hasDomains == false && n != null) // n is null at root
             {
                 // get the url
                 var urlName = n.UrlName;
@@ -133,11 +137,11 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
                 // move to parent node
                 n = n.Parent;
-                hasDomains = n != null && DomainHelper.NodeHasDomains(n.Id);
+                hasDomains = n != null && domainHelper.NodeHasDomains(n.Id);
             }
 
             // no domain, respect HideTopLevelNodeFromPath for legacy purposes
-            if (!hasDomains && global::umbraco.GlobalSettings.HideTopLevelNodeFromPath)
+            if (hasDomains == false && global::umbraco.GlobalSettings.HideTopLevelNodeFromPath)
                 ApplyHideTopLevelNodeFromPath(umbracoContext, node, pathParts);
 
             // assemble the route
diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
index d8846afd60..6629b96c6a 100644
--- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
@@ -62,13 +62,15 @@ namespace Umbraco.Web.Routing
             if (string.IsNullOrWhiteSpace(umbracoUrlName))
                 return Enumerable.Empty<string>();
 
+            var domainHelper = new DomainHelper(umbracoContext.Application.Services.DomainService);
+
             var n = node;
-            var domainUris = DomainHelper.DomainsForNode(n.Id, current, false);
+            var domainUris = domainHelper.DomainsForNode(n.Id, current, false);
             while (domainUris == null && n != null) // n is null at root
             {
                 // move to parent node
                 n = n.Parent;
-                domainUris = n == null ? null : DomainHelper.DomainsForNode(n.Id, current, false);
+                domainUris = n == null ? null : domainHelper.DomainsForNode(n.Id, current, false);
             }
 
             var path = "/" + umbracoUrlName;
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index 41cadbf2f9..13855e80b3 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -46,11 +46,15 @@ namespace Umbraco.Web.Routing
                 return null;
             }
 
+            var domainHelper = new DomainHelper(umbracoContext.Application.Services.DomainService);
+
             // extract domainUri and path
             // route is /<path> or <domainRootId>/<path>
             var pos = route.IndexOf('/');
             var path = pos == 0 ? route : route.Substring(pos);
-            var domainUri = pos == 0 ? null : DomainHelper.DomainForNode(int.Parse(route.Substring(0, pos)), current);
+            var domainUri = pos == 0 
+                ? null
+                : domainHelper.DomainForNode(int.Parse(route.Substring(0, pos)), current);
 
             // assemble the url from domainUri (maybe null) and path
             return AssembleUrl(domainUri, path, current, mode).ToString();
@@ -84,11 +88,13 @@ namespace Umbraco.Web.Routing
                 return null;
             }
 
+            var domainHelper = new DomainHelper(umbracoContext.Application.Services.DomainService);
+
             // extract domainUri and path
             // route is /<path> or <domainRootId>/<path>
             var pos = route.IndexOf('/');
             var path = pos == 0 ? route : route.Substring(pos);
-            var domainUris = pos == 0 ? null : DomainHelper.DomainsForNode(int.Parse(route.Substring(0, pos)), current);
+            var domainUris = pos == 0 ? null : domainHelper.DomainsForNode(int.Parse(route.Substring(0, pos)), current);
 
             // assemble the alternate urls from domainUris (maybe empty) and path
             return AssembleUrls(domainUris, path).Select(uri => uri.ToString());
diff --git a/src/Umbraco.Web/Routing/DomainAndUri.cs b/src/Umbraco.Web/Routing/DomainAndUri.cs
index ec3e52ff11..cef8231375 100644
--- a/src/Umbraco.Web/Routing/DomainAndUri.cs
+++ b/src/Umbraco.Web/Routing/DomainAndUri.cs
@@ -1,6 +1,8 @@
 using System;
+using System.ComponentModel;
 using Umbraco.Core;
 using umbraco.cms.businesslogic.web;
+using Umbraco.Core.Models;
 
 namespace Umbraco.Web.Routing
 {
@@ -13,30 +15,47 @@ namespace Umbraco.Web.Routing
     /// </remarks>
     public class DomainAndUri
     {
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DomainAndUri"/> class with a Domain and a uri scheme.
         /// </summary>
         /// <param name="domain">The domain.</param>
         /// <param name="scheme">The uri scheme.</param>
-        public DomainAndUri(Domain domain, string scheme)
+        public DomainAndUri(IDomain domain, string scheme)
         {
-            Domain = domain;
+            UmbracoDomain = domain;
             try
             {
-                Uri = new Uri(UriUtility.TrimPathEndSlash(UriUtility.StartWithScheme(domain.Name, scheme)));
+                Uri = new Uri(UriUtility.TrimPathEndSlash(UriUtility.StartWithScheme(domain.DomainName, scheme)));
             }
             catch (UriFormatException)
             {
-                var name = domain.Name.ToCSharpString();
+                var name = domain.DomainName.ToCSharpString();
                 throw new ArgumentException(string.Format("Failed to parse invalid domain: node id={0}, hostname=\"{1}\"."
-                    + " Hostname should be a valid uri.", domain.RootNodeId, name), "domain");
+                    + " Hostname should be a valid uri.", domain.RootContent.Id, name), "domain");
             }
         }
 
+        [Obsolete("This should not be used, use the other contructor specifying the non legacy IDomain instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public DomainAndUri(Domain domain, string scheme)
+            : this(domain.DomainEntity, scheme)
+        {
+            
+        }
+
+        
+        [Obsolete("This should not be used, use the non-legacy property called UmbracoDomain instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Domain Domain
+        {
+            get { return new Domain(UmbracoDomain); }
+        }
+
         /// <summary>
-        /// Gets or sets the Umbraco domain.
+        /// Gets the Umbraco domain.
         /// </summary>
-        public Domain Domain { get; private set; }
+        public IDomain UmbracoDomain { get; private set; }
 
         /// <summary>
         /// Gets or sets the normalized uri of the domain.
@@ -49,7 +68,7 @@ namespace Umbraco.Web.Routing
         /// <returns>A string that represents the current <see cref="DomainAndUri"/> instance.</returns>
         public override string ToString()
         {
-            return string.Format("{{ \"{0}\", \"{1}\" }}", Domain.Name, Uri);
+            return string.Format("{{ \"{0}\", \"{1}\" }}", UmbracoDomain.DomainName, Uri);
         }
     }
 }
diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs
index 1efe0eed0d..ef202b5599 100644
--- a/src/Umbraco.Web/Routing/DomainHelper.cs
+++ b/src/Umbraco.Web/Routing/DomainHelper.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using Umbraco.Core;
-using umbraco.cms.businesslogic.web;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Routing
 {
@@ -12,33 +12,19 @@ namespace Umbraco.Web.Routing
     /// </summary>
 	public class DomainHelper
 	{
-        #region Temp. abstract Umbraco's API
+        private readonly IDomainService _domainService;
 
-        /// <summary>
-        /// Gets all domains defined in the system.
-        /// </summary>
-        /// <param name="includeWildcards">A value indicating whether to include wildcard domains.</param>
-        /// <returns>All domains defined in the system.</returns>
-        /// <remarks>This is to temporarily abstract Umbraco's API.</remarks>
-        internal static Domain[] GetAllDomains(bool includeWildcards)
+        [Obsolete("Use the contructor specifying all dependencies instead")]
+        public DomainHelper()
+            : this(ApplicationContext.Current.Services.DomainService)
         {
-            return Domain.GetDomains(includeWildcards).ToArray();
         }
 
-        /// <summary>
-        /// Gets all domains defined in the system at a specified node.
-        /// </summary>
-        /// <param name="nodeId">The node identifier.</param>
-        /// <param name="includeWildcards">A value indicating whether to include wildcard domains.</param>
-        /// <returns>All domains defined in the system at the specified node.</returns>
-        /// <remarks>This is to temporarily abstract Umbraco's API.</remarks>
-        internal static Domain[] GetNodeDomains(int nodeId, bool includeWildcards)
+        public DomainHelper(IDomainService domainService)
         {
-            return Domain.GetDomains(includeWildcards).Where(d => d.RootNodeId == nodeId).ToArray();
+            _domainService = domainService;
         }
 
-        #endregion
-
         #region Domain for Node
 
         /// <summary>
@@ -49,17 +35,17 @@ namespace Umbraco.Web.Routing
         /// <returns>The domain and its uri, if any, that best matches the specified uri, else null.</returns>
         /// <remarks>If at least a domain is set on the node then the method returns the domain that
         /// best matches the specified uri, else it returns null.</remarks>
-        internal static DomainAndUri DomainForNode(int nodeId, Uri current)
+        internal DomainAndUri DomainForNode(int nodeId, Uri current)
         {
             // be safe
             if (nodeId <= 0)
                 return null;
 
             // get the domains on that node
-            var domains = GetNodeDomains(nodeId, false);
+            var domains = _domainService.GetAssignedDomains(nodeId, false).ToArray();
 
             // none?
-            if (!domains.Any())
+            if (domains.Any() == false)
                 return null;
 
             // else filter
@@ -77,9 +63,9 @@ namespace Umbraco.Web.Routing
         /// </summary>
         /// <param name="nodeId">The node identifier.</param>
         /// <returns>True if the node has domains, else false.</returns>
-        internal static bool NodeHasDomains(int nodeId)
+        internal bool NodeHasDomains(int nodeId)
         {
-            return nodeId > 0 && GetNodeDomains(nodeId, false).Any();
+            return nodeId > 0 && _domainService.GetAssignedDomains(nodeId, false).Any();
         }
 
         /// <summary>
@@ -91,17 +77,17 @@ namespace Umbraco.Web.Routing
         /// <returns>The domains and their uris, that match the specified uri, else null.</returns>
         /// <remarks>If at least a domain is set on the node then the method returns the domains that
         /// best match the specified uri, else it returns null.</remarks>
-        internal static IEnumerable<DomainAndUri> DomainsForNode(int nodeId, Uri current, bool excludeDefault = true)
+        internal IEnumerable<DomainAndUri> DomainsForNode(int nodeId, Uri current, bool excludeDefault = true)
         {
             // be safe
             if (nodeId <= 0)
                 return null;
 
             // get the domains on that node
-            var domains = GetNodeDomains(nodeId, false);
+            var domains = _domainService.GetAssignedDomains(nodeId, false).ToArray();
 
             // none?
-            if (!domains.Any())
+            if (domains.Any() == false)
                 return null;
 
             // get the domains and their uris
@@ -128,20 +114,20 @@ namespace Umbraco.Web.Routing
         /// the right one, unless it is <c>null</c>, in which case the method returns <c>null</c>.</para>
         /// <para>The filter, if any, will be called only with a non-empty argument, and _must_ return something.</para>
         /// </remarks>
-        internal static DomainAndUri DomainForUri(Domain[] domains, Uri current, Func<DomainAndUri[], DomainAndUri> filter = null)
+        internal static DomainAndUri DomainForUri(IEnumerable<IDomain> domains, Uri current, Func<DomainAndUri[], DomainAndUri> filter = null)
         {
             // sanitize the list to have proper uris for comparison (scheme, path end with /)
             // we need to end with / because example.com/foo cannot match example.com/foobar
             // we need to order so example.com/foo matches before example.com/
             var scheme = current == null ? Uri.UriSchemeHttp : current.Scheme;
             var domainsAndUris = domains
-                .Where(d => !d.IsWildcard)
+                .Where(d => d.IsWildcard == false)
                 .Select(SanitizeForBackwardCompatibility)
                 .Select(d => new DomainAndUri(d, scheme))
                 .OrderByDescending(d => d.Uri.ToString())
                 .ToArray();
 
-            if (!domainsAndUris.Any())
+            if (domainsAndUris.Any() == false)
                 return null;
 
             DomainAndUri domainAndUri;
@@ -179,11 +165,11 @@ namespace Umbraco.Web.Routing
         /// <param name="domains">The group of domains.</param>
         /// <param name="current">The uri, or null.</param>
         /// <returns>The domains and their normalized uris, that match the specified uri.</returns>
-        internal static IEnumerable<DomainAndUri> DomainsForUri(Domain[] domains, Uri current)
+        internal static IEnumerable<DomainAndUri> DomainsForUri(IEnumerable<IDomain> domains, Uri current)
         {
             var scheme = current == null ? Uri.UriSchemeHttp : current.Scheme;
             return domains
-                .Where(d => !d.IsWildcard)
+                .Where(d => d.IsWildcard == false)
                 .Select(SanitizeForBackwardCompatibility)
                 .Select(d => new DomainAndUri(d, scheme))
                 .OrderByDescending(d => d.Uri.ToString());
@@ -202,14 +188,14 @@ namespace Umbraco.Web.Routing
         /// using hostnames such as "/en" which happened to work pre-4.10 but really make no sense at
         /// all... and 4.10 throws on them, so here we just try to find a way so 4.11 does not throw.
         /// But really... no.</remarks>
-        private static Domain SanitizeForBackwardCompatibility(Domain domain)
+        private static IDomain SanitizeForBackwardCompatibility(IDomain domain)
         {
             var context = System.Web.HttpContext.Current;
-            if (context != null && domain.Name.StartsWith("/"))
+            if (context != null && domain.DomainName.StartsWith("/"))
             {
                 // turn "/en" into "http://whatever.com/en" so it becomes a parseable uri
                 var authority = context.Request.Url.GetLeftPart(UriPartial.Authority);
-                domain.Name = authority + domain.Name;
+                domain.DomainName = authority + domain.DomainName;
             }
             return domain;
         }
@@ -222,7 +208,7 @@ namespace Umbraco.Web.Routing
         /// <param name="rootNodeId">The current domain root node identifier, or null.</param>
         /// <returns>A value indicating if there is another domain defined down in the path.</returns>
         /// <remarks>Looks _under_ rootNodeId but not _at_ rootNodeId.</remarks>
-        internal static bool ExistsDomainInPath(Domain[] domains, string path, int? rootNodeId)
+        internal static bool ExistsDomainInPath(IEnumerable<IDomain> domains, string path, int? rootNodeId)
         {
             return FindDomainInPath(domains, path, rootNodeId) != null;
         }
@@ -235,7 +221,7 @@ namespace Umbraco.Web.Routing
         /// <param name="rootNodeId">The current domain root node identifier, or null.</param>
         /// <returns>The deepest non-wildcard Domain in the path, or null.</returns>
         /// <remarks>Looks _under_ rootNodeId but not _at_ rootNodeId.</remarks>
-        internal static Domain FindDomainInPath(Domain[] domains, string path, int? rootNodeId)
+        internal static IDomain FindDomainInPath(IEnumerable<IDomain> domains, string path, int? rootNodeId)
         {
             var stopNodeId = rootNodeId ?? -1;
 
@@ -243,7 +229,7 @@ namespace Umbraco.Web.Routing
                        .Reverse()
                        .Select(int.Parse)
                        .TakeWhile(id => id != stopNodeId)
-                       .Select(id => domains.FirstOrDefault(d => d.RootNodeId == id && !d.IsWildcard))
+                       .Select(id => domains.FirstOrDefault(d => d.RootContent.Id == id && d.IsWildcard == false))
                        .SkipWhile(domain => domain == null)
                        .FirstOrDefault();
         }
@@ -256,7 +242,7 @@ namespace Umbraco.Web.Routing
         /// <param name="rootNodeId">The current domain root node identifier, or null.</param>
         /// <returns>The deepest wildcard Domain in the path, or null.</returns>
         /// <remarks>Looks _under_ rootNodeId but not _at_ rootNodeId.</remarks>
-        internal static Domain FindWildcardDomainInPath(Domain[] domains, string path, int? rootNodeId)
+        internal static IDomain FindWildcardDomainInPath(IEnumerable<IDomain> domains, string path, int? rootNodeId)
         {
             var stopNodeId = rootNodeId ?? -1;
 
@@ -264,7 +250,7 @@ namespace Umbraco.Web.Routing
                        .Reverse()
                        .Select(int.Parse)
                        .TakeWhile(id => id != stopNodeId)
-                       .Select(id => domains.FirstOrDefault(d => d.RootNodeId == id && d.IsWildcard))
+                       .Select(id => domains.FirstOrDefault(d => d.RootContent.Id == id && d.IsWildcard))
                        .FirstOrDefault(domain => domain != null);
         }
 
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
index 6e154793bb..d2639becf6 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
@@ -44,7 +44,11 @@ namespace Umbraco.Web.Routing
 			Uri = uri;
 			RoutingContext = routingContext;
 
-			_engine = new PublishedContentRequestEngine(this);
+			_engine = new PublishedContentRequestEngine(
+                routingContext.UmbracoContext.Application.Services.DomainService,
+                routingContext.UmbracoContext.Application.Services.LocalizationService, 
+                routingContext.UmbracoContext.Application.ProfilingLogger,
+                this);
 
             RenderingEngine = RenderingEngine.Unknown;
 		}
@@ -94,7 +98,7 @@ namespace Umbraco.Web.Routing
 			if (Prepared != null)
 				Prepared(this, EventArgs.Empty);
 
-		    if (!HasPublishedContent)
+		    if (HasPublishedContent == false)
                 Is404 = true; // safety
 
 		    _readonly = true;
@@ -334,10 +338,17 @@ namespace Umbraco.Web.Routing
 
 		#region Domain and Culture
 
-		/// <summary>
+	    [Obsolete("Do not use this property, use the non-legacy UmbracoDomain property instead")]
+	    public Domain Domain
+	    {
+	        get { return new Domain(UmbracoDomain); }
+	    }
+
+        //TODO: Should we publicize the setter now that we are using a non-legacy entity??
+        /// <summary>
         /// Gets or sets the content request's domain.
         /// </summary>
-        public Domain Domain { get; internal set; }
+        public IDomain UmbracoDomain { get; internal set; }
 
 		/// <summary>
 		/// Gets or sets the content request's domain Uri.
@@ -350,7 +361,7 @@ namespace Umbraco.Web.Routing
 		/// </summary>
 		public bool HasDomain
 		{
-			get { return Domain != null; }
+			get { return UmbracoDomain != null; }
 		}
 
 	    private CultureInfo _culture;
@@ -432,7 +443,7 @@ namespace Umbraco.Web.Routing
         /// <summary>
         /// Gets a value indicating whether the content request triggers a redirect (permanent or not).
         /// </summary>
-        public bool IsRedirect { get { return !string.IsNullOrWhiteSpace(RedirectUrl); } }
+        public bool IsRedirect { get { return string.IsNullOrWhiteSpace(RedirectUrl) == false; } }
 
         /// <summary>
         /// Gets or sets a value indicating whether the redirect is permanent.
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
index fee5b44360..076429f261 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
@@ -14,23 +14,37 @@ using umbraco;
 using umbraco.cms.businesslogic.web;
 using umbraco.cms.businesslogic.language;
 using umbraco.cms.businesslogic.member;
+using Umbraco.Core.Services;
 using RenderingEngine = Umbraco.Core.RenderingEngine;
 
 namespace Umbraco.Web.Routing
 {
 	internal class PublishedContentRequestEngine
 	{
-		private readonly PublishedContentRequest _pcr;
+	    private readonly IDomainService _domainService;
+	    private readonly ILocalizationService _localizationService;
+	    private readonly ProfilingLogger _profilingLogger;
+	    private readonly PublishedContentRequest _pcr;
 		private readonly RoutingContext _routingContext;
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="PublishedContentRequestEngine"/> class with a content request.
-		/// </summary>
-		/// <param name="pcr">The content request.</param>
-		public PublishedContentRequestEngine(PublishedContentRequest pcr)
+	    /// <summary>
+	    /// Initializes a new instance of the <see cref="PublishedContentRequestEngine"/> class with a content request.
+	    /// </summary>
+	    /// <param name="domainService"></param>
+	    /// <param name="localizationService"></param>
+	    /// <param name="profilingLogger"></param>
+	    /// <param name="pcr">The content request.</param>
+	    public PublishedContentRequestEngine(IDomainService domainService, ILocalizationService localizationService, ProfilingLogger profilingLogger, PublishedContentRequest pcr)
 		{
-			if (pcr == null) throw new ArgumentException("pcr is null.");
-			_pcr = pcr;
+	        if (domainService == null) throw new ArgumentNullException("domainService");
+	        if (localizationService == null) throw new ArgumentNullException("localizationService");
+	        if (profilingLogger == null) throw new ArgumentNullException("profilingLogger");
+	        if (pcr == null) throw new ArgumentException("pcr is null.");
+
+	        _domainService = domainService;
+	        _localizationService = localizationService;
+	        _profilingLogger = profilingLogger;
+	        _pcr = pcr;
 			
 			_routingContext = pcr.RoutingContext;
 			if (_routingContext == null) throw new ArgumentException("pcr.RoutingContext is null.");
@@ -169,7 +183,7 @@ namespace Umbraco.Web.Routing
 			if (_pcr.IsRedirect)
 				return;
 
-			if (!_pcr.HasPublishedContent)
+			if (_pcr.HasPublishedContent == false)
 			{
 				// means the engine could not find a proper document to handle 404
 				// restore the saved content so we know it exists
@@ -177,7 +191,7 @@ namespace Umbraco.Web.Routing
 				return;
 			}
 
-			if (!_pcr.HasTemplate)
+			if (_pcr.HasTemplate == false)
 			{
 				// means we may have a document, but we have no template
 				// at that point there isn't much we can do and there is no point returning
@@ -213,7 +227,7 @@ namespace Umbraco.Web.Routing
 			LogHelper.Debug<PublishedContentRequestEngine>("{0}Uri=\"{1}\"", () => tracePrefix, () => _pcr.Uri);
 
 			// try to find a domain matching the current request
-            var domainAndUri = DomainHelper.DomainForUri(DomainHelper.GetAllDomains(false), _pcr.Uri);
+            var domainAndUri = DomainHelper.DomainForUri(_domainService.GetAll(false), _pcr.Uri);
 
 			// handle domain
 			if (domainAndUri != null)
@@ -221,13 +235,13 @@ namespace Umbraco.Web.Routing
 				// matching an existing domain
 				LogHelper.Debug<PublishedContentRequestEngine>("{0}Matches domain=\"{1}\", rootId={2}, culture=\"{3}\"",
 												 () => tracePrefix,
-												 () => domainAndUri.Domain.Name,
-												 () => domainAndUri.Domain.RootNodeId,
-												 () => domainAndUri.Domain.Language.CultureAlias);
+												 () => domainAndUri.UmbracoDomain.DomainName,
+												 () => domainAndUri.UmbracoDomain.RootContent.Id,
+                                                 () => domainAndUri.UmbracoDomain.Language.IsoCode);
 
-				_pcr.Domain = domainAndUri.Domain;
+                _pcr.UmbracoDomain = domainAndUri.UmbracoDomain;
 				_pcr.DomainUri = domainAndUri.Uri;
-				_pcr.Culture = new CultureInfo(domainAndUri.Domain.Language.CultureAlias);
+                _pcr.Culture = new CultureInfo(domainAndUri.UmbracoDomain.Language.IsoCode);
 
 				// canonical? not implemented at the moment
 				// if (...)
@@ -241,13 +255,13 @@ namespace Umbraco.Web.Routing
 				// not matching any existing domain
 				LogHelper.Debug<PublishedContentRequestEngine>("{0}Matches no domain", () => tracePrefix);
 
-				var defaultLanguage = Language.GetAllAsList().FirstOrDefault();
-				_pcr.Culture = defaultLanguage == null ? CultureInfo.CurrentUICulture : new CultureInfo(defaultLanguage.CultureAlias);
+                var defaultLanguage = _localizationService.GetAllLanguages().FirstOrDefault();
+				_pcr.Culture = defaultLanguage == null ? CultureInfo.CurrentUICulture : new CultureInfo(defaultLanguage.IsoCode);
 			}
 
 			LogHelper.Debug<PublishedContentRequestEngine>("{0}Culture=\"{1}\"", () => tracePrefix, () => _pcr.Culture.Name);
 
-			return _pcr.Domain != null;
+			return _pcr.UmbracoDomain != null;
 		}
 
 		/// <summary>
@@ -257,19 +271,19 @@ namespace Umbraco.Web.Routing
 		{
 			const string tracePrefix = "HandleWildcardDomains: ";
 
-			if (!_pcr.HasPublishedContent)
+			if (_pcr.HasPublishedContent == false)
 				return;
 
 			var nodePath = _pcr.PublishedContent.Path;
 			LogHelper.Debug<PublishedContentRequestEngine>("{0}Path=\"{1}\"", () => tracePrefix, () => nodePath);
-			var rootNodeId = _pcr.HasDomain ? _pcr.Domain.RootNodeId : (int?)null;
-			var domain = DomainHelper.FindWildcardDomainInPath(DomainHelper.GetAllDomains(true), nodePath, rootNodeId);
+            var rootNodeId = _pcr.HasDomain ? _pcr.UmbracoDomain.RootContent.Id : (int?)null;
+			var domain = DomainHelper.FindWildcardDomainInPath(_domainService.GetAll(true), nodePath, rootNodeId);
 
 			if (domain != null)
 			{
-				_pcr.Culture = new CultureInfo(domain.Language.CultureAlias);
+				_pcr.Culture = new CultureInfo(domain.Language.IsoCode);
 				LogHelper.Debug<PublishedContentRequestEngine>("{0}Got domain on node {1}, set culture to \"{2}\".", () => tracePrefix,
-					() => domain.RootNodeId, () => _pcr.Culture.Name);
+                    () => domain.RootContent.Id, () => _pcr.Culture.Name);
 			}
 			else
 			{
@@ -308,7 +322,7 @@ namespace Umbraco.Web.Routing
 
         internal bool FindTemplateRenderingEngineInDirectory(DirectoryInfo directory, string alias, string[] extensions)
         {
-            if (directory == null || !directory.Exists)
+            if (directory == null || directory.Exists == false)
                 return false;
 
             var pos = alias.IndexOf('/');
@@ -374,13 +388,14 @@ namespace Umbraco.Web.Routing
 			// the first successful finder, if any, will set this.PublishedContent, and may also set this.Template
 			// some finders may implement caching
 
-            using (DisposableTimer.DebugDuration<PublishedContentRequestEngine>(
-				() => string.Format("{0}Begin finders", tracePrefix),
-				() => string.Format("{0}End finders, {1}", tracePrefix, (_pcr.HasPublishedContent ? "a document was found" : "no document was found"))))
+            using (_profilingLogger.DebugDuration<PublishedContentRequestEngine>(
+				string.Format("{0}Begin finders", tracePrefix),
+				string.Format("{0}End finders, {1}", tracePrefix, (_pcr.HasPublishedContent ? "a document was found" : "no document was found"))))
 			{
 			    if (_routingContext.PublishedContentFinders == null)
                     throw new InvalidOperationException("There is no finder collection.");
-			    _routingContext.PublishedContentFinders.Any(finder => finder.TryFindContent(_pcr));
+
+			    _routingContext.PublishedContentFinders.ForEach(finder => finder.TryFindContent(_pcr));
 			}
 
 		    // indicate that the published content (if any) we have at the moment is the
@@ -407,14 +422,14 @@ namespace Umbraco.Web.Routing
 				LogHelper.Debug<PublishedContentRequestEngine>("{0}{1}", () => tracePrefix, () => (i == 0 ? "Begin" : "Loop"));
 
 				// handle not found
-				if (!_pcr.HasPublishedContent)
+				if (_pcr.HasPublishedContent == false)
 				{
 					_pcr.Is404 = true;
 					LogHelper.Debug<PublishedContentRequestEngine>("{0}No document, try last chance lookup", () => tracePrefix);
 
 					// if it fails then give up, there isn't much more that we can do
 					var lastChance = _routingContext.PublishedContentLastChanceFinder;
-					if (lastChance == null || !lastChance.TryFindContent(_pcr))
+					if (lastChance == null || lastChance.TryFindContent(_pcr) == false)
 					{
 						LogHelper.Debug<PublishedContentRequestEngine>("{0}Failed to find a document, give up", () => tracePrefix);
 						break;
@@ -438,7 +453,7 @@ namespace Umbraco.Web.Routing
 				// got us to nowhere and now we need to run the notFoundLookup again
 				// as long as it's not running out of control ie infinite loop of some sort
 
-			} while (!_pcr.HasPublishedContent && i++ < maxLoop);
+			} while (_pcr.HasPublishedContent == false && i++ < maxLoop);
 
 			if (i == maxLoop || j == maxLoop)
 			{
@@ -467,12 +482,12 @@ namespace Umbraco.Web.Routing
 			bool redirect = false;
 			var internalRedirect = _pcr.PublishedContent.GetPropertyValue<string>(Constants.Conventions.Content.InternalRedirectId);
 
-			if (!string.IsNullOrWhiteSpace(internalRedirect))
+			if (string.IsNullOrWhiteSpace(internalRedirect) == false)
 			{
 				LogHelper.Debug<PublishedContentRequestEngine>("{0}Found umbracoInternalRedirectId={1}", () => tracePrefix, () => internalRedirect);
 
 				int internalRedirectId;
-				if (!int.TryParse(internalRedirect, out internalRedirectId))
+				if (int.TryParse(internalRedirect, out internalRedirectId) == false)
 					internalRedirectId = -1;
 
 				if (internalRedirectId <= 0)
@@ -529,7 +544,7 @@ namespace Umbraco.Web.Routing
                 // a member logs in. Then we can check if the value exists and just use that, otherwise lookup 
                 // the member like we are currently doing.
 
-				System.Web.Security.MembershipUser user = null;
+				MembershipUser user = null;
 				try
 				{
                     var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
@@ -540,14 +555,14 @@ namespace Umbraco.Web.Routing
 					LogHelper.Debug<PublishedContentRequestEngine>("{0}Membership.GetUser returned ArgumentException", () => tracePrefix);
 				}
 
-				if (user == null || !Member.IsLoggedOn())
+				if (user == null || Member.IsLoggedOn() == false)
 				{
 					LogHelper.Debug<PublishedContentRequestEngine>("{0}Not logged in, redirect to login page", () => tracePrefix);
 					var loginPageId = Access.GetLoginPage(path);
 					if (loginPageId != _pcr.PublishedContent.Id)
                         _pcr.PublishedContent = _routingContext.UmbracoContext.ContentCache.GetById(loginPageId);
 				}
-				else if (!Access.HasAccces(_pcr.PublishedContent.Id, user.ProviderUserKey))
+				else if (Access.HasAccces(_pcr.PublishedContent.Id, user.ProviderUserKey) == false)
 				{
 					LogHelper.Debug<PublishedContentRequestEngine>("{0}Current member has not access, redirect to error page", () => tracePrefix);
 					var errorPageId = Access.GetErrorPage(path);
@@ -647,7 +662,7 @@ namespace Umbraco.Web.Routing
 				}
 			}
 
-			if (!_pcr.HasTemplate)
+			if (_pcr.HasTemplate == false)
 			{
 				LogHelper.Debug<PublishedContentRequestEngine>("{0}No template was found.", () => tracePrefix);
 
@@ -672,7 +687,7 @@ namespace Umbraco.Web.Routing
 		/// <remarks>As per legacy, if the redirect does not work, we just ignore it.</remarks>
 		private void FollowExternalRedirect()
 		{
-		    if (!_pcr.HasPublishedContent) return;
+		    if (_pcr.HasPublishedContent == false) return;
 
 		    var redirectId = _pcr.PublishedContent.GetPropertyValue(Constants.Conventions.Content.Redirect, -1);
 		    var redirectUrl = "#";
diff --git a/src/Umbraco.Web/Routing/SiteDomainHelper.cs b/src/Umbraco.Web/Routing/SiteDomainHelper.cs
index d56bd5844b..5170ce1f5a 100644
--- a/src/Umbraco.Web/Routing/SiteDomainHelper.cs
+++ b/src/Umbraco.Web/Routing/SiteDomainHelper.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using System.Text.RegularExpressions;
 using Umbraco.Core;
-using umbraco.cms.businesslogic.web;
  
 namespace Umbraco.Web.Routing
 {
diff --git a/src/Umbraco.Web/WebServices/DomainsApiController.cs b/src/Umbraco.Web/WebServices/DomainsApiController.cs
index 02a4269ac5..f6c55309c0 100644
--- a/src/Umbraco.Web/WebServices/DomainsApiController.cs
+++ b/src/Umbraco.Web/WebServices/DomainsApiController.cs
@@ -4,7 +4,10 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using System.Web.Services.Description;
 using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Web.Routing;
 using Umbraco.Web.WebApi;
 //using umbraco.cms.businesslogic.language;
 using umbraco.BusinessLogic.Actions;
@@ -41,9 +44,9 @@ namespace Umbraco.Web.WebServices
             }
 
             model.Valid = true;
-            var domains = Routing.DomainHelper.GetNodeDomains(model.NodeId, true);
-            var languages = global::umbraco.cms.businesslogic.language.Language.GetAllAsList().ToArray();
-            var language = model.Language > 0 ? languages.FirstOrDefault(l => l.id == model.Language) : null;
+            var domains = Services.DomainService.GetAssignedDomains(model.NodeId, true).ToArray();
+            var languages = Services.LocalizationService.GetAllLanguages().ToArray();
+            var language = model.Language > 0 ? languages.FirstOrDefault(l => l.Id == model.Language) : null;
 
             // process wildcard
 
@@ -52,28 +55,44 @@ namespace Umbraco.Web.WebServices
                 var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
                 if (wildcard != null)
                     wildcard.Language = language;
-                else // yet there is a race condition here...
-                    Domain.MakeNew("*" + model.NodeId, model.NodeId, model.Language);
+                else
+                {
+                    // yet there is a race condition here...
+                    var newDomain = new UmbracoDomain
+                    {
+                        DomainName = "*" + model.NodeId,
+                        Language = Services.LocalizationService.GetLanguageById(model.Language),
+                        RootContent = Services.ContentService.GetById(model.NodeId)
+                    };
+                    Services.DomainService.Save(newDomain);
+                }
+                    
             }
             else
             {
                 var wildcard = domains.FirstOrDefault(d => d.IsWildcard);
                 if (wildcard != null)
-                    wildcard.Delete();
+                {
+                    Services.DomainService.Delete(wildcard);
+                }
+                    
             }
 
             // process domains
 
             // delete every (non-wildcard) domain, that exists in the DB yet is not in the model
-            foreach (var domain in domains.Where(d => d.IsWildcard == false && model.Domains.All(m => m.Name.Equals(d.Name, StringComparison.OrdinalIgnoreCase) == false)))
-                domain.Delete();
+            foreach (var domain in domains.Where(d => d.IsWildcard == false && model.Domains.All(m => m.Name.InvariantEquals(d.DomainName) == false)))
+            {
+                Services.DomainService.Delete(domain);
+            }
+                
 
             var names = new List<string>();
 
             // create or update domains in the model
             foreach (var domainModel in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
             {
-                language = languages.FirstOrDefault(l => l.id == domainModel.Lang);
+                language = languages.FirstOrDefault(l => l.Id == domainModel.Lang);
                 if (language == null)
                     continue;
                 var name = domainModel.Name.ToLowerInvariant();
@@ -83,13 +102,22 @@ namespace Umbraco.Web.WebServices
                     continue;
                 }
                 names.Add(name);
-                var domain = domains.FirstOrDefault(d => d.Name.Equals(domainModel.Name, StringComparison.OrdinalIgnoreCase));
+                var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
                 if (domain != null)
                     domain.Language = language;
-                else if (Domain.Exists(domainModel.Name))
+                else if (Services.DomainService.Exists(domainModel.Name))
                     domainModel.Duplicate = true;
-                else // yet there is a race condition here...
-                    Domain.MakeNew(name, model.NodeId, domainModel.Lang);
+                else
+                {
+                    // yet there is a race condition here...
+                    var newDomain = new UmbracoDomain
+                    {
+                        DomainName = name,
+                        Language = Services.LocalizationService.GetLanguageById(domainModel.Lang),
+                        RootContent = Services.ContentService.GetById(model.NodeId)
+                    };
+                    Services.DomainService.Save(newDomain);
+                } 
             }
 
             model.Valid = model.Domains.All(m => m.Duplicate == false);
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs
index 5fb2a27875..136cc1a27d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Linq;
+using umbraco.BusinessLogic.Actions;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Web.UI.Pages;
@@ -19,7 +20,7 @@ namespace umbraco.dialogs
             base.OnLoad(e);
 
             var nodeId = GetNodeId();
-            var node = ApplicationContext.Current.Services.ContentService.GetById(nodeId);
+            var node = Services.ContentService.GetById(nodeId);
 
             if (node == null)
             {
@@ -30,7 +31,7 @@ namespace umbraco.dialogs
                 return;
             }
 
-            if (!UmbracoUser.GetPermissions(node.Path).Contains(BusinessLogic.Actions.ActionAssignDomain.Instance.Letter))
+            if (UmbracoUser.GetPermissions(node.Path).Contains(ActionAssignDomain.Instance.Letter) == false)
             {
                 feedback.Text = ui.Text("assignDomain", "permissionDenied");
                 pane_language.Visible = false;
@@ -43,7 +44,7 @@ namespace umbraco.dialogs
             pane_domains.Title = ui.Text("assignDomain", "setDomains");
             prop_language.Text = ui.Text("assignDomain", "language");
 
-            var nodeDomains = DomainHelper.GetNodeDomains(nodeId, true);
+            var nodeDomains = Services.DomainService.GetAssignedDomains(nodeId, true).ToArray();
             var wildcard = nodeDomains.FirstOrDefault(d => d.IsWildcard);
 
             var sb = new StringBuilder();
@@ -53,12 +54,12 @@ namespace umbraco.dialogs
                 sb.AppendFormat("{0}{{ \"Id\": {1}, \"Code\": \"{2}\" }}", (i++ == 0 ? "" : ","), language.Id, language.IsoCode);
             sb.Append("]\r\n");
 
-            sb.AppendFormat(",language: {0}", wildcard == null ? "undefined" : wildcard.Language.id.ToString());
+            sb.AppendFormat(",language: {0}", wildcard == null ? "undefined" : wildcard.Language.Id.ToString());
 
             sb.Append(",domains: [");
             i = 0;
-            foreach (var domain in nodeDomains.Where(d => !d.IsWildcard))
-                sb.AppendFormat("{0}{{ \"Name\": \"{1}\", \"Lang\": \"{2}\" }}", (i++ == 0 ? "" :","), domain.Name, domain.Language.id);
+            foreach (var domain in nodeDomains.Where(d => d.IsWildcard == false))
+                sb.AppendFormat("{0}{{ \"Name\": \"{1}\", \"Lang\": \"{2}\" }}", (i++ == 0 ? "" :","), domain.DomainName, domain.Language.Id);
             sb.Append("]\r\n");
 
             data.Text = sb.ToString();
@@ -67,7 +68,7 @@ namespace umbraco.dialogs
         protected int GetNodeId()
         {
             int nodeId;
-            if (!int.TryParse(Request.QueryString["id"], out nodeId))
+            if (int.TryParse(Request.QueryString["id"], out nodeId) == false)
                 nodeId = -1;
             return nodeId;
         }
diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs
index 17df5fd194..3c1f8381bc 100644
--- a/src/umbraco.cms/businesslogic/web/Domain.cs
+++ b/src/umbraco.cms/businesslogic/web/Domain.cs
@@ -64,8 +64,8 @@ namespace umbraco.cms.businesslogic.web
 
         public Language Language
         {
-            get { return new Language(DomainEntity.DefaultLanguage); }
-            set { DomainEntity.DefaultLanguage = value.LanguageEntity; }
+            get { return new Language(DomainEntity.Language); }
+            set { DomainEntity.Language = value.LanguageEntity; }
         }
 
         public int RootNodeId
@@ -168,7 +168,7 @@ namespace umbraco.cms.businesslogic.web
             {
                 DomainName = DomainName,
                 RootContent = content,
-                DefaultLanguage = lang
+                Language = lang
             };
             ApplicationContext.Current.Services.DomainService.Save(domain);
 

From 42ad3af48b47296c21c081453d12905506d1a905 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Jan 2015 11:48:13 +1100
Subject: [PATCH 12/18] Updates legacy classes to be serialized with the
 EntityXmlSerializer

---
 .../Services/EntityXmlSerializer.cs           | 22 +++++
 src/umbraco.cms/businesslogic/Dictionary.cs   | 23 ++---
 .../businesslogic/Property/Property.cs        | 18 +---
 src/umbraco.cms/businesslogic/macro/Macro.cs  | 83 ++++++++-----------
 .../businesslogic/web/StyleSheet.cs           | 50 ++++-------
 .../businesslogic/web/StylesheetProperty.cs   |  6 +-
 6 files changed, 87 insertions(+), 115 deletions(-)

diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
index 3e5eb6483b..949b4e61c7 100644
--- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
@@ -5,6 +5,7 @@ using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using umbraco.interfaces;
@@ -177,6 +178,27 @@ namespace Umbraco.Core.Services
             return xml;
         }
 
+        public XElement Serialize(Stylesheet stylesheet)
+        {
+            var xml = new XElement("Stylesheet",
+                new XElement("Name", stylesheet.Alias),
+                new XElement("FileName", stylesheet.Path),
+                new XElement("Content", new XCData(stylesheet.Content)));
+
+            var props = new XElement("Properties");
+            xml.Add(props);
+
+            foreach (var prop in stylesheet.Properties)
+            {
+                props.Add(new XElement("Property",
+                    new XElement("Name", prop.Name),
+                    new XElement("Alias", prop.Alias),
+                    new XElement("Value", prop.Value)));
+            }
+
+            return xml;
+        }
+
         public XElement Serialize(ILanguage language)
         {
             var xml = new XElement("Language",
diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs
index 04633a2177..0d34da4615 100644
--- a/src/umbraco.cms/businesslogic/Dictionary.cs
+++ b/src/umbraco.cms/businesslogic/Dictionary.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using Umbraco.Core;
 using umbraco.cms.businesslogic.language;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 using System.Runtime.CompilerServices;
@@ -250,27 +251,17 @@ namespace umbraco.cms.businesslogic
 
             public XmlNode ToXml(XmlDocument xd)
             {
-
-                XmlNode dictionaryItem = xd.CreateElement("DictionaryItem");
-                dictionaryItem.Attributes.Append(xmlHelper.addAttribute(xd, "Key", this.key));
-                foreach (Language lang in Language.GetAllAsList())
-                {
-                    XmlNode itemValue = xmlHelper.addCDataNode(xd, "Value", this.Value(lang.id));
-                    itemValue.Attributes.Append(xmlHelper.addAttribute(xd, "LanguageId", lang.id.ToString(CultureInfo.InvariantCulture)));
-                    itemValue.Attributes.Append(xmlHelper.addAttribute(xd, "LanguageCultureAlias", lang.CultureAlias));
-                    dictionaryItem.AppendChild(itemValue);
-                }
-
+                var serializer = new EntityXmlSerializer();
+                var xml = serializer.Serialize(_dictionaryItem);
+                var xmlNode = xml.GetXmlNode(xd);
                 if (this.hasChildren)
                 {
-                    foreach (DictionaryItem di in this.Children)
+                    foreach (var di in this.Children)
                     {
-                        dictionaryItem.AppendChild(di.ToXml(xd));
+                        xmlNode.AppendChild(di.ToXml(xd));
                     }
                 }
-
-
-                return dictionaryItem;
+                return xmlNode;
             }
 
             public static DictionaryItem Import(XmlNode xmlData)
diff --git a/src/umbraco.cms/businesslogic/Property/Property.cs b/src/umbraco.cms/businesslogic/Property/Property.cs
index 1159db94a6..fbb606a11e 100644
--- a/src/umbraco.cms/businesslogic/Property/Property.cs
+++ b/src/umbraco.cms/businesslogic/Property/Property.cs
@@ -6,6 +6,7 @@ using System.Xml;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.datatype;
@@ -137,20 +138,9 @@ namespace umbraco.cms.businesslogic.property
         }
         public XmlNode ToXml(XmlDocument xd)
         {
-            string nodeName = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "data" : helpers.Casing.SafeAlias(PropertyType.Alias);
-            XmlNode x = xd.CreateNode(XmlNodeType.Element, nodeName, "");
-
-            // Alias
-            if (UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema)
-            {
-                XmlAttribute alias = xd.CreateAttribute("alias");
-                alias.Value = this.PropertyType.Alias;
-                x.Attributes.Append(alias);
-            }
-
-            x.AppendChild(_data.ToXMl(xd));
-
-            return x;
+            var serializer = new EntityXmlSerializer();
+            var xml = serializer.Serialize(ApplicationContext.Current.Services.DataTypeService, this._property);
+            return xml.GetXmlNode(xd);
         }
 
 
diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs
index 91da3f716e..58aa32d7e0 100644
--- a/src/umbraco.cms/businesslogic/macro/Macro.cs
+++ b/src/umbraco.cms/businesslogic/macro/Macro.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 using System.Linq;
@@ -32,7 +33,7 @@ namespace umbraco.cms.businesslogic.macro
 	public class Macro
 	{
         //initialize empty model
-	    internal IMacro MacroItem = new Umbraco.Core.Models.Macro();
+	    internal IMacro MacroEntity = new Umbraco.Core.Models.Macro();
 
         protected static ISqlHelper SqlHelper
         {
@@ -44,7 +45,7 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		public int Id 
 		{
-			get { return MacroItem.Id; }
+			get { return MacroEntity.Id; }
 		}
 		
 		/// <summary>
@@ -52,8 +53,8 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		public bool UseInEditor 
 		{
-            get { return MacroItem.UseInEditor; }
-			set { MacroItem.UseInEditor = value; }
+            get { return MacroEntity.UseInEditor; }
+			set { MacroEntity.UseInEditor = value; }
 		}
 
 		/// <summary>
@@ -64,8 +65,8 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		public int RefreshRate
 		{
-            get { return MacroItem.CacheDuration; }
-			set { MacroItem.CacheDuration = value; }
+            get { return MacroEntity.CacheDuration; }
+			set { MacroEntity.CacheDuration = value; }
 		}
 
         /// <summary>
@@ -75,8 +76,8 @@ namespace umbraco.cms.businesslogic.macro
         /// </summary>
 		public string Alias
 		{
-			get { return MacroItem.Alias; }
-			set { MacroItem.Alias = value; }
+			get { return MacroEntity.Alias; }
+			set { MacroEntity.Alias = value; }
 		}
 		
 		/// <summary>
@@ -84,8 +85,8 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		public string Name
 		{
-            get { return MacroItem.Name; }
-            set { MacroItem.Name = value; }
+            get { return MacroEntity.Name; }
+            set { MacroEntity.Name = value; }
 		}
 
 		/// <summary>
@@ -95,8 +96,8 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		public string Assembly
 		{
-            get { return MacroItem.ControlAssembly; }
-            set { MacroItem.ControlAssembly = value; }
+            get { return MacroEntity.ControlAssembly; }
+            set { MacroEntity.ControlAssembly = value; }
 		}
 
 		/// <summary>
@@ -107,8 +108,8 @@ namespace umbraco.cms.businesslogic.macro
 		/// </remarks>
 		public string Type
 		{
-            get { return MacroItem.ControlType; }
-            set { MacroItem.ControlType = value; }
+            get { return MacroEntity.ControlType; }
+            set { MacroEntity.ControlType = value; }
 		}
 
 		/// <summary>
@@ -118,8 +119,8 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		public string Xslt
 		{
-            get { return MacroItem.XsltPath; }
-            set { MacroItem.XsltPath = value; }
+            get { return MacroEntity.XsltPath; }
+            set { MacroEntity.XsltPath = value; }
 		}
 
 	    /// <summary>
@@ -132,8 +133,8 @@ namespace umbraco.cms.businesslogic.macro
 	    /// </remarks>
 	    public string ScriptingFile
 	    {
-	        get { return MacroItem.ScriptPath; }
-            set { MacroItem.ScriptPath = value; }
+	        get { return MacroEntity.ScriptPath; }
+            set { MacroEntity.ScriptPath = value; }
 	    }
 
 	    /// <summary>
@@ -143,8 +144,8 @@ namespace umbraco.cms.businesslogic.macro
 	    /// </summary>
 	    public bool RenderContent
 	    {
-            get { return MacroItem.DontRender == false; }
-            set { MacroItem.DontRender = value == false; }
+            get { return MacroEntity.DontRender == false; }
+            set { MacroEntity.DontRender = value == false; }
 	    }
 
 	    /// <summary>
@@ -153,8 +154,8 @@ namespace umbraco.cms.businesslogic.macro
 	    /// <value><c>true</c> if [cache personalized]; otherwise, <c>false</c>.</value>
 	    public bool CachePersonalized
 	    {
-            get { return MacroItem.CacheByMember; }
-            set { MacroItem.CacheByMember = value; }
+            get { return MacroEntity.CacheByMember; }
+            set { MacroEntity.CacheByMember = value; }
 	    }
 
 	    /// <summary>
@@ -163,8 +164,8 @@ namespace umbraco.cms.businesslogic.macro
 	    /// <value><c>true</c> if [cache by page]; otherwise, <c>false</c>.</value>
 	    public bool CacheByPage
 	    {
-            get { return MacroItem.CacheByPage; }
-            set { MacroItem.CacheByPage = value; }
+            get { return MacroEntity.CacheByPage; }
+            set { MacroEntity.CacheByPage = value; }
 	    }
 
 	    /// <summary>
@@ -174,7 +175,7 @@ namespace umbraco.cms.businesslogic.macro
 	    {
 	        get
 	        {
-	            return MacroItem.Properties.Select(x => new MacroProperty
+	            return MacroEntity.Properties.Select(x => new MacroProperty
 	                {
 	                    Alias = x.Alias,
 	                    Name = x.Name,
@@ -203,7 +204,7 @@ namespace umbraco.cms.businesslogic.macro
 
         internal Macro(IMacro macro)
         {
-            MacroItem = macro;
+            MacroEntity = macro;
         }
 
         /// <summary>
@@ -226,7 +227,7 @@ namespace umbraco.cms.businesslogic.macro
 
 	        if (e.Cancel == false)
 	        {
-	            ApplicationContext.Current.Services.MacroService.Save(MacroItem);
+	            ApplicationContext.Current.Services.MacroService.Save(MacroEntity);
 
 	            FireAfterSave(e);
 	        }
@@ -243,7 +244,7 @@ namespace umbraco.cms.businesslogic.macro
 
 		    if (e.Cancel == false)
 		    {
-		        ApplicationContext.Current.Services.MacroService.Delete(MacroItem);
+		        ApplicationContext.Current.Services.MacroService.Delete(MacroEntity);
 
 		        FireAfterDelete(e);
 		    }
@@ -338,7 +339,7 @@ namespace umbraco.cms.businesslogic.macro
             if (macro == null)
                 throw new ArgumentException(string.Format("No Macro exists with id '{0}'", id));
 
-		    MacroItem = macro;
+		    MacroEntity = macro;
 		}
 
         private void Setup(string alias)
@@ -348,7 +349,7 @@ namespace umbraco.cms.businesslogic.macro
             if (macro == null)
                 throw new ArgumentException(string.Format("No Macro exists with alias '{0}'", alias));
 
-            MacroItem = macro;
+            MacroEntity = macro;
         }
 
 	    /// <summary>
@@ -358,25 +359,9 @@ namespace umbraco.cms.businesslogic.macro
 	    /// <returns>An xmlrepresentation of the macro</returns>
 	    public XmlNode ToXml(XmlDocument xd)
 	    {
-	        XmlNode doc = xd.CreateElement("macro");
-
-	        // info section
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "name", this.Name));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "alias", this.Alias));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "scriptType", this.Type));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "scriptAssembly", this.Assembly));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "xslt", this.Xslt));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "useInEditor", this.UseInEditor.ToString()));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "refreshRate", this.RefreshRate.ToString(CultureInfo.InvariantCulture)));
-	        doc.AppendChild(XmlHelper.AddTextNode(xd, "scriptingFile", this.ScriptingFile));
-
-	        // properties
-	        XmlNode props = xd.CreateElement("properties");
-	        foreach (var p in this.Properties)
-	            props.AppendChild(p.ToXml(xd));
-	        doc.AppendChild(props);
-
-	        return doc;
+            var serializer = new EntityXmlSerializer();
+            var xml = serializer.Serialize(MacroEntity);
+            return xml.GetXmlNode(xd);
 	    }
 
 	    [Obsolete("This does nothing")]
diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
index cc53877a26..f43d5698df 100644
--- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs
+++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.cache;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using umbraco.DataLayer;
 using Umbraco.Core;
 using File = System.IO.File;
@@ -21,7 +22,7 @@ namespace umbraco.cms.businesslogic.web
     [Obsolete("Use Umbraco.Core.Services.IFileService instead")]
     public class StyleSheet : CMSNode
     {
-        internal Stylesheet StylesheetItem;
+        internal Stylesheet StylesheetEntity;
 
         public static Guid ModuleObjectType = new Guid(Constants.ObjectTypes.Stylesheet);
         
@@ -29,33 +30,33 @@ namespace umbraco.cms.businesslogic.web
         {
             get
             {
-                var path = StylesheetItem.Path;
+                var path = StylesheetEntity.Path;
                 if (path.IsNullOrWhiteSpace()) return string.Empty;
-                return System.IO.Path.GetFileNameWithoutExtension(StylesheetItem.Path);
+                return System.IO.Path.GetFileNameWithoutExtension(StylesheetEntity.Path);
             }
             set
             {
                 //setting the file name changing it's path
-                StylesheetItem.Path = StylesheetItem.Path.TrimEnd(StylesheetItem.Name) + value.EnsureEndsWith(".css");
+                StylesheetEntity.Path = StylesheetEntity.Path.TrimEnd(StylesheetEntity.Name) + value.EnsureEndsWith(".css");
             }
         }
 
         public string Content
         {
-            get { return StylesheetItem.Content; }
-            set { StylesheetItem.Content = value; }
+            get { return StylesheetEntity.Content; }
+            set { StylesheetEntity.Content = value; }
         }
 
         public StylesheetProperty[] Properties
         {
-            get { return StylesheetItem.Properties.Select(x => new StylesheetProperty(StylesheetItem, x)).ToArray(); }
+            get { return StylesheetEntity.Properties.Select(x => new StylesheetProperty(StylesheetEntity, x)).ToArray(); }
         }
 
         internal StyleSheet(Stylesheet stylesheet)
             : base(stylesheet)
         {
             if (stylesheet == null) throw new ArgumentNullException("stylesheet");
-            StylesheetItem = stylesheet;
+            StylesheetEntity = stylesheet;
         }
 
         public StyleSheet(Guid id)
@@ -100,8 +101,8 @@ namespace umbraco.cms.businesslogic.web
         /// <value>The create date time.</value>
         public override DateTime CreateDateTime
         {
-            get { return StylesheetItem.CreateDate; }
-            set { StylesheetItem.CreateDate = value; }
+            get { return StylesheetEntity.CreateDate; }
+            set { StylesheetEntity.CreateDate = value; }
         }
         
         /// <summary>
@@ -122,7 +123,7 @@ namespace umbraco.cms.businesslogic.web
             FireBeforeSave(e);
             if (!e.Cancel)
             {
-                ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetItem);
+                ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetEntity);
 
                 FireAfterSave(e);
             }
@@ -192,7 +193,7 @@ namespace umbraco.cms.businesslogic.web
             
             if (!e.Cancel)
             {
-                ApplicationContext.Current.Services.FileService.DeleteStylesheet(StylesheetItem.Path);
+                ApplicationContext.Current.Services.FileService.DeleteStylesheet(StylesheetEntity.Path);
 
                 FireAfterDelete(e);
             }
@@ -201,31 +202,14 @@ namespace umbraco.cms.businesslogic.web
 
         public void saveCssToFile()
         {
-            ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetItem);
+            ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetEntity);
         }
 
         public XmlNode ToXml(XmlDocument xd)
         {
-            XmlNode doc = xd.CreateElement("Stylesheet");
-            doc.AppendChild(xmlHelper.addTextNode(xd, "Name", this.Text));
-            doc.AppendChild(xmlHelper.addTextNode(xd, "FileName", this.Filename));
-            doc.AppendChild(xmlHelper.addCDataNode(xd, "Content", this.Content));
-
-            if (this.Properties.Length > 0)
-            {
-                XmlNode properties = xd.CreateElement("Properties");
-                foreach (StylesheetProperty sp in this.Properties)
-                {
-                    XmlElement prop = xd.CreateElement("Property");
-                    prop.AppendChild(xmlHelper.addTextNode(xd, "Name", sp.Text));
-                    prop.AppendChild(xmlHelper.addTextNode(xd, "Alias", sp.Alias));
-                    prop.AppendChild(xmlHelper.addTextNode(xd, "Value", sp.value));
-                    properties.AppendChild(prop);
-                }
-                doc.AppendChild(properties);
-            }
-
-            return doc;
+            var serializer = new EntityXmlSerializer();
+            var xml = serializer.Serialize(StylesheetEntity);
+            return xml.GetXmlNode(xd);
         }
 
         public static StyleSheet GetStyleSheet(int id, bool setupStyleProperties, bool loadContentFromFile)
diff --git a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs
index e3d68ccc62..4d530bd9ed 100644
--- a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs
+++ b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs
@@ -88,10 +88,10 @@ namespace umbraco.cms.businesslogic.web
         {
             //we need to create it with a temp place holder!
             var prop = new Umbraco.Core.Models.StylesheetProperty(Text, "#" + Text.ToSafeAlias(), "");
-            sheet.StylesheetItem.AddProperty(prop);
-            ApplicationContext.Current.Services.FileService.SaveStylesheet(sheet.StylesheetItem);
+            sheet.StylesheetEntity.AddProperty(prop);
+            ApplicationContext.Current.Services.FileService.SaveStylesheet(sheet.StylesheetEntity);
 
-            var ssp = new StylesheetProperty(sheet.StylesheetItem, prop);
+            var ssp = new StylesheetProperty(sheet.StylesheetEntity, prop);
             var e = new NewEventArgs();
             ssp.OnNew(e);
             return ssp;

From 2cd92353ec2a39d05dd5989a4784fdc25ec50bbf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Jan 2015 12:17:36 +1100
Subject: [PATCH 13/18] Removes listening on legacy events for the
 CacheRefresherEventHandler

---
 src/Umbraco.Core/Cache/CacheKeys.cs           |   1 +
 src/Umbraco.Core/Services/DomainService.cs    |  43 +++-
 .../Cache/CacheRefresherEventHandler.cs       | 207 ++++--------------
 .../Cache/DistributedCacheExtensions.cs       |   4 +-
 src/Umbraco.Web/Cache/DomainCacheRefresher.cs |   2 -
 .../businesslogic/Packager/Installer.cs       |   1 +
 .../datatype/DataTypeDefinition.cs            |   2 +-
 src/umbraco.cms/businesslogic/macro/Macro.cs  |   2 +
 8 files changed, 83 insertions(+), 179 deletions(-)

diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs
index c370b13303..f76ff0439f 100644
--- a/src/Umbraco.Core/Cache/CacheKeys.cs
+++ b/src/Umbraco.Core/Cache/CacheKeys.cs
@@ -48,6 +48,7 @@ namespace Umbraco.Core.Cache
         [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         public const string LanguageCacheKey = "UmbracoLanguageCache";
 
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         public const string DomainCacheKey = "UmbracoDomainList";
 
         [Obsolete("This is no longer used and will be removed from the codebase in the future")]
diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs
index 86d883bd48..f2ff88e001 100644
--- a/src/Umbraco.Core/Services/DomainService.cs
+++ b/src/Umbraco.Core/Services/DomainService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
@@ -9,8 +10,6 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
 {
-    //TODO: Add events!
-
     public class DomainService : RepositoryService, IDomainService
     {
         public DomainService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger)
@@ -29,12 +28,18 @@ namespace Umbraco.Core.Services
 
         public void Delete(IDomain domain)
         {
+            if (Deleting.IsRaisedEventCancelled(new DeleteEventArgs<IDomain>(domain), this))
+                return;
+
             var uow = UowProvider.GetUnitOfWork();
             using (var repository = RepositoryFactory.CreateDomainRepository(uow))
             {
                 repository.Delete(domain);
-                uow.Commit();
+                uow.Commit();               
             }
+
+            var args = new DeleteEventArgs<IDomain>(domain, false);
+            Deleted.RaiseEvent(args, this);
         }
 
         public IDomain GetByName(string name)
@@ -77,8 +82,8 @@ namespace Umbraco.Core.Services
         {
             if (raiseEvents)
             {
-                //if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
-                //    return;
+                if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IDomain>(domainEntity), this))
+                    return;
             }
 
             var uow = UowProvider.GetUnitOfWork();
@@ -88,8 +93,32 @@ namespace Umbraco.Core.Services
                 uow.Commit();
             }
 
-            //if (raiseEvents)
-            //    Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
+            if (raiseEvents)
+                Saved.RaiseEvent(new SaveEventArgs<IDomain>(domainEntity, false), this);
         }
+
+        #region Event Handlers
+        /// <summary>
+        /// Occurs before Delete
+        /// </summary>		
+        public static event TypedEventHandler<IDomainService, DeleteEventArgs<IDomain>> Deleting;
+
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+        public static event TypedEventHandler<IDomainService, DeleteEventArgs<IDomain>> Deleted;
+      
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+        public static event TypedEventHandler<IDomainService, SaveEventArgs<IDomain>> Saving;
+
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+        public static event TypedEventHandler<IDomainService, SaveEventArgs<IDomain>> Saved;
+
+      
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index 56c0669819..8cc56a7e95 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -1,25 +1,17 @@
 using System;
-using System.Collections.Generic;
 using Umbraco.Core;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services;
-using umbraco;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic;
-using umbraco.cms.businesslogic.member;
 using System.Linq;
 using umbraco.cms.businesslogic.web;
 using Content = Umbraco.Core.Models.Content;
 using ApplicationTree = Umbraco.Core.Models.ApplicationTree;
 using DeleteEventArgs = umbraco.cms.businesslogic.DeleteEventArgs;
-using Macro = umbraco.cms.businesslogic.macro.Macro;
-using Member = umbraco.cms.businesslogic.member.Member;
-using Template = umbraco.cms.businesslogic.template.Template;
 
 namespace Umbraco.Web.Cache
 {
@@ -46,44 +38,30 @@ namespace Umbraco.Web.Cache
             UserService.DeletedUser += UserServiceDeletedUser;
 
             //Bind to dictionary events
-            //NOTE: we need to bind to legacy and new API events currently: http://issues.umbraco.org/issue/U4-1979
 
-            global::umbraco.cms.businesslogic.Dictionary.DictionaryItem.New += DictionaryItemNew;
-            global::umbraco.cms.businesslogic.Dictionary.DictionaryItem.Saving +=DictionaryItemSaving;
-            global::umbraco.cms.businesslogic.Dictionary.DictionaryItem.Deleted +=DictionaryItemDeleted;
             LocalizationService.DeletedDictionaryItem += LocalizationServiceDeletedDictionaryItem;
             LocalizationService.SavedDictionaryItem += LocalizationServiceSavedDictionaryItem;
 
             //Bind to data type events
             //NOTE: we need to bind to legacy and new API events currently: http://issues.umbraco.org/issue/U4-1979
-
+            //TODO: Wrap as much of this api as possible so that we don't need to listen to legacy events!
             global::umbraco.cms.businesslogic.datatype.DataTypeDefinition.AfterDelete += DataTypeDefinitionDeleting;
             global::umbraco.cms.businesslogic.datatype.DataTypeDefinition.Saving += DataTypeDefinitionSaving;
             DataTypeService.Deleted += DataTypeServiceDeleted;
             DataTypeService.Saved += DataTypeServiceSaved;
 
             //Bind to stylesheet events
-            //NOTE: we need to bind to legacy and new API events currently: http://issues.umbraco.org/issue/U4-1979
 
-            global::umbraco.cms.businesslogic.web.StylesheetProperty.AfterSave += StylesheetPropertyAfterSave;
-            global::umbraco.cms.businesslogic.web.StylesheetProperty.AfterDelete += StylesheetPropertyAfterDelete;
-            global::umbraco.cms.businesslogic.web.StyleSheet.AfterDelete += StyleSheetAfterDelete;
-            global::umbraco.cms.businesslogic.web.StyleSheet.AfterSave += StyleSheetAfterSave;
             FileService.SavedStylesheet += FileServiceSavedStylesheet;
             FileService.DeletedStylesheet += FileServiceDeletedStylesheet;
 
             //Bind to domain events
 
-            Domain.AfterSave += DomainAfterSave;
-            Domain.AfterDelete += DomainAfterDelete;
-            Domain.New += DomainNew;
+            DomainService.Saved += DomainService_Saved;
+            DomainService.Deleted += DomainService_Deleted;
 
             //Bind to language events
-            //NOTE: we need to bind to legacy and new API events currently: http://issues.umbraco.org/issue/U4-1979
 
-            global::umbraco.cms.businesslogic.language.Language.AfterDelete += LanguageAfterDelete;
-            global::umbraco.cms.businesslogic.language.Language.New += LanguageNew;
-            global::umbraco.cms.businesslogic.language.Language.AfterSave += LanguageAfterSave;
             LocalizationService.SavedLanguage += LocalizationServiceSavedLanguage;
             LocalizationService.DeletedLanguage += LocalizationServiceDeletedLanguage;
 
@@ -98,23 +76,19 @@ namespace Umbraco.Web.Cache
 
             //Bind to permission events
 
+            //TODO: Wrap legacy permissions so we can get rid of this
             Permission.New += PermissionNew;
             Permission.Updated += PermissionUpdated;
             Permission.Deleted += PermissionDeleted;
             PermissionRepository<IContent>.AssignedPermissions += CacheRefresherEventHandler_AssignedPermissions;
 
             //Bind to template events
-            //NOTE: we need to bind to legacy and new API events currently: http://issues.umbraco.org/issue/U4-1979
 
-            Template.AfterSave += TemplateAfterSave;
-            Template.AfterDelete += TemplateAfterDelete;
             FileService.SavedTemplate += FileServiceSavedTemplate;
             FileService.DeletedTemplate += FileServiceDeletedTemplate;
 
             //Bind to macro events
 
-            Macro.AfterSave += MacroAfterSave;
-            Macro.AfterDelete += MacroAfterDelete;
             MacroService.Saved += MacroServiceSaved;
             MacroService.Deleted += MacroServiceDeleted;
 
@@ -147,6 +121,8 @@ namespace Umbraco.Web.Cache
             Access.AfterSave += Access_AfterSave;
         }
 
+       
+
         #region Public access event handlers
 
         static void Access_AfterSave(Access sender, SaveEventArgs e)
@@ -258,41 +234,41 @@ namespace Umbraco.Web.Cache
         #endregion
 
         #region ApplicationTree event handlers
-        static void ApplicationTreeNew(ApplicationTree sender, System.EventArgs e)
+        static void ApplicationTreeNew(ApplicationTree sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationTreeCache();
         }
 
-        static void ApplicationTreeUpdated(ApplicationTree sender, System.EventArgs e)
+        static void ApplicationTreeUpdated(ApplicationTree sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationTreeCache();
         }
 
-        static void ApplicationTreeDeleted(ApplicationTree sender, System.EventArgs e)
+        static void ApplicationTreeDeleted(ApplicationTree sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationTreeCache();
         } 
         #endregion
 
         #region Application event handlers
-        static void ApplicationNew(Section sender, System.EventArgs e)
+        static void ApplicationNew(Section sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationCache();
         }
 
-        static void ApplicationDeleted(Section sender, System.EventArgs e)
+        static void ApplicationDeleted(Section sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationCache();
         } 
         #endregion
 
         #region UserType event handlers
-        static void UserServiceDeletedUserType(IUserService sender, Core.Events.DeleteEventArgs<Core.Models.Membership.IUserType> e)
+        static void UserServiceDeletedUserType(IUserService sender, DeleteEventArgs<IUserType> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveUserTypeCache(x.Id));
         }
 
-        static void UserServiceSavedUserType(IUserService sender, Core.Events.SaveEventArgs<Core.Models.Membership.IUserType> e)
+        static void UserServiceSavedUserType(IUserService sender, SaveEventArgs<IUserType> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshUserTypeCache(x.Id));
         }
@@ -301,40 +277,25 @@ namespace Umbraco.Web.Cache
         
         #region Dictionary event handlers
 
-        static void LocalizationServiceSavedDictionaryItem(ILocalizationService sender, Core.Events.SaveEventArgs<IDictionaryItem> e)
+        static void LocalizationServiceSavedDictionaryItem(ILocalizationService sender, SaveEventArgs<IDictionaryItem> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshDictionaryCache(x.Id));
         }
 
-        static void LocalizationServiceDeletedDictionaryItem(ILocalizationService sender, Core.Events.DeleteEventArgs<IDictionaryItem> e)
+        static void LocalizationServiceDeletedDictionaryItem(ILocalizationService sender, DeleteEventArgs<IDictionaryItem> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveDictionaryCache(x.Id));
         }
 
-        static void DictionaryItemDeleted(global::umbraco.cms.businesslogic.Dictionary.DictionaryItem sender, System.EventArgs e)
-        {
-            DistributedCache.Instance.RemoveDictionaryCache(sender.id);
-        }
-
-        static void DictionaryItemSaving(global::umbraco.cms.businesslogic.Dictionary.DictionaryItem sender, System.EventArgs e)
-        {
-            DistributedCache.Instance.RefreshDictionaryCache(sender.id);
-        }
-
-        static void DictionaryItemNew(global::umbraco.cms.businesslogic.Dictionary.DictionaryItem sender, System.EventArgs e)
-        {
-            DistributedCache.Instance.RefreshDictionaryCache(sender.id);
-        } 
-
         #endregion
 
         #region DataType event handlers
-        static void DataTypeServiceSaved(IDataTypeService sender, Core.Events.SaveEventArgs<IDataTypeDefinition> e)
+        static void DataTypeServiceSaved(IDataTypeService sender, SaveEventArgs<IDataTypeDefinition> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshDataTypeCache(x));
         }
 
-        static void DataTypeServiceDeleted(IDataTypeService sender, Core.Events.DeleteEventArgs<IDataTypeDefinition> e)
+        static void DataTypeServiceDeleted(IDataTypeService sender, DeleteEventArgs<IDataTypeDefinition> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveDataTypeCache(x));
         }
@@ -351,52 +312,31 @@ namespace Umbraco.Web.Cache
         #endregion
 
         #region Stylesheet and stylesheet property event handlers
-        static void StylesheetPropertyAfterSave(global::umbraco.cms.businesslogic.web.StylesheetProperty sender, SaveEventArgs e)
-        {
-            DistributedCache.Instance.RefreshStylesheetPropertyCache(sender);
-        }
-
-        static void StylesheetPropertyAfterDelete(global::umbraco.cms.businesslogic.web.StylesheetProperty sender, DeleteEventArgs e)
-        {
-            DistributedCache.Instance.RemoveStylesheetPropertyCache(sender);
-        }
-
-        static void FileServiceDeletedStylesheet(IFileService sender, Core.Events.DeleteEventArgs<Stylesheet> e)
+     
+        static void FileServiceDeletedStylesheet(IFileService sender, DeleteEventArgs<Stylesheet> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveStylesheetCache(x));
         }
 
-        static void FileServiceSavedStylesheet(IFileService sender, Core.Events.SaveEventArgs<Stylesheet> e)
+        static void FileServiceSavedStylesheet(IFileService sender, SaveEventArgs<Stylesheet> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshStylesheetCache(x));
         }
 
-        static void StyleSheetAfterSave(StyleSheet sender, SaveEventArgs e)
-        {
-            DistributedCache.Instance.RefreshStylesheetCache(sender);
-        }
-
-        static void StyleSheetAfterDelete(StyleSheet sender, DeleteEventArgs e)
-        {
-            DistributedCache.Instance.RemoveStylesheetCache(sender);
-        } 
         #endregion
 
         #region Domain event handlers
-        static void DomainNew(Domain sender, NewEventArgs e)
+
+        static void DomainService_Saved(IDomainService sender, SaveEventArgs<IDomain> e)
         {
-            DistributedCache.Instance.RefreshDomainCache(sender);
+            e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshDomainCache(x));
         }
 
-        static void DomainAfterDelete(Domain sender, DeleteEventArgs e)
+        static void DomainService_Deleted(IDomainService sender, DeleteEventArgs<IDomain> e)
         {
-            DistributedCache.Instance.RemoveDomainCache(sender);
+            e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveDomainCache(x));
         }
 
-        static void DomainAfterSave(Domain sender, SaveEventArgs e)
-        {
-            DistributedCache.Instance.RefreshDomainCache(sender);
-        } 
         #endregion
 
         #region Language event handlers
@@ -405,7 +345,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void LocalizationServiceDeletedLanguage(ILocalizationService sender, Core.Events.DeleteEventArgs<ILanguage> e)
+        static void LocalizationServiceDeletedLanguage(ILocalizationService sender, DeleteEventArgs<ILanguage> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveLanguageCache(x));
         }
@@ -415,40 +355,11 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void LocalizationServiceSavedLanguage(ILocalizationService sender, Core.Events.SaveEventArgs<ILanguage> e)
+        static void LocalizationServiceSavedLanguage(ILocalizationService sender, SaveEventArgs<ILanguage> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshLanguageCache(x));
         }
-
-        /// <summary>
-        /// Fires when a langauge is saved
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void LanguageAfterSave(global::umbraco.cms.businesslogic.language.Language sender, SaveEventArgs e)
-        {
-            DistributedCache.Instance.RefreshLanguageCache(sender);
-        }
-
-        /// <summary>
-        /// Fires when a langauge is created
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void LanguageNew(global::umbraco.cms.businesslogic.language.Language sender, NewEventArgs e)
-        {
-            DistributedCache.Instance.RefreshLanguageCache(sender);
-        }
-
-        /// <summary>
-        /// Fires when a langauge is deleted
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void LanguageAfterDelete(global::umbraco.cms.businesslogic.language.Language sender, DeleteEventArgs e)
-        {
-            DistributedCache.Instance.RemoveLanguageCache(sender);
-        } 
+      
         #endregion
 
         #region Content/media/member Type event handlers
@@ -457,7 +368,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void ContentTypeServiceDeletedMediaType(IContentTypeService sender, Core.Events.DeleteEventArgs<IMediaType> e)
+        static void ContentTypeServiceDeletedMediaType(IContentTypeService sender, DeleteEventArgs<IMediaType> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveMediaTypeCache(x));
         }
@@ -467,7 +378,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void ContentTypeServiceDeletedContentType(IContentTypeService sender, Core.Events.DeleteEventArgs<IContentType> e)
+        static void ContentTypeServiceDeletedContentType(IContentTypeService sender, DeleteEventArgs<IContentType> e)
         {
             e.DeletedEntities.ForEach(contentType => DistributedCache.Instance.RemoveContentTypeCache(contentType));
         }
@@ -477,7 +388,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void MemberTypeServiceDeleted(IMemberTypeService sender, Core.Events.DeleteEventArgs<IMemberType> e)
+        static void MemberTypeServiceDeleted(IMemberTypeService sender, DeleteEventArgs<IMemberType> e)
         {
             e.DeletedEntities.ForEach(contentType => DistributedCache.Instance.RemoveMemberTypeCache(contentType));
         }
@@ -487,7 +398,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void ContentTypeServiceSavedMediaType(IContentTypeService sender, Core.Events.SaveEventArgs<IMediaType> e)
+        static void ContentTypeServiceSavedMediaType(IContentTypeService sender, SaveEventArgs<IMediaType> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshMediaTypeCache(x));
         }
@@ -497,7 +408,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void ContentTypeServiceSavedContentType(IContentTypeService sender, Core.Events.SaveEventArgs<IContentType> e)
+        static void ContentTypeServiceSavedContentType(IContentTypeService sender, SaveEventArgs<IContentType> e)
         {
             e.SavedEntities.ForEach(contentType => DistributedCache.Instance.RefreshContentTypeCache(contentType));
         }
@@ -507,7 +418,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void MemberTypeServiceSaved(IMemberTypeService sender, Core.Events.SaveEventArgs<IMemberType> e)
+        static void MemberTypeServiceSaved(IMemberTypeService sender, SaveEventArgs<IMemberType> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshMemberTypeCache(x));
         }
@@ -573,7 +484,7 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void FileServiceDeletedTemplate(IFileService sender, Core.Events.DeleteEventArgs<ITemplate> e)
+        static void FileServiceDeletedTemplate(IFileService sender, DeleteEventArgs<ITemplate> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveTemplateCache(x.Id));
         }
@@ -583,35 +494,16 @@ namespace Umbraco.Web.Cache
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        static void FileServiceSavedTemplate(IFileService sender, Core.Events.SaveEventArgs<ITemplate> e)
+        static void FileServiceSavedTemplate(IFileService sender, SaveEventArgs<ITemplate> e)
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshTemplateCache(x.Id));
         }
-        
-        /// <summary>
-        /// Removes cache for template
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void TemplateAfterDelete(Template sender, DeleteEventArgs e)
-        {
-            DistributedCache.Instance.RemoveTemplateCache(sender.Id);
-        }
-
-        /// <summary>
-        /// Refresh cache for template
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void TemplateAfterSave(Template sender, SaveEventArgs e)
-        {
-            DistributedCache.Instance.RefreshTemplateCache(sender.Id);
-        } 
+      
         #endregion
 
         #region Macro event handlers
 
-        void MacroServiceDeleted(IMacroService sender, Core.Events.DeleteEventArgs<IMacro> e)
+        void MacroServiceDeleted(IMacroService sender, DeleteEventArgs<IMacro> e)
         {
             foreach (var entity in e.DeletedEntities)
             {
@@ -619,33 +511,14 @@ namespace Umbraco.Web.Cache
             }
         }
 
-        void MacroServiceSaved(IMacroService sender, Core.Events.SaveEventArgs<IMacro> e)
+        void MacroServiceSaved(IMacroService sender, SaveEventArgs<IMacro> e)
         {
             foreach (var entity in e.SavedEntities)
             {
                 DistributedCache.Instance.RefreshMacroCache(entity);
             }
         }
-        
-        /// <summary>
-        /// Flush macro from cache
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void MacroAfterDelete(Macro sender, DeleteEventArgs e)
-        {
-            DistributedCache.Instance.RemoveMacroCache(sender);
-        }
-
-        /// <summary>
-        /// Flush macro from cache
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        static void MacroAfterSave(Macro sender, SaveEventArgs e)
-        {
-            DistributedCache.Instance.RefreshMacroCache(sender);
-        } 
+  
         #endregion
 
         #region Media event handlers
diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index 0185e76f30..9477d4a075 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -648,7 +648,7 @@ namespace Umbraco.Web.Cache
 
         #region Domain Cache
 
-        public static void RefreshDomainCache(this DistributedCache dc, Domain domain)
+        public static void RefreshDomainCache(this DistributedCache dc, IDomain domain)
         {
             if (domain != null)
             {
@@ -656,7 +656,7 @@ namespace Umbraco.Web.Cache
             }
         }
 
-        public static void RemoveDomainCache(this DistributedCache dc, Domain domain)
+        public static void RemoveDomainCache(this DistributedCache dc, IDomain domain)
         {
             if (domain != null)
             {
diff --git a/src/Umbraco.Web/Cache/DomainCacheRefresher.cs b/src/Umbraco.Web/Cache/DomainCacheRefresher.cs
index f5f0fb442b..11f8291e6c 100644
--- a/src/Umbraco.Web/Cache/DomainCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DomainCacheRefresher.cs
@@ -40,8 +40,6 @@ namespace Umbraco.Web.Cache
 
         private void ClearCache()
         {
-            ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.DomainCacheKey);
-
             // SD: we need to clear the routes cache here!             
             //
             // zpqrtbnk: no, not here, in fact the caches should subsribe to refresh events else we
diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index 552a9e62e4..4be82ba7b7 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -352,6 +352,7 @@ namespace umbraco.cms.businesslogic.packager
                 #region Macros
                 foreach (XmlNode n in Config.DocumentElement.SelectNodes("//macro"))
                 {
+                    //TODO: Fix this, this should not use the legacy API
                     Macro m = Macro.Import(n);
 
                     if (m != null)
diff --git a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
index 821a50342a..da7005ff72 100644
--- a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
@@ -17,7 +17,7 @@ using Umbraco.Core;
 namespace umbraco.cms.businesslogic.datatype
 {
 
-    
+    //TODO: Wrap as much of this api as possible so that we don't need to listen to legacy events!
 
     /// <summary>
     /// Datatypedefinitions is the basic buildingblocks of umbraco's documents/medias/members generic datastructure 
diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs
index 58aa32d7e0..8c1239a056 100644
--- a/src/umbraco.cms/businesslogic/macro/Macro.cs
+++ b/src/umbraco.cms/businesslogic/macro/Macro.cs
@@ -250,6 +250,8 @@ namespace umbraco.cms.businesslogic.macro
 		    }
 		}
 
+        //TODO: Fix this, this should wrap a new API!
+
         public static Macro Import(XmlNode n)
         {
             var alias = XmlHelper.GetNodeValue(n.SelectSingleNode("alias"));

From 2f86813a21eff3573dd9d5e809525c927ecef1a5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Jan 2015 15:16:10 +1100
Subject: [PATCH 14/18] Migrating usages of old domain object to new
 IDomainService, this also involves updated quite a lot of unit tests. I've
 updated quite a few of the routing tests to be pure mocking tests which works
 much nicer than before so there's no db access, this also means they run a
 million times faster (need to clean them up further still though). Still more
 tests failing which need fixing.

---
 src/Umbraco.Core/ApplicationContext.cs        |   2 +-
 src/Umbraco.Tests/MockTests.cs                |  76 +------
 src/Umbraco.Tests/Mvc/UmbracoViewPageTests.cs |  68 ++++++-
 .../Routing/ContentFinderByAliasTests.cs      |   4 +-
 .../ContentFinderByAliasWithDomainsTests.cs   |  42 +---
 .../ContentFinderByNiceUrlWithDomainsTests.cs |  78 +++++---
 .../Routing/DomainsAndCulturesTests.cs        |  73 +++----
 .../NiceUrlsProviderWithDomainsTests.cs       | 187 ++++++++----------
 .../Routing/UrlRoutingTestBase.cs             |  63 ++++++
 .../Routing/UrlsWithNestedDomains.cs          |  55 ++----
 .../Routing/uQueryGetNodeIdByUrlTests.cs      |  10 +-
 .../TestHelpers/BaseRoutingTest.cs            |  15 +-
 src/Umbraco.Tests/TestHelpers/MockHelper.cs   |  59 ++++++
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |   2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 +
 src/Umbraco.Web/Routing/DefaultUrlProvider.cs |  16 +-
 src/Umbraco.Web/Routing/UrlProvider.cs        |   5 +-
 src/Umbraco.Web/Search/ExamineEvents.cs       |   9 -
 src/Umbraco.Web/UmbracoContext.cs             |  96 +++++++--
 19 files changed, 485 insertions(+), 377 deletions(-)
 create mode 100644 src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
 create mode 100644 src/Umbraco.Tests/TestHelpers/MockHelper.cs

diff --git a/src/Umbraco.Core/ApplicationContext.cs b/src/Umbraco.Core/ApplicationContext.cs
index 0aceac24bf..f42e4723fc 100644
--- a/src/Umbraco.Core/ApplicationContext.cs
+++ b/src/Umbraco.Core/ApplicationContext.cs
@@ -338,7 +338,7 @@ namespace Umbraco.Core
                 this.ApplicationCache = null;
                 if (_databaseContext != null) //need to check the internal field here
                 {
-                    if (DatabaseContext.IsDatabaseConfigured)
+                    if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.Database != null)
                     {
                         DatabaseContext.Database.Dispose();       
                     }                    
diff --git a/src/Umbraco.Tests/MockTests.cs b/src/Umbraco.Tests/MockTests.cs
index 6a91efcb7b..e7fdfea54d 100644
--- a/src/Umbraco.Tests/MockTests.cs
+++ b/src/Umbraco.Tests/MockTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
 using Moq;
+using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 
 namespace Umbraco.Tests
@@ -31,42 +32,7 @@ namespace Umbraco.Tests
         [Test]
         public void Can_Create_Service_Context()
         {
-            var svcCtx = new ServiceContext(
-                new Mock<IContentService>().Object,
-                new Mock<IMediaService>().Object,
-                new Mock<IContentTypeService>().Object,
-                new Mock<IDataTypeService>().Object,
-                new Mock<IFileService>().Object,
-                new Mock<ILocalizationService>().Object,
-                new PackagingService(
-                    new Mock<ILogger>().Object,
-                    new Mock<IContentService>().Object,
-                    new Mock<IContentTypeService>().Object,
-                    new Mock<IMediaService>().Object,
-                    new Mock<IMacroService>().Object,
-                    new Mock<IDataTypeService>().Object,
-                    new Mock<IFileService>().Object,
-                    new Mock<ILocalizationService>().Object,
-                    new Mock<IUserService>().Object,
-                    new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), Mock.Of<IUmbracoSettingsSection>()),
-                    new Mock<IDatabaseUnitOfWorkProvider>().Object),
-                new Mock<IEntityService>().Object,
-                new RelationService(
-                    new Mock<IDatabaseUnitOfWorkProvider>().Object,
-                    new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), Mock.Of<IUmbracoSettingsSection>()),
-                    Mock.Of<ILogger>(), 
-                    new Mock<IEntityService>().Object),
-                new Mock<IMemberGroupService>().Object,
-                new Mock<IMemberTypeService>().Object,
-                new Mock<IMemberService>().Object,
-                new Mock<IUserService>().Object,
-            new Mock<ISectionService>().Object,
-                new Mock<IApplicationTreeService>().Object,
-                new Mock<ITagService>().Object,
-                new Mock<INotificationService>().Object,
-                Mock.Of<ILocalizedTextService>(),
-                Mock.Of<IAuditService>(),
-                Mock.Of<IDomainService>());
+            var svcCtx = MockHelper.GetMockedServiceContext();
             Assert.Pass();
         }
 
@@ -82,42 +48,7 @@ namespace Umbraco.Tests
         {
             var appCtx = new ApplicationContext(
                 new DatabaseContext(new Mock<IDatabaseFactory>().Object, Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), "test"),
-                new ServiceContext(                    
-                    new Mock<IContentService>().Object,
-                    new Mock<IMediaService>().Object,
-                    new Mock<IContentTypeService>().Object,
-                    new Mock<IDataTypeService>().Object,
-                    new Mock<IFileService>().Object,
-                    new Mock<ILocalizationService>().Object,
-                    new PackagingService(
-                        new Mock<ILogger>().Object,
-                        new Mock<IContentService>().Object,
-                        new Mock<IContentTypeService>().Object,
-                        new Mock<IMediaService>().Object,
-                        new Mock<IMacroService>().Object,
-                        new Mock<IDataTypeService>().Object,
-                        new Mock<IFileService>().Object,
-                        new Mock<ILocalizationService>().Object,
-                        new Mock<IUserService>().Object,
-                        new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), Mock.Of<IUmbracoSettingsSection>()),
-                        new Mock<IDatabaseUnitOfWorkProvider>().Object),
-                    new Mock<IEntityService>().Object,
-                    new RelationService(
-                        new Mock<IDatabaseUnitOfWorkProvider>().Object,
-                        new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), Mock.Of<IUmbracoSettingsSection>()),
-                        Mock.Of<ILogger>(), 
-                        new Mock<IEntityService>().Object),
-                    new Mock<IMemberGroupService>().Object,
-                    new Mock<IMemberTypeService>().Object,
-                    new Mock<IMemberService>().Object,
-                    new Mock<IUserService>().Object,
-                    new Mock<ISectionService>().Object,
-                    new Mock<IApplicationTreeService>().Object,
-                    new Mock<ITagService>().Object,
-                    new Mock<INotificationService>().Object,
-                    Mock.Of<ILocalizedTextService>(),
-                    Mock.Of<IAuditService>(),
-                    Mock.Of<IDomainService>()),
+                MockHelper.GetMockedServiceContext(),
                 CacheHelper.CreateDisabledCacheHelper(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
             
@@ -150,6 +81,7 @@ namespace Umbraco.Tests
             var umbCtx = UmbracoContext.EnsureContext(
                 new Mock<HttpContextBase>().Object,
                 appCtx,
+                Mock.Of<IUmbracoSettingsSection>(),
                 true);
             
             Assert.AreEqual(umbCtx, UmbracoContext.Current);
diff --git a/src/Umbraco.Tests/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Mvc/UmbracoViewPageTests.cs
index f5ffee1ce3..9c76cbefe0 100644
--- a/src/Umbraco.Tests/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Mvc/UmbracoViewPageTests.cs
@@ -6,7 +6,15 @@ using System.Text;
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Xml;
+using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Profiling;
+using Umbraco.Core.Services;
 using Umbraco.Web.Security;
 using umbraco.BusinessLogic;
 using Umbraco.Core;
@@ -366,11 +374,56 @@ namespace Umbraco.Tests.Mvc
 
         #region Test helpers
 
+        ServiceContext GetServiceContext(IUmbracoSettingsSection umbracoSettings, ILogger logger)
+        {
+            var svcCtx = new ServiceContext(
+                new Mock<IContentService>().Object,
+                new Mock<IMediaService>().Object,
+                new Mock<IContentTypeService>().Object,
+                new Mock<IDataTypeService>().Object,
+                new Mock<IFileService>().Object,
+                new Mock<ILocalizationService>().Object,
+                new PackagingService(
+                    new Mock<ILogger>().Object,
+                    new Mock<IContentService>().Object,
+                    new Mock<IContentTypeService>().Object,
+                    new Mock<IMediaService>().Object,
+                    new Mock<IMacroService>().Object,
+                    new Mock<IDataTypeService>().Object,
+                    new Mock<IFileService>().Object,
+                    new Mock<ILocalizationService>().Object,
+                    new Mock<IUserService>().Object,
+                    new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), logger, Mock.Of<ISqlSyntaxProvider>(), umbracoSettings),
+                    new Mock<IDatabaseUnitOfWorkProvider>().Object),
+                new Mock<IEntityService>().Object,
+                new RelationService(
+                    new Mock<IDatabaseUnitOfWorkProvider>().Object,
+                    new RepositoryFactory(CacheHelper.CreateDisabledCacheHelper(), logger, Mock.Of<ISqlSyntaxProvider>(), umbracoSettings),
+                    logger,
+                    new Mock<IEntityService>().Object),
+                new Mock<IMemberGroupService>().Object,
+                new Mock<IMemberTypeService>().Object,
+                new Mock<IMemberService>().Object,
+                new Mock<IUserService>().Object,
+            new Mock<ISectionService>().Object,
+                new Mock<IApplicationTreeService>().Object,
+                new Mock<ITagService>().Object,
+                new Mock<INotificationService>().Object,
+                Mock.Of<ILocalizedTextService>(),
+                Mock.Of<IAuditService>(),
+                Mock.Of<IDomainService>());
+            return svcCtx;
+        }
+
         ViewContext GetViewContext()
         {
-            var umbracoContext = GetUmbracoContext("/dang", 0);
+            var settings = SettingsForTests.GetDefault();
+            var logger = Mock.Of<ILogger>();
+            var umbracoContext = GetUmbracoContext(
+                logger, settings,
+                "/dang", 0);
 
-            var urlProvider = new UrlProvider(umbracoContext, new IUrlProvider[] { new DefaultUrlProvider() });
+            var urlProvider = new UrlProvider(umbracoContext, settings.WebRouting, new IUrlProvider[] { new DefaultUrlProvider() });
             var routingContext = new RoutingContext(
                 umbracoContext,
                 Enumerable.Empty<IContentFinder>(),
@@ -389,7 +442,7 @@ namespace Umbraco.Tests.Mvc
             return context;
         }
 
-        protected UmbracoContext GetUmbracoContext(string url, int templateId, RouteData routeData = null, bool setSingleton = false)
+        protected UmbracoContext GetUmbracoContext(ILogger logger, IUmbracoSettingsSection umbracoSettings, string url, int templateId, RouteData routeData = null, bool setSingleton = false)
         {
             var cache = new PublishedContentCache();
 
@@ -403,7 +456,14 @@ namespace Umbraco.Tests.Mvc
             //PublishedContentCache.UnitTesting = true;
 
             // ApplicationContext.Current = new ApplicationContext(false) { IsReady = true };
-            var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()) { IsReady = true };
+            var svcCtx = GetServiceContext(umbracoSettings, logger);
+
+            var appCtx = new ApplicationContext(
+                new DatabaseContext(Mock.Of<IDatabaseFactory>(), logger, Mock.Of<ISqlSyntaxProvider>(), "test"),
+                svcCtx,
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(logger, Mock.Of<IProfiler>())) { IsReady = true };
+
             var http = GetHttpContextFactory(url, routeData).HttpContext;
             var ctx = new UmbracoContext(
                 GetHttpContextFactory(url, routeData).HttpContext,
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
index 60fee894d3..32df304872 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
@@ -1,12 +1,12 @@
 using NUnit.Framework;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
 {
+    //TODO: We should be able to decouple this from the base db tests since we're just mocking the services now
 
     [TestFixture]
-    public class ContentFinderByAliasTests : BaseRoutingTest
+    public class ContentFinderByAliasTests : UrlRoutingTestBase
     {
         [TestCase("/this/is/my/alias", 1001)]
         [TestCase("/anotheralias", 1001)]
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs
index b83f0bfd2b..1767a1336e 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs
@@ -1,51 +1,13 @@
-using System.Linq;
 using NUnit.Framework;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
-using umbraco.cms.businesslogic.language;
-using umbraco.cms.businesslogic.web;
 
 namespace Umbraco.Tests.Routing
 {
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
+    
     [TestFixture]
     public class ContentFinderByAliasWithDomainsTests : ContentFinderByAliasTests
     {
-        public override void Initialize()
-        {
-            base.Initialize();
 
-            // ensure we can create them although the content is not in the database
-            TestHelper.DropForeignKeys("umbracoDomains");
-
-            InitializeLanguagesAndDomains();
-        }
-
-        void InitializeLanguagesAndDomains()
-        {
-            var domains = Domain.GetDomains();
-            foreach (var d in domains)
-                d.Delete();
-
-            var langs = Language.GetAllAsList();
-            foreach (var l in langs.Skip(1))
-                l.Delete();
-
-            // en-US is there by default
-            Language.MakeNew("fr-FR");
-            Language.MakeNew("de-DE");
-        }
-
-        void SetDomains1()
-        {
-            var langEn = Language.GetByCultureCode("en-US");
-            var langFr = Language.GetByCultureCode("fr-FR");
-            var langDe = Language.GetByCultureCode("de-DE");
-
-            Domain.MakeNew("domain1.com/", 1001, langDe.id);
-            Domain.MakeNew("domain1.com/en", 10011, langEn.id);
-            Domain.MakeNew("domain1.com/fr", 10012, langFr.id);
-        }
         
 
         [TestCase("http://domain1.com/this/is/my/alias", "de-DE", -1001)] // alias to domain's page fails - no alias on domain's home
@@ -60,7 +22,7 @@ namespace Umbraco.Tests.Routing
         [TestCase("http://domain1.com/en/bar/nil", "en-US", 100111)] // ok, alias includes "en/"
         public void Lookup_By_Url_Alias_And_Domain(string inputUrl, string expectedCulture, int expectedNode)
         {
-            SetDomains1();
+            //SetDomains1();
 
             var routingContext = GetRoutingContext(inputUrl);
             var url = routingContext.UmbracoContext.CleanedUmbracoUrl; //very important to use the cleaned up umbraco url
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
index 15912a8c5d..1a1c116eca 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
@@ -2,62 +2,78 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
 using umbraco.cms.businesslogic.web;
-using umbraco.cms.businesslogic.language;
 using System.Configuration;
 
 namespace Umbraco.Tests.Routing
 {
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
+
 	[TestFixture]
-	public class ContentFinderByNiceUrlWithDomainsTests : BaseRoutingTest
+    public class ContentFinderByNiceUrlWithDomainsTests : UrlRoutingTestBase
 	{
-		public override void Initialize()
-		{
-			base.Initialize();
+        //public override void Initialize()
+        //{
+        //    base.Initialize();
 
-            // ensure we can create them although the content is not in the database
-            TestHelper.DropForeignKeys("umbracoDomains");
+        //    // ensure we can create them although the content is not in the database
+        //    TestHelper.DropForeignKeys("umbracoDomains");
             
-            InitializeLanguagesAndDomains();
-		}
+        //    InitializeLanguagesAndDomains();
+        //}
 
-		void InitializeLanguagesAndDomains()
-		{
-			var domains = Domain.GetDomains();
-			foreach (var d in domains)
-				d.Delete();
+        //void InitializeLanguagesAndDomains()
+        //{
+        //    var domains = Domain.GetDomains();
+        //    foreach (var d in domains)
+        //        d.Delete();
 
-			var langs = Language.GetAllAsList();
-			foreach (var l in langs.Skip(1))
-				l.Delete();
+        //    var langs = Language.GetAllAsList();
+        //    foreach (var l in langs.Skip(1))
+        //        l.Delete();
 
-			Language.MakeNew("fr-FR");
-		}
+        //    Language.MakeNew("fr-FR");
+        //}
 
 		void SetDomains3()
 		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
+		    SetupDomainServiceMock(new[]
+		    {
+		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
+		    });
 
-			Domain.MakeNew("domain1.com/", 1001, langEn.id);
+		    //var langEn = Language.GetByCultureCode("en-US");
+		    //var langFr = Language.GetByCultureCode("fr-FR");
+
+		    //Domain.MakeNew("domain1.com/", 1001, langEn.id);
 		}
 
 		void SetDomains4()
 		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
+		    SetupDomainServiceMock(new[]
+		    {
+		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)) {Id = 10011}},
+		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10012}},
+		        new UmbracoDomain {Id = 1, DomainName = "domain3.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1003}},
+		        new UmbracoDomain {Id = 1, DomainName = "domain3.com/en", Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)) {Id = 10031}},
+		        new UmbracoDomain {Id = 1, DomainName = "domain3.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10032}}
+		    });
 
-			Domain.MakeNew("domain1.com/", 1001, langEn.id);
-			Domain.MakeNew("domain1.com/en", 10011, langEn.id);
-			Domain.MakeNew("domain1.com/fr", 10012, langFr.id);
+		    //var langEn = Language.GetByCultureCode("en-US");
+		    //var langFr = Language.GetByCultureCode("fr-FR");
 
-			Domain.MakeNew("http://domain3.com/", 1003, langEn.id);
-			Domain.MakeNew("http://domain3.com/en", 10031, langEn.id);
-			Domain.MakeNew("http://domain3.com/fr", 10032, langFr.id);
+		    //Domain.MakeNew("domain1.com/", 1001, langEn.id);
+		    //Domain.MakeNew("domain1.com/en", 10011, langEn.id);
+		    //Domain.MakeNew("domain1.com/fr", 10012, langFr.id);
+
+		    //Domain.MakeNew("http://domain3.com/", 1003, langEn.id);
+		    //Domain.MakeNew("http://domain3.com/en", 10031, langEn.id);
+		    //Domain.MakeNew("http://domain3.com/fr", 10032, langFr.id);
 		}
 
 		protected override string GetXmlContent(int templateId)
diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
index 27b00cf676..2acadbb830 100644
--- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
+++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
@@ -2,72 +2,43 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
 using umbraco.cms.businesslogic.web;
-using umbraco.cms.businesslogic.language;
+using System.Configuration;
 
 namespace Umbraco.Tests.Routing
 {
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
     [TestFixture]
-    class DomainsAndCulturesTests : BaseRoutingTest
+    class DomainsAndCulturesTests : UrlRoutingTestBase
     {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            // ensure we can create them although the content is not in the database
-            TestHelper.DropForeignKeys("umbracoDomains");
-
-            InitializeLanguagesAndDomains();
-        }
-
-        void InitializeLanguagesAndDomains()
-        {
-            var domains = Domain.GetDomains(true); // we want wildcards too here
-            foreach (var d in domains)
-                d.Delete();
-
-            var langs = Language.GetAllAsList();
-            foreach (var l in langs.Skip(1))
-                l.Delete();
-
-            // en-US is there by default
-            Language.MakeNew("fr-FR");
-            Language.MakeNew("de-DE");
-
-            Language.MakeNew("da-DK");
-            Language.MakeNew("cs-CZ");
-            Language.MakeNew("nl-NL");
-        }
-
         void SetDomains1()
         {
-            var langEn = Language.GetByCultureCode("en-US");
-            var langFr = Language.GetByCultureCode("fr-FR");
-            var langDe = Language.GetByCultureCode("de-DE");
-
-            Domain.MakeNew("domain1.com/", 1001, langDe.id);
-            Domain.MakeNew("domain1.com/en", 10011, langEn.id);
-            Domain.MakeNew("domain1.com/fr", 10012, langFr.id);
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain {Id = 1, DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}}
+            });
         }
 
         void SetDomains2()
         {
-            SetDomains1();
-
-            var langDk = Language.GetByCultureCode("da-DK");
-            var langCz = Language.GetByCultureCode("cs-CZ");
-            var langNl = Language.GetByCultureCode("nl-NL");
-
-            Domain.MakeNew("*1001", 1001, langDk.id);
-            Domain.MakeNew("*10011", 10011, langCz.id);
-            Domain.MakeNew("*100112", 100112, langNl.id);
-            Domain.MakeNew("*1001122", 1001122, langDk.id);
-            Domain.MakeNew("*10012", 10012, langNl.id);
-            Domain.MakeNew("*10031", 10031, langNl.id);
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain {Id = 1, DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain {Id = 1, DomainName = "*1001", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain {Id = 1, DomainName = "*10011", Language = new Language("cs-CZ"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "*100112", Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 100112}},
+                new UmbracoDomain {Id = 1, DomainName = "*1001122", Language = new Language("da-DK"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001122}},
+                new UmbracoDomain {Id = 1, DomainName = "*10012", Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain {Id = 1, DomainName = "*10031", Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}}
+            });
         }
 
         protected override string GetXmlContent(int templateId)
diff --git a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
index 670de640ff..48d67deb28 100644
--- a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
@@ -1,107 +1,80 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 using umbraco.cms.businesslogic.web;
-using umbraco.cms.businesslogic.language;
-
+using System.Configuration;
 namespace Umbraco.Tests.Routing
 {
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
 	[TestFixture]
-	public class NiceUrlsProviderWithDomainsTests : BaseRoutingTest
+    public class NiceUrlsProviderWithDomainsTests : UrlRoutingTestBase
 	{
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            //generate new mock settings and assign so we can configure in individual tests
-            _umbracoSettings = SettingsForTests.GenerateMockSettings();
-            SettingsForTests.ConfigureSettings(_umbracoSettings);
-
-            // ensure we can create them although the content is not in the database
-            TestHelper.DropForeignKeys("umbracoDomains");            
-        }
-
-        private IUmbracoSettingsSection _umbracoSettings;
-
         protected override void FreezeResolution()
         {
             SiteDomainHelperResolver.Current = new SiteDomainHelperResolver(new SiteDomainHelper());
             base.FreezeResolution();
         }
 
-		void InitializeLanguagesAndDomains()
-		{
-			var domains = Domain.GetDomains();
-			foreach (var d in domains)
-				d.Delete();
-
-			var langs = Language.GetAllAsList();
-			foreach (var l in langs.Skip(1))
-				l.Delete();
-
-			Language.MakeNew("fr-FR");
-		}
 
 		void SetDomains1()
 		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
 
-			Domain.MakeNew("domain1.com", 1001, langFr.id);
+            SetupDomainServiceMock(new[]
+		    {
+		        new UmbracoDomain {Id = 1, DomainName = "domain1.com", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
+		    });
 		}
 
-		void SetDomains2()
-		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
+        void SetDomains2()
+        {
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/foo", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
+            });
+        }
 
-			Domain.MakeNew("http://domain1.com/foo", 1001, langFr.id);
-		}
+        void SetDomains3()
+        {
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}}
+            });
+        }
 
-		void SetDomains3()
-		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
+        void SetDomains4()
+        {
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1003}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10032}}
+            });
+        }
 
-			Domain.MakeNew("http://domain1.com/", 10011, langFr.id);
-		}
-
-		void SetDomains4()
-		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
-
-			Domain.MakeNew("http://domain1.com/", 1001, langEn.id);
-			Domain.MakeNew("http://domain1.com/en", 10011, langEn.id);
-			Domain.MakeNew("http://domain1.com/fr", 10012, langFr.id);
-
-			Domain.MakeNew("http://domain3.com/", 1003, langEn.id);
-			Domain.MakeNew("http://domain3.com/en", 10031, langEn.id);
-			Domain.MakeNew("http://domain3.com/fr", 10032, langFr.id);
-		}
-
-		void SetDomains5()
-		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
-
-			Domain.MakeNew("http://domain1.com/en", 10011, langEn.id);
-			Domain.MakeNew("http://domain1a.com/en", 10011, langEn.id);
-			Domain.MakeNew("http://domain1b.com/en", 10011, langEn.id);
-			Domain.MakeNew("http://domain1.com/fr", 10012, langFr.id);
-			Domain.MakeNew("http://domain1a.com/fr", 10012, langFr.id);
-			Domain.MakeNew("http://domain1b.com/fr", 10012, langFr.id);
-
-			Domain.MakeNew("http://domain3.com/en", 10031, langEn.id);
-			Domain.MakeNew("http://domain3.com/fr", 10032, langFr.id);
-		}
+        void SetDomains5()
+        {
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1a.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1b.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1a.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1b.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10032}}
+            });
+        }
 
 		protected override string GetXmlContent(int templateId)
 		{
@@ -201,14 +174,15 @@ namespace Umbraco.Tests.Routing
 		[TestCase(10011, "https://domain1.com", false, "/1001-1/")]
 		public void Get_Nice_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
 		{
-			var routingContext = GetRoutingContext("/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+		    var request = Mock.Get(settings.RequestHandler);
+		    request.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+			var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
 		    SettingsForTests.UseDirectoryUrls = true;
 		    SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-			InitializeLanguagesAndDomains();
 			SetDomains1();
 
 			var currentUri = new Uri(currentUrl);
@@ -231,14 +205,15 @@ namespace Umbraco.Tests.Routing
 		[TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
 		public void Get_Nice_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
 		{
-			var routingContext = GetRoutingContext("/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+            var request = Mock.Get(settings.RequestHandler);
+            request.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-			InitializeLanguagesAndDomains();
 			SetDomains2();
 
 			var currentUri = new Uri(currentUrl);
@@ -253,15 +228,16 @@ namespace Umbraco.Tests.Routing
 		[TestCase(1002, "http://domain1.com", false, "/1002/")]
 		public void Get_Nice_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
 		{
-			var routingContext = GetRoutingContext("/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+            var request = Mock.Get(settings.RequestHandler);
+            request.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-			InitializeLanguagesAndDomains();
-			SetDomains3();
+            SetDomains3();
 
 			var currentUri = new Uri(currentUrl);
 			var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
@@ -281,14 +257,15 @@ namespace Umbraco.Tests.Routing
 		[TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
 		public void Get_Nice_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
 		{
-			var routingContext = GetRoutingContext("/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+            var request = Mock.Get(settings.RequestHandler);
+            request.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
             
-			InitializeLanguagesAndDomains();
 			SetDomains4();
 
 			var currentUri = new Uri(currentUrl);
@@ -299,14 +276,15 @@ namespace Umbraco.Tests.Routing
 		[Test]
 		public void Get_Nice_Url_DomainsAndCache()
 		{
-			var routingContext = GetRoutingContext("/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+            var request = Mock.Get(settings.RequestHandler);
+            request.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-			InitializeLanguagesAndDomains();
 			SetDomains4();
 
 			string ignore;
@@ -361,21 +339,20 @@ namespace Umbraco.Tests.Routing
 		[Test]
 		public void Get_Nice_Url_Relative_Or_Absolute()
 		{
-			var routingContext = GetRoutingContext("http://domain1.com/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+            var requestMock = Mock.Get(settings.RequestHandler);
+            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+		    var routingContext = GetRoutingContext("http://domain1.com/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false;
 
-			InitializeLanguagesAndDomains();
 			SetDomains4();
-
-            //mock the Umbraco settings that we need
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
             
             Assert.AreEqual("/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111));
 			Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
-
+           
             requestMock.Setup(x => x.UseDomainPrefixes).Returns(true);
 
             Assert.AreEqual("http://domain1.com/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111));
@@ -391,12 +368,12 @@ namespace Umbraco.Tests.Routing
 		[Test]
 		public void Get_Nice_Url_Alternate()
 		{
-			var routingContext = GetRoutingContext("http://domain1.com/en/test", 1111);
+            var settings = SettingsForTests.GenerateMockSettings();
+			var routingContext = GetRoutingContext("http://domain1.com/en/test", 1111,umbracoSettings:settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false;
 
-			InitializeLanguagesAndDomains();
 			SetDomains5();
 
 		    var url = routingContext.UrlProvider.GetUrl(100111, true);
diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
new file mode 100644
index 0000000000..86e5edc833
--- /dev/null
+++ b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using System.Linq;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
+using Umbraco.Tests.TestHelpers;
+
+namespace Umbraco.Tests.Routing
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NoDatabasePerFixture)]
+    [TestFixture]
+    public abstract class UrlRoutingTestBase : BaseRoutingTest
+    {
+        /// <summary>
+        /// Sets up the mock domain service
+        /// </summary>
+        /// <param name="allDomains"></param>
+        protected void SetupDomainServiceMock(IEnumerable<IDomain> allDomains)
+        {
+            var domainService = Mock.Get(ServiceContext.DomainService);
+            //setup mock domain service
+            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+                .Returns((bool incWildcards) => incWildcards ? allDomains : allDomains.Where(d => d.IsWildcard == false));
+            domainService.Setup(service => service.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
+                .Returns((int id, bool incWildcards) => allDomains.Where(d => d.RootContent.Id == id && (incWildcards || d.IsWildcard == false)));
+        }
+
+        protected ServiceContext GetServiceContext(IUmbracoSettingsSection umbracoSettings, ILogger logger)
+        {
+            //get the mocked service context to get the mocked domain service
+            var svcCtx = MockHelper.GetMockedServiceContext(umbracoSettings, logger);
+            var domainService = Mock.Get(svcCtx.DomainService);
+            //setup mock domain service
+            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+                .Returns((bool incWildcards) => new[]
+                {
+                    new UmbracoDomain{Id = 1,DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)){ Id = 1001}}, 
+                    new UmbracoDomain{Id = 1,DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)){ Id = 10011}}, 
+                    new UmbracoDomain{Id = 1,DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)){ Id = 10012}}
+                });
+            return svcCtx;
+        }
+
+        protected override void SetupApplicationContext()
+        {
+            var settings = SettingsForTests.GetDefault();
+            ApplicationContext.Current = new ApplicationContext(
+                new DatabaseContext(Mock.Of<IDatabaseFactory>(), Logger, Mock.Of<ISqlSyntaxProvider>(), "test"),
+                GetServiceContext(settings, Logger),
+                CacheHelper,
+                ProfilingLogger)
+            {
+                IsReady = true
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index f1a80de06d..9cd4474dcb 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -1,19 +1,21 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
-using umbraco.cms.businesslogic.web;
-using umbraco.cms.businesslogic.language;
 using Umbraco.Web.Routing;
+using umbraco.cms.businesslogic.web;
+using System.Configuration;
 
 namespace Umbraco.Tests.Routing
 {
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
 	[TestFixture]
-	public class UrlsWithNestedDomains : BaseRoutingTest
+    public class UrlsWithNestedDomains : UrlRoutingTestBase
 	{
 		// in the case of nested domains more than 1 url may resolve to a document
 		// but only one route can be cached - the 'canonical' route ie the route
@@ -25,17 +27,18 @@ namespace Umbraco.Tests.Routing
 		{
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains            
-            var requestMock = Mock.Get(_umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(true);
 
-			InitializeLanguagesAndDomains();
+            var settings = SettingsForTests.GenerateMockSettings();
+            var request = Mock.Get(settings.RequestHandler);
+            request.Setup(x => x.UseDomainPrefixes).Returns(true);
+
 			SetDomains1();
 
 			RoutingContext routingContext;
 			string url = "http://domain1.com/1001-1/1001-1-1";
 			
 			// get the nice url for 100111
-			routingContext = GetRoutingContext(url);
+		    routingContext = GetRoutingContext(url, 9999, umbracoSettings: settings);
 			Assert.AreEqual("http://domain2.com/1001-1-1/", routingContext.UrlProvider.GetUrl(100111, true));
 
 			// check that the proper route has been cached
@@ -67,46 +70,20 @@ namespace Umbraco.Tests.Routing
 			//Assert.AreEqual("http://domain1.com/1001-1/1001-1-1", routingContext.NiceUrlProvider.GetNiceUrl(100111, true)); // bad
 		}
 
-        private IUmbracoSettingsSection _umbracoSettings;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            // ensure we can create them although the content is not in the database
-            TestHelper.DropForeignKeys("umbracoDomains");
-
-            //generate new mock settings and assign so we can configure in individual tests
-            _umbracoSettings = SettingsForTests.GenerateMockSettings();
-            SettingsForTests.ConfigureSettings(_umbracoSettings);
-        }
-
         protected override void FreezeResolution()
         {
             SiteDomainHelperResolver.Current = new SiteDomainHelperResolver(new SiteDomainHelper());
             base.FreezeResolution();
         }
 
-		void InitializeLanguagesAndDomains()
-		{
-			var domains = Domain.GetDomains();
-			foreach (var d in domains)
-				d.Delete();
-
-			var langs = Language.GetAllAsList();
-			foreach (var l in langs.Skip(1))
-				l.Delete();
-
-			Language.MakeNew("fr-FR");
-		}
-
 		void SetDomains1()
 		{
-			var langEn = Language.GetByCultureCode("en-US");
-			var langFr = Language.GetByCultureCode("fr-FR");
+            SetupDomainServiceMock(new[]
+            {
+                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain {Id = 1, DomainName = "http://domain2.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}}
+            });
 
-			Domain.MakeNew("http://domain1.com/", 1001, langEn.id);
-			Domain.MakeNew("http://domain2.com/", 10011, langEn.id);
 		}
 
 		protected override string GetXmlContent(int templateId)
diff --git a/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs b/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs
index e387642ef2..bf24ce70f0 100644
--- a/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs
+++ b/src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs
@@ -20,6 +20,10 @@ namespace Umbraco.Tests.Routing
 		{
 			base.Initialize();
 
+            //generate new mock settings and assign so we can configure in individual tests
+            _umbracoSettings = SettingsForTests.GenerateMockSettings();
+            SettingsForTests.ConfigureSettings(_umbracoSettings);
+
 			var url = "/test";
 			
 			var lookup = new Umbraco.Web.Routing.ContentFinderByNiceUrl();
@@ -28,7 +32,7 @@ namespace Umbraco.Tests.Routing
 			var t = Template.MakeNew("test", new User(0));
 
 			var umbracoContext = GetUmbracoContext(url, t.Id);
-            var urlProvider = new UrlProvider(umbracoContext, new IUrlProvider[] { new DefaultUrlProvider() });
+            var urlProvider = new UrlProvider(umbracoContext, _umbracoSettings.WebRouting, new IUrlProvider[] { new DefaultUrlProvider() });
 			var routingContext = new RoutingContext(
 				umbracoContext,
 				lookups,
@@ -42,9 +46,7 @@ namespace Umbraco.Tests.Routing
 			//umbracoContext.RoutingContext = routingContext;
 			Umbraco.Web.UmbracoContext.Current = routingContext.UmbracoContext;
 
-            //generate new mock settings and assign so we can configure in individual tests
-            _umbracoSettings = SettingsForTests.GenerateMockSettings();
-            SettingsForTests.ConfigureSettings(_umbracoSettings);
+            
 		}
 
         public override void TearDown()
diff --git a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs
index d55a437976..81e85ae2a0 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Web.Routing;
 using NUnit.Framework;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Web;
@@ -13,7 +14,7 @@ namespace Umbraco.Tests.TestHelpers
 {
 	[TestFixture, RequiresSTA]
 	public abstract class BaseRoutingTest : BaseWebTest
-	{		
+	{
 	    ///  <summary>
 	    ///  Return a new RoutingContext
 	    ///  </summary>
@@ -24,11 +25,17 @@ namespace Umbraco.Tests.TestHelpers
 	    /// </param>
 	    ///  <param name="routeData"></param>
 	    /// <param name="setUmbracoContextCurrent">set to true to also set the singleton UmbracoContext.Current to the context created with this method</param>
+	    /// <param name="umbracoSettings"></param>
 	    /// <returns></returns>
-	    protected RoutingContext GetRoutingContext(string url, int templateId, RouteData routeData = null, bool setUmbracoContextCurrent = false)
-		{
+	    protected RoutingContext GetRoutingContext(string url, int templateId, RouteData routeData = null, bool setUmbracoContextCurrent = false, IUmbracoSettingsSection umbracoSettings = null)
+	    {
+	        if (umbracoSettings == null) umbracoSettings = SettingsForTests.GetDefault();
+
 			var umbracoContext = GetUmbracoContext(url, templateId, routeData);
-            var urlProvider = new UrlProvider(umbracoContext, new IUrlProvider[] { new DefaultUrlProvider() });
+            var urlProvider = new UrlProvider(umbracoContext, umbracoSettings.WebRouting, new IUrlProvider[]
+            {
+                new DefaultUrlProvider(umbracoSettings.RequestHandler)
+            });
 			var routingContext = new RoutingContext(
 				umbracoContext,
 				Enumerable.Empty<IContentFinder>(),
diff --git a/src/Umbraco.Tests/TestHelpers/MockHelper.cs b/src/Umbraco.Tests/TestHelpers/MockHelper.cs
new file mode 100644
index 0000000000..ae7245b855
--- /dev/null
+++ b/src/Umbraco.Tests/TestHelpers/MockHelper.cs
@@ -0,0 +1,59 @@
+using Moq;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Tests.TestHelpers
+{
+    public static class MockHelper
+    {
+        public static ServiceContext GetMockedServiceContext(IUmbracoSettingsSection settings = null, ILogger logger = null, CacheHelper cacheHelper = null, ISqlSyntaxProvider sqlSyntax = null)
+        {
+            if (settings == null) settings = SettingsForTests.GetDefault();
+            if (logger == null) logger = Mock.Of<ILogger>();
+            if (cacheHelper == null) cacheHelper = CacheHelper.CreateDisabledCacheHelper();
+            if (sqlSyntax == null) sqlSyntax = Mock.Of<ISqlSyntaxProvider>();
+
+            return new ServiceContext(
+                new Mock<IContentService>().Object,
+                new Mock<IMediaService>().Object,
+                new Mock<IContentTypeService>().Object,
+                new Mock<IDataTypeService>().Object,
+                new Mock<IFileService>().Object,
+                new Mock<ILocalizationService>().Object,
+                new PackagingService(
+                    new Mock<ILogger>().Object,
+                    new Mock<IContentService>().Object,
+                    new Mock<IContentTypeService>().Object,
+                    new Mock<IMediaService>().Object,
+                    new Mock<IMacroService>().Object,
+                    new Mock<IDataTypeService>().Object,
+                    new Mock<IFileService>().Object,
+                    new Mock<ILocalizationService>().Object,
+                    new Mock<IUserService>().Object,
+                    new RepositoryFactory(cacheHelper, logger, sqlSyntax, settings),
+                    new Mock<IDatabaseUnitOfWorkProvider>().Object),
+                new Mock<IEntityService>().Object,
+                new RelationService(
+                    new Mock<IDatabaseUnitOfWorkProvider>().Object,
+                    new RepositoryFactory(cacheHelper, logger, sqlSyntax, settings),
+                    logger,
+                    new Mock<IEntityService>().Object),
+                new Mock<IMemberGroupService>().Object,
+                new Mock<IMemberTypeService>().Object,
+                new Mock<IMemberService>().Object,
+                new Mock<IUserService>().Object,
+                new Mock<ISectionService>().Object,
+                new Mock<IApplicationTreeService>().Object,
+                new Mock<ITagService>().Object,
+                new Mock<INotificationService>().Object,
+                new Mock<ILocalizedTextService>().Object,
+                new Mock<IAuditService>().Object,
+                new Mock<IDomainService>().Object);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 7f881ba559..eec71f9a7f 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -12,7 +12,7 @@ using GlobalSettings = umbraco.GlobalSettings;
 
 namespace Umbraco.Tests.TestHelpers
 {
-	/// <summary>
+    /// <summary>
 	/// Common helper properties and methods useful to testing
 	/// </summary>
 	public static class TestHelper
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 78abd56a66..02527308c2 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -178,6 +178,7 @@
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\TaskRepositoryTest.cs" />
     <Compile Include="Resolvers\ResolverBaseTest.cs" />
+    <Compile Include="Routing\UrlRoutingTestBase.cs" />
     <Compile Include="Strings\StylesheetHelperTests.cs" />
     <Compile Include="Strings\StringValidationTests.cs" />
     <Compile Include="FrontEnd\UmbracoHelperTests.cs" />
@@ -444,6 +445,7 @@
     <Compile Include="TestHelpers\Entities\MockedMember.cs" />
     <Compile Include="TestHelpers\Entities\MockedUser.cs" />
     <Compile Include="TestHelpers\Entities\MockedUserType.cs" />
+    <Compile Include="TestHelpers\MockHelper.cs" />
     <Compile Include="TestHelpers\RequiresAutoMapperMappingsAttribute.cs" />
     <Compile Include="TestHelpers\TestProfiler.cs" />
     <Compile Include="TreesAndSections\ResourceFiles.Designer.cs">
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index 13855e80b3..f15c485560 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -5,6 +5,7 @@ using System.Threading;
 
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Web.PublishedCache;
 using umbraco.cms.businesslogic.web;
@@ -16,6 +17,19 @@ namespace Umbraco.Web.Routing
     /// </summary>
     public class DefaultUrlProvider : IUrlProvider
     {
+        private readonly IRequestHandlerSection _requestSettings;
+
+        [Obsolete("Use the ctor that specifies the IRequestHandlerSection")]
+        public DefaultUrlProvider()
+            : this(UmbracoConfig.For.UmbracoSettings().RequestHandler)
+        {            
+        }
+
+        public DefaultUrlProvider(IRequestHandlerSection requestSettings)
+        {
+            _requestSettings = requestSettings;
+        }
+
         #region GetUrl
 
         /// <summary>
@@ -112,7 +126,7 @@ namespace Umbraco.Web.Routing
 
             if (mode == UrlProviderMode.AutoLegacy)
             {
-                mode = UmbracoConfig.For.UmbracoSettings().RequestHandler.UseDomainPrefixes
+                mode = _requestSettings.UseDomainPrefixes
                     ? UrlProviderMode.Absolute
                     : UrlProviderMode.Auto;
             }
diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs
index 69c56603fa..f4b9181bef 100644
--- a/src/Umbraco.Web/Routing/UrlProvider.cs
+++ b/src/Umbraco.Web/Routing/UrlProvider.cs
@@ -19,8 +19,9 @@ namespace Umbraco.Web.Routing
         /// Initializes a new instance of the <see cref="UrlProvider"/> class with an Umbraco context and a list of url providers.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
+        /// <param name="routingSettings"></param>
         /// <param name="urlProviders">The list of url providers.</param>
-        internal UrlProvider(UmbracoContext umbracoContext, IEnumerable<IUrlProvider> urlProviders)
+        internal UrlProvider(UmbracoContext umbracoContext, IWebRoutingSection routingSettings, IEnumerable<IUrlProvider> urlProviders)
         {
             _umbracoContext = umbracoContext;
             _urlProviders = urlProviders;
@@ -28,7 +29,7 @@ namespace Umbraco.Web.Routing
             var provider = UrlProviderMode.Auto;
             Mode = provider;
 
-            if (Enum<UrlProviderMode>.TryParse(UmbracoConfig.For.UmbracoSettings().WebRouting.UrlProviderMode, out provider))
+            if (Enum<UrlProviderMode>.TryParse(routingSettings.UrlProviderMode, out provider))
             {
                 Mode = provider;
             }            
diff --git a/src/Umbraco.Web/Search/ExamineEvents.cs b/src/Umbraco.Web/Search/ExamineEvents.cs
index 8b21ce60ae..51d190436f 100644
--- a/src/Umbraco.Web/Search/ExamineEvents.cs
+++ b/src/Umbraco.Web/Search/ExamineEvents.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Linq;
-using System.Security;
 using System.Xml;
 using System.Xml.Linq;
 using Examine;
@@ -11,19 +10,11 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
 using UmbracoExamine;
-using umbraco;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic;
-using umbraco.cms.businesslogic.member;
-using umbraco.interfaces;
 using Content = umbraco.cms.businesslogic.Content;
 using Document = umbraco.cms.businesslogic.web.Document;
-using Member = umbraco.cms.businesslogic.member.Member;
 
 namespace Umbraco.Web.Search
 {
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index ba2f6aee46..efbe290f15 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -1,13 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Web;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
-using umbraco;
 using umbraco.BusinessLogic;
 using umbraco.presentation.preview;
+using GlobalSettings = umbraco.GlobalSettings;
 using IOHelper = Umbraco.Core.IO.IOHelper;
 using SystemDirectories = Umbraco.Core.IO.SystemDirectories;
 
@@ -24,8 +27,8 @@ namespace Umbraco.Web
 
         private bool _replacing;
         private bool? _previewing;
-        private Lazy<ContextualPublishedContentCache> _contentCache;
-        private Lazy<ContextualPublishedMediaCache> _mediaCache;
+        private readonly Lazy<ContextualPublishedContentCache> _contentCache;
+        private readonly Lazy<ContextualPublishedMediaCache> _mediaCache;
 
         /// <summary>
         /// Used if not running in a web application (no real HttpContext)
@@ -34,6 +37,57 @@ namespace Umbraco.Web
         private static UmbracoContext _umbracoContext;
 
         #region EnsureContext methods
+
+        #region Obsolete
+        [Obsolete("Use the method that specifies IUmbracoSettings instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static UmbracoContext EnsureContext(
+            HttpContextBase httpContext,
+            ApplicationContext applicationContext,
+            WebSecurity webSecurity)
+        {
+            return EnsureContext(httpContext, applicationContext, webSecurity, false);
+        }
+        [Obsolete("Use the method that specifies IUmbracoSettings instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static UmbracoContext EnsureContext(
+            HttpContextBase httpContext,
+            ApplicationContext applicationContext)
+        {
+            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), false);
+        }
+        [Obsolete("Use the method that specifies IUmbracoSettings instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static UmbracoContext EnsureContext(
+            HttpContextBase httpContext,
+            ApplicationContext applicationContext,
+            bool replaceContext)
+        {
+            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), replaceContext);
+        }
+        [Obsolete("Use the method that specifies IUmbracoSettings instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static UmbracoContext EnsureContext(
+            HttpContextBase httpContext,
+            ApplicationContext applicationContext,
+            WebSecurity webSecurity,
+            bool replaceContext)
+        {
+            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), replaceContext, null);
+        }
+        [Obsolete("Use the method that specifies IUmbracoSettings instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static UmbracoContext EnsureContext(
+            HttpContextBase httpContext,
+            ApplicationContext applicationContext,
+            WebSecurity webSecurity,
+            bool replaceContext,
+            bool? preview)
+        {
+            return EnsureContext(httpContext, applicationContext, webSecurity, UmbracoConfig.For.UmbracoSettings(), replaceContext, preview);
+        } 
+        #endregion
+
         /// <summary>
         /// This is a helper method which is called to ensure that the singleton context is created and the nice url and routing
         /// context is created and assigned.
@@ -41,6 +95,7 @@ namespace Umbraco.Web
         /// <param name="httpContext"></param>
         /// <param name="applicationContext"></param>
         /// <param name="webSecurity"></param>
+        /// <param name="umbracoSettings"></param>
         /// <returns>
         /// The Singleton context object
         /// </returns>
@@ -53,17 +108,21 @@ namespace Umbraco.Web
         public static UmbracoContext EnsureContext(
             HttpContextBase httpContext,
             ApplicationContext applicationContext,
-            WebSecurity webSecurity)
+            WebSecurity webSecurity,
+            IUmbracoSettingsSection umbracoSettings)
         {
-            return EnsureContext(httpContext, applicationContext, webSecurity, false);
+            return EnsureContext(httpContext, applicationContext, webSecurity, umbracoSettings, false);
         }
 
+        
+
         /// <summary>
         /// This is a helper method which is called to ensure that the singleton context is created and the nice url and routing
         /// context is created and assigned.
         /// </summary>
         /// <param name="httpContext"></param>
         /// <param name="applicationContext"></param>
+        /// <param name="umbracoSettings"></param>
         /// <returns>
         /// The Singleton context object
         /// </returns>
@@ -75,17 +134,21 @@ namespace Umbraco.Web
         /// </remarks>
         public static UmbracoContext EnsureContext(
             HttpContextBase httpContext,
-            ApplicationContext applicationContext)
+            ApplicationContext applicationContext,
+            IUmbracoSettingsSection umbracoSettings)
         {
-            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), false);
+            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), umbracoSettings, false);
         }
 
+       
+
         /// <summary>
         /// This is a helper method which is called to ensure that the singleton context is created and the nice url and routing
         /// context is created and assigned.
         /// </summary>
         /// <param name="httpContext"></param>
         /// <param name="applicationContext"></param>
+        /// <param name="umbracoSettings"></param>
         /// <param name="replaceContext">
         /// if set to true will replace the current singleton with a new one, this is generally only ever used because
         /// during application startup the base url domain will not be available so after app startup we'll replace the current
@@ -103,11 +166,15 @@ namespace Umbraco.Web
         public static UmbracoContext EnsureContext(
             HttpContextBase httpContext,
             ApplicationContext applicationContext,
+            IUmbracoSettingsSection umbracoSettings,
             bool replaceContext)
         {
-            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), replaceContext);
+            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), umbracoSettings, replaceContext);
         }
 
+        
+        
+
         /// <summary>
         /// This is a helper method which is called to ensure that the singleton context is created and the nice url and routing
         /// context is created and assigned.
@@ -115,6 +182,7 @@ namespace Umbraco.Web
         /// <param name="httpContext"></param>
         /// <param name="applicationContext"></param>
         /// <param name="webSecurity"></param>
+        /// <param name="umbracoSettings"></param>
         /// <param name="replaceContext">
         /// if set to true will replace the current singleton with a new one, this is generally only ever used because
         /// during application startup the base url domain will not be available so after app startup we'll replace the current
@@ -133,11 +201,14 @@ namespace Umbraco.Web
             HttpContextBase httpContext,
             ApplicationContext applicationContext,
             WebSecurity webSecurity,
+            IUmbracoSettingsSection umbracoSettings,
             bool replaceContext)
         {
-            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), replaceContext, null);
+            return EnsureContext(httpContext, applicationContext, new WebSecurity(httpContext, applicationContext), umbracoSettings, replaceContext, null);
         }
 
+        
+
         /// <summary>
         /// This is a helper method which is called to ensure that the singleton context is created and the nice url and routing
         /// context is created and assigned.
@@ -145,6 +216,7 @@ namespace Umbraco.Web
         /// <param name="httpContext"></param>
         /// <param name="applicationContext"></param>
         /// <param name="webSecurity"></param>
+        /// <param name="umbracoSettings"></param>
         /// <param name="replaceContext">
         /// if set to true will replace the current singleton with a new one, this is generally only ever used because
         /// during application startup the base url domain will not be available so after app startup we'll replace the current
@@ -164,12 +236,13 @@ namespace Umbraco.Web
             HttpContextBase httpContext,
             ApplicationContext applicationContext,
             WebSecurity webSecurity,
+            IUmbracoSettingsSection umbracoSettings,
             bool replaceContext,
             bool? preview)
         {
             if (UmbracoContext.Current != null)
             {
-                if (!replaceContext)
+                if (replaceContext == false)
                     return UmbracoContext.Current;
                 UmbracoContext.Current._replacing = true;
             }
@@ -189,8 +262,9 @@ namespace Umbraco.Web
                 // create the nice urls provider
                 // there's one per request because there are some behavior parameters that can be changed
                 new Lazy<UrlProvider>(
-                    () => new UrlProvider(
+                    () => new UrlProvider(                        
                         umbracoContext,
+                        umbracoSettings.WebRouting,
                         UrlProviderResolver.Current.Providers),
                     false));
 

From b892f988344d0bb6535b43dcba48eb005a9d290a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Jan 2015 15:42:29 +1100
Subject: [PATCH 15/18] Fixes up remaining routing tests, all tests passing
 (apart from arbitrary plugin mgr ones)

---
 src/Umbraco.Core/Models/UmbracoDomain.cs      |   5 +
 .../Repositories/DomainRepository.cs          |   6 +-
 .../Services/LocalizedTextService.cs          |   5 +-
 .../Repositories/DomainRepositoryTest.cs      |  29 +-
 .../ContentFinderByNiceUrlWithDomainsTests.cs |  14 +-
 .../Routing/DomainsAndCulturesTests.cs        |  24 +-
 .../NiceUrlsProviderWithDomainsTests.cs       | 356 +++++++++---------
 .../Routing/SiteDomainHelperTests.cs          |  73 ++--
 .../Routing/UrlRoutingTestBase.cs             |   6 +-
 .../Routing/UrlsWithNestedDomains.cs          |   4 +-
 .../Services/LocalizedTextServiceTests.cs     |  14 +-
 .../Stubs/TestControllerFactory.cs            |  30 +-
 .../WebServices/DomainsApiController.cs       |   6 +-
 src/umbraco.cms/businesslogic/web/Domain.cs   |   3 +-
 14 files changed, 292 insertions(+), 283 deletions(-)

diff --git a/src/Umbraco.Core/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
index d2f5772e93..963535729c 100644
--- a/src/Umbraco.Core/Models/UmbracoDomain.cs
+++ b/src/Umbraco.Core/Models/UmbracoDomain.cs
@@ -11,6 +11,11 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class UmbracoDomain : Entity, IDomain
     {
+        public UmbracoDomain(string domainName)
+        {
+            _domainName = domainName;
+        }
+
         private IContent _content;
         private ILanguage _language;
         private string _domainName;
diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
index fd29c81c71..2adba8536a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
@@ -290,12 +290,11 @@ namespace Umbraco.Core.Persistence.Repositories
 
                 return cacheableDomains
                     .WhereNotNull()
-                    .Select(cacheableDomain => new UmbracoDomain
+                    .Select(cacheableDomain => new UmbracoDomain(cacheableDomain.DomainName)
                     {
                         Id = cacheableDomain.Id,
                         //lookup from repo - this will be cached
                         Language = cacheableDomain.DefaultLanguageId.HasValue ? langItems.FirstOrDefault(l => l.Id == cacheableDomain.DefaultLanguageId.Value) : null,
-                        DomainName = cacheableDomain.DomainName,
                         //lookup from repo - this will be cached
                         RootContent = cacheableDomain.RootContentId.HasValue ? contentItems.FirstOrDefault(l => l.Id == cacheableDomain.RootContentId.Value) : null,
                     });
@@ -305,12 +304,11 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 if (cacheableDomain == null) return null;
 
-                return new UmbracoDomain
+                return new UmbracoDomain(cacheableDomain.DomainName)
                 {
                     Id = cacheableDomain.Id,
                     //lookup from repo - this will be cached
                     Language = cacheableDomain.DefaultLanguageId.HasValue ? languageRepository.Get(cacheableDomain.DefaultLanguageId.Value) : null,
-                    DomainName = cacheableDomain.DomainName,
                     //lookup from repo - this will be cached
                     RootContent = cacheableDomain.RootContentId.HasValue ? contentRepository.Get(cacheableDomain.RootContentId.Value) : null
                 };
diff --git a/src/Umbraco.Core/Services/LocalizedTextService.cs b/src/Umbraco.Core/Services/LocalizedTextService.cs
index cdd52d0787..164ed77d50 100644
--- a/src/Umbraco.Core/Services/LocalizedTextService.cs
+++ b/src/Umbraco.Core/Services/LocalizedTextService.cs
@@ -46,10 +46,13 @@ namespace Umbraco.Core.Services
         /// Initializes with a source of a dictionary of culture -> areas -> sub dictionary of keys/values
         /// </summary>
         /// <param name="source"></param>
-        public LocalizedTextService(IDictionary<CultureInfo, IDictionary<string, IDictionary<string, string>>> source)
+        /// <param name="logger"></param>
+        public LocalizedTextService(IDictionary<CultureInfo, IDictionary<string, IDictionary<string, string>>> source, ILogger logger)
         {            
             if (source == null) throw new ArgumentNullException("source");
+            if (logger == null) throw new ArgumentNullException("logger");
             _dictionarySource = source;
+            _logger = logger;
         }
 
         public string Localize(string key, CultureInfo culture, IDictionary<string, string> tokens = null)
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index af0c3b86b5..7fa4f8aef0 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -71,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
-                var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
+                var domain = (IDomain)new UmbracoDomain("test.com") { RootContent = content, Language = lang };
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -107,11 +107,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
-                var domain1 = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
+                var domain1 = (IDomain)new UmbracoDomain("test.com") { RootContent = content, Language = lang };
                 repo.AddOrUpdate(domain1);
                 unitOfWork.Commit();
 
-                var domain2 = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
+                var domain2 = (IDomain)new UmbracoDomain("test.com") { RootContent = content, Language = lang };
                 repo.AddOrUpdate(domain2);
 
                 Assert.Throws<DuplicateNameException>(unitOfWork.Commit);
@@ -140,7 +140,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
-                var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test.com" };
+                var domain = (IDomain)new UmbracoDomain("test.com") { RootContent = content, Language = lang };
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -183,7 +183,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
 
 
-                var domain = (IDomain)new UmbracoDomain { RootContent = content1, Language = lang1, DomainName = "test.com" };
+                var domain = (IDomain)new UmbracoDomain("test.com") { RootContent = content1, Language = lang1 };
                 repo.AddOrUpdate(domain);
                 unitOfWork.Commit();
 
@@ -227,7 +227,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test " + i + ".com" };
+                    var domain = (IDomain)new UmbracoDomain("test " + i + ".com") { RootContent = content, Language = lang };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
                 }
@@ -259,7 +259,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var ids = new List<int>();
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain { RootContent = content, Language = lang, DomainName = "test " + i + ".com" };
+                    var domain = (IDomain)new UmbracoDomain("test " + i + ".com") { RootContent = content, Language = lang };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
                     ids.Add(domain.Id);
@@ -291,11 +291,10 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain
+                    var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i))
                     {
                         RootContent = content,
-                        Language = lang,
-                        DomainName =  (i%2==0) ? "test " + i + ".com" : ("*" + i)
+                        Language = lang
                     };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
@@ -338,11 +337,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain
+                    var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i))
                     {
                         RootContent = (i % 2 == 0) ? contentItems[0] : contentItems[1],
-                        Language = lang,
-                        DomainName = (i % 2 == 0) ? "test " + i + ".com" : ("*" + i)
+                        Language = lang
                     };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
@@ -390,11 +388,10 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 for (int i = 0; i < 10; i++)
                 {
-                    var domain = (IDomain)new UmbracoDomain
+                    var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i))
                     {
                         RootContent = (i % 2 == 0) ? contentItems[0] : contentItems[1],
-                        Language = lang,
-                        DomainName = (i % 2 == 0) ? "test " + i + ".com" : ("*" + i)
+                        Language = lang
                     };
                     repo.AddOrUpdate(domain);
                     unitOfWork.Commit();
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
index 1a1c116eca..13a3d7bca6 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Tests.Routing
 		{
 		    SetupDomainServiceMock(new[]
 		    {
-		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
+		        new UmbracoDomain("domain1.com/") {Id = 1, Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
 		    });
 
 		    //var langEn = Language.GetByCultureCode("en-US");
@@ -56,12 +56,12 @@ namespace Umbraco.Tests.Routing
 		{
 		    SetupDomainServiceMock(new[]
 		    {
-		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
-		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)) {Id = 10011}},
-		        new UmbracoDomain {Id = 1, DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10012}},
-		        new UmbracoDomain {Id = 1, DomainName = "domain3.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1003}},
-		        new UmbracoDomain {Id = 1, DomainName = "domain3.com/en", Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)) {Id = 10031}},
-		        new UmbracoDomain {Id = 1, DomainName = "domain3.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10032}}
+		        new UmbracoDomain("domain1.com/") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+		        new UmbracoDomain("domain1.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)) {Id = 10011}},
+		        new UmbracoDomain("domain1.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10012}},
+		        new UmbracoDomain("http://domain3.com/") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1003}},
+		        new UmbracoDomain("http://domain3.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)) {Id = 10031}},
+		        new UmbracoDomain("http://domain3.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10032}}
 		    });
 
 		    //var langEn = Language.GetByCultureCode("en-US");
diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
index 2acadbb830..9042bbca53 100644
--- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
+++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
@@ -19,9 +19,9 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
-                new UmbracoDomain {Id = 1, DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}}
+                new UmbracoDomain("domain1.com/") {Id = 1, Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain("domain1.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("domain1.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}}
             });
         }
 
@@ -29,15 +29,15 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
-                new UmbracoDomain {Id = 1, DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
-                new UmbracoDomain {Id = 1, DomainName = "*1001", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
-                new UmbracoDomain {Id = 1, DomainName = "*10011", Language = new Language("cs-CZ"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "*100112", Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 100112}},
-                new UmbracoDomain {Id = 1, DomainName = "*1001122", Language = new Language("da-DK"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001122}},
-                new UmbracoDomain {Id = 1, DomainName = "*10012", Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
-                new UmbracoDomain {Id = 1, DomainName = "*10031", Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}}
+                new UmbracoDomain("domain1.com/") {Id = 1, Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain("domain1.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("domain1.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain("*1001") {Id = 1, Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain("*10011") {Id = 1, Language = new Language("cs-CZ"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("*100112") {Id = 1, Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 100112}},
+                new UmbracoDomain("*1001122") {Id = 1, Language = new Language("da-DK"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001122}},
+                new UmbracoDomain("*10012") {Id = 1, Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain("*10031") {Id = 1, Language = new Language("nl-NL"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}}
             });
         }
 
diff --git a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
index 48d67deb28..3a64389104 100644
--- a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
@@ -13,9 +13,9 @@ using umbraco.cms.businesslogic.web;
 using System.Configuration;
 namespace Umbraco.Tests.Routing
 {
-	[TestFixture]
+    [TestFixture]
     public class NiceUrlsProviderWithDomainsTests : UrlRoutingTestBase
-	{
+    {
         protected override void FreezeResolution()
         {
             SiteDomainHelperResolver.Current = new SiteDomainHelperResolver(new SiteDomainHelper());
@@ -23,20 +23,20 @@ namespace Umbraco.Tests.Routing
         }
 
 
-		void SetDomains1()
-		{
+        void SetDomains1()
+        {
 
             SetupDomainServiceMock(new[]
 		    {
-		        new UmbracoDomain {Id = 1, DomainName = "domain1.com", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
+		        new UmbracoDomain("domain1.com") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
 		    });
-		}
+        }
 
         void SetDomains2()
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/foo", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
+                new UmbracoDomain("http://domain1.com/foo") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
             });
         }
 
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}}
+                new UmbracoDomain("http://domain1.com/") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}}
             });
         }
 
@@ -52,12 +52,12 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1003}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10032}}
+                new UmbracoDomain("http://domain1.com/") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain("http://domain1.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("http://domain1.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain("http://domain3.com/") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1003}},
+                new UmbracoDomain("http://domain3.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}},
+                new UmbracoDomain("http://domain3.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10032}}
             });
         }
 
@@ -65,20 +65,20 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1a.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1b.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1a.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1b.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/en", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain3.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10032}}
+                new UmbracoDomain("http://domain1.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("http://domain1a.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("http://domain1b.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}},
+                new UmbracoDomain("http://domain1.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain("http://domain1a.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain("http://domain1b.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10012}},
+                new UmbracoDomain("http://domain3.com/en") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10031}},
+                new UmbracoDomain("http://domain3.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10032}}
             });
         }
 
-		protected override string GetXmlContent(int templateId)
-		{
-			return @"<?xml version=""1.0"" encoding=""utf-8""?>
+        protected override string GetXmlContent(int templateId)
+        {
+            return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[ 
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
@@ -157,233 +157,233 @@ namespace Umbraco.Tests.Routing
 		</Doc>
 	</Doc>
 </root>";
-		}
+        }
 
-		// with one simple domain "domain1.com"
-		// basic tests
-		[TestCase(1001, "http://domain1.com", false, "/")]
-		[TestCase(10011, "http://domain1.com", false, "/1001-1/")]
-		[TestCase(1002, "http://domain1.com", false, "/1002/")]
-		// absolute tests
-		[TestCase(1001, "http://domain1.com", true, "http://domain1.com/")]
-		[TestCase(10011, "http://domain1.com", true, "http://domain1.com/1001-1/")]
-		// different current tests
-		[TestCase(1001, "http://domain2.com", false, "http://domain1.com/")]
-		[TestCase(10011, "http://domain2.com", false, "http://domain1.com/1001-1/")]
-		[TestCase(1001, "https://domain1.com", false, "/")]
-		[TestCase(10011, "https://domain1.com", false, "/1001-1/")]
-		public void Get_Nice_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
-		{
-            var settings = SettingsForTests.GenerateMockSettings();
-		    var request = Mock.Get(settings.RequestHandler);
-		    request.Setup(x => x.UseDomainPrefixes).Returns(false);
-
-			var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
-
-		    SettingsForTests.UseDirectoryUrls = true;
-		    SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-
-			SetDomains1();
-
-			var currentUri = new Uri(currentUrl);
-			var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
-			Assert.AreEqual(expected, result);
-		}
-
-		// with one complete domain "http://domain1.com/foo"
-		// basic tests
-		[TestCase(1001, "http://domain1.com", false, "/foo/")]
-		[TestCase(10011, "http://domain1.com", false, "/foo/1001-1/")]
-		[TestCase(1002, "http://domain1.com", false, "/1002/")]
-		// absolute tests
-		[TestCase(1001, "http://domain1.com", true, "http://domain1.com/foo/")]
-		[TestCase(10011, "http://domain1.com", true, "http://domain1.com/foo/1001-1/")]
-		// different current tests
-		[TestCase(1001, "http://domain2.com", false, "http://domain1.com/foo/")]
-		[TestCase(10011, "http://domain2.com", false, "http://domain1.com/foo/1001-1/")]
-		[TestCase(1001, "https://domain1.com", false, "http://domain1.com/foo/")]
-		[TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
-		public void Get_Nice_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
-		{
+        // with one simple domain "domain1.com"
+        // basic tests
+        [TestCase(1001, "http://domain1.com", false, "/")]
+        [TestCase(10011, "http://domain1.com", false, "/1001-1/")]
+        [TestCase(1002, "http://domain1.com", false, "/1002/")]
+        // absolute tests
+        [TestCase(1001, "http://domain1.com", true, "http://domain1.com/")]
+        [TestCase(10011, "http://domain1.com", true, "http://domain1.com/1001-1/")]
+        // different current tests
+        [TestCase(1001, "http://domain2.com", false, "http://domain1.com/")]
+        [TestCase(10011, "http://domain2.com", false, "http://domain1.com/1001-1/")]
+        [TestCase(1001, "https://domain1.com", false, "/")]
+        [TestCase(10011, "https://domain1.com", false, "/1001-1/")]
+        public void Get_Nice_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
+        {
             var settings = SettingsForTests.GenerateMockSettings();
             var request = Mock.Get(settings.RequestHandler);
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
+            var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
 
-			SetDomains2();
+            SetDomains1();
 
-			var currentUri = new Uri(currentUrl);
-			var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
-			Assert.AreEqual(expected, result);
-		}
+            var currentUri = new Uri(currentUrl);
+            var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
+            Assert.AreEqual(expected, result);
+        }
 
-		// with one domain, not at root
-		[TestCase(1001, "http://domain1.com", false, "/1001/")]
-		[TestCase(10011, "http://domain1.com", false, "/")]
-		[TestCase(100111, "http://domain1.com", false, "/1001-1-1/")]
-		[TestCase(1002, "http://domain1.com", false, "/1002/")]
-		public void Get_Nice_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
-		{
+        // with one complete domain "http://domain1.com/foo"
+        // basic tests
+        [TestCase(1001, "http://domain1.com", false, "/foo/")]
+        [TestCase(10011, "http://domain1.com", false, "/foo/1001-1/")]
+        [TestCase(1002, "http://domain1.com", false, "/1002/")]
+        // absolute tests
+        [TestCase(1001, "http://domain1.com", true, "http://domain1.com/foo/")]
+        [TestCase(10011, "http://domain1.com", true, "http://domain1.com/foo/1001-1/")]
+        // different current tests
+        [TestCase(1001, "http://domain2.com", false, "http://domain1.com/foo/")]
+        [TestCase(10011, "http://domain2.com", false, "http://domain1.com/foo/1001-1/")]
+        [TestCase(1001, "https://domain1.com", false, "http://domain1.com/foo/")]
+        [TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
+        public void Get_Nice_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
+        {
             var settings = SettingsForTests.GenerateMockSettings();
             var request = Mock.Get(settings.RequestHandler);
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
+            var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
+
+            SettingsForTests.UseDirectoryUrls = true;
+            SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
+
+            SetDomains2();
+
+            var currentUri = new Uri(currentUrl);
+            var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
+            Assert.AreEqual(expected, result);
+        }
+
+        // with one domain, not at root
+        [TestCase(1001, "http://domain1.com", false, "/1001/")]
+        [TestCase(10011, "http://domain1.com", false, "/")]
+        [TestCase(100111, "http://domain1.com", false, "/1001-1-1/")]
+        [TestCase(1002, "http://domain1.com", false, "/1002/")]
+        public void Get_Nice_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
+        {
+            var settings = SettingsForTests.GenerateMockSettings();
+            var request = Mock.Get(settings.RequestHandler);
+            request.Setup(x => x.UseDomainPrefixes).Returns(false);
+
+            var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
 
             SetDomains3();
 
-			var currentUri = new Uri(currentUrl);
-			var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
-			Assert.AreEqual(expected, result);
-		}
+            var currentUri = new Uri(currentUrl);
+            var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
+            Assert.AreEqual(expected, result);
+        }
 
-		// with nested domains
-		[TestCase(1001, "http://domain1.com", false, "/")]
-		[TestCase(10011, "http://domain1.com", false, "/en/")]
-		[TestCase(100111, "http://domain1.com", false, "/en/1001-1-1/")]
-		[TestCase(10012, "http://domain1.com", false, "/fr/")]
-		[TestCase(100121, "http://domain1.com", false, "/fr/1001-2-1/")]
-		[TestCase(10013, "http://domain1.com", false, "/1001-3/")]
-		[TestCase(1002, "http://domain1.com", false, "/1002/")]
-		[TestCase(1003, "http://domain3.com", false, "/")]
-		[TestCase(10031, "http://domain3.com", false, "/en/")]
-		[TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
-		public void Get_Nice_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
-		{
+        // with nested domains
+        [TestCase(1001, "http://domain1.com", false, "/")]
+        [TestCase(10011, "http://domain1.com", false, "/en/")]
+        [TestCase(100111, "http://domain1.com", false, "/en/1001-1-1/")]
+        [TestCase(10012, "http://domain1.com", false, "/fr/")]
+        [TestCase(100121, "http://domain1.com", false, "/fr/1001-2-1/")]
+        [TestCase(10013, "http://domain1.com", false, "/1001-3/")]
+        [TestCase(1002, "http://domain1.com", false, "/1002/")]
+        [TestCase(1003, "http://domain3.com", false, "/")]
+        [TestCase(10031, "http://domain3.com", false, "/en/")]
+        [TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
+        public void Get_Nice_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
+        {
             var settings = SettingsForTests.GenerateMockSettings();
             var request = Mock.Get(settings.RequestHandler);
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
+            var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
-            
-			SetDomains4();
 
-			var currentUri = new Uri(currentUrl);
-			var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
-			Assert.AreEqual(expected, result);
-		}
+            SetDomains4();
 
-		[Test]
-		public void Get_Nice_Url_DomainsAndCache()
-		{
+            var currentUri = new Uri(currentUrl);
+            var result = routingContext.UrlProvider.GetUrl(nodeId, currentUri, absolute);
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void Get_Nice_Url_DomainsAndCache()
+        {
             var settings = SettingsForTests.GenerateMockSettings();
             var request = Mock.Get(settings.RequestHandler);
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-		    var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
+            var routingContext = GetRoutingContext("/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false; // ignored w/domains
 
-			SetDomains4();
+            SetDomains4();
 
-			string ignore;
-			ignore = routingContext.UrlProvider.GetUrl(1001, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(10011, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(100111, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(10012, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(100121, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(10013, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(1002, new Uri("http://domain1.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(1001, new Uri("http://domain2.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(10011, new Uri("http://domain2.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(100111, new Uri("http://domain2.com"), false);
-			ignore = routingContext.UrlProvider.GetUrl(1002, new Uri("http://domain2.com"), false);
+            string ignore;
+            ignore = routingContext.UrlProvider.GetUrl(1001, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(10011, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(100111, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(10012, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(100121, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(10013, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(1002, new Uri("http://domain1.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(1001, new Uri("http://domain2.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(10011, new Uri("http://domain2.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(100111, new Uri("http://domain2.com"), false);
+            ignore = routingContext.UrlProvider.GetUrl(1002, new Uri("http://domain2.com"), false);
 
             var cache = routingContext.UmbracoContext.ContentCache.InnerCache as PublishedContentCache;
             if (cache == null) throw new Exception("Unsupported IPublishedContentCache, only the Xml one is supported.");
             var cachedRoutes = cache.RoutesCache.GetCachedRoutes();
             Assert.AreEqual(7, cachedRoutes.Count);
 
-			var cachedIds = cache.RoutesCache.GetCachedIds();
-			Assert.AreEqual(7, cachedIds.Count);
+            var cachedIds = cache.RoutesCache.GetCachedIds();
+            Assert.AreEqual(7, cachedIds.Count);
 
-			CheckRoute(cachedRoutes, cachedIds, 1001, "1001/");
-			CheckRoute(cachedRoutes, cachedIds, 10011, "10011/");
-			CheckRoute(cachedRoutes, cachedIds, 100111, "10011/1001-1-1");
-			CheckRoute(cachedRoutes, cachedIds, 10012, "10012/");
-			CheckRoute(cachedRoutes, cachedIds, 100121, "10012/1001-2-1");
-			CheckRoute(cachedRoutes, cachedIds, 10013, "1001/1001-3");
-			CheckRoute(cachedRoutes, cachedIds, 1002, "/1002");
+            CheckRoute(cachedRoutes, cachedIds, 1001, "1001/");
+            CheckRoute(cachedRoutes, cachedIds, 10011, "10011/");
+            CheckRoute(cachedRoutes, cachedIds, 100111, "10011/1001-1-1");
+            CheckRoute(cachedRoutes, cachedIds, 10012, "10012/");
+            CheckRoute(cachedRoutes, cachedIds, 100121, "10012/1001-2-1");
+            CheckRoute(cachedRoutes, cachedIds, 10013, "1001/1001-3");
+            CheckRoute(cachedRoutes, cachedIds, 1002, "/1002");
 
-			// use the cache
-			Assert.AreEqual("/", routingContext.UrlProvider.GetUrl(1001, new Uri("http://domain1.com"), false));
-			Assert.AreEqual("/en/", routingContext.UrlProvider.GetUrl(10011, new Uri("http://domain1.com"), false));
-			Assert.AreEqual("/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111, new Uri("http://domain1.com"), false));
-			Assert.AreEqual("/fr/", routingContext.UrlProvider.GetUrl(10012, new Uri("http://domain1.com"), false));
-			Assert.AreEqual("/fr/1001-2-1/", routingContext.UrlProvider.GetUrl(100121, new Uri("http://domain1.com"), false));
-			Assert.AreEqual("/1001-3/", routingContext.UrlProvider.GetUrl(10013, new Uri("http://domain1.com"), false));
-			Assert.AreEqual("/1002/", routingContext.UrlProvider.GetUrl(1002, new Uri("http://domain1.com"), false));
+            // use the cache
+            Assert.AreEqual("/", routingContext.UrlProvider.GetUrl(1001, new Uri("http://domain1.com"), false));
+            Assert.AreEqual("/en/", routingContext.UrlProvider.GetUrl(10011, new Uri("http://domain1.com"), false));
+            Assert.AreEqual("/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111, new Uri("http://domain1.com"), false));
+            Assert.AreEqual("/fr/", routingContext.UrlProvider.GetUrl(10012, new Uri("http://domain1.com"), false));
+            Assert.AreEqual("/fr/1001-2-1/", routingContext.UrlProvider.GetUrl(100121, new Uri("http://domain1.com"), false));
+            Assert.AreEqual("/1001-3/", routingContext.UrlProvider.GetUrl(10013, new Uri("http://domain1.com"), false));
+            Assert.AreEqual("/1002/", routingContext.UrlProvider.GetUrl(1002, new Uri("http://domain1.com"), false));
 
-			Assert.AreEqual("http://domain1.com/fr/1001-2-1/", routingContext.UrlProvider.GetUrl(100121, new Uri("http://domain2.com"), false));
-		}
+            Assert.AreEqual("http://domain1.com/fr/1001-2-1/", routingContext.UrlProvider.GetUrl(100121, new Uri("http://domain2.com"), false));
+        }
 
-		void CheckRoute(IDictionary<int, string> routes, IDictionary<string, int> ids, int id, string route)
-		{
-			Assert.IsTrue(routes.ContainsKey(id));
-			Assert.AreEqual(route, routes[id]);
-			Assert.IsTrue(ids.ContainsKey(route));
-			Assert.AreEqual(id, ids[route]);
-		}
+        void CheckRoute(IDictionary<int, string> routes, IDictionary<string, int> ids, int id, string route)
+        {
+            Assert.IsTrue(routes.ContainsKey(id));
+            Assert.AreEqual(route, routes[id]);
+            Assert.IsTrue(ids.ContainsKey(route));
+            Assert.AreEqual(id, ids[route]);
+        }
 
-		[Test]
-		public void Get_Nice_Url_Relative_Or_Absolute()
-		{
+        [Test]
+        public void Get_Nice_Url_Relative_Or_Absolute()
+        {
             var settings = SettingsForTests.GenerateMockSettings();
             var requestMock = Mock.Get(settings.RequestHandler);
             requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
-		    var routingContext = GetRoutingContext("http://domain1.com/test", 1111, umbracoSettings: settings);
+            var routingContext = GetRoutingContext("http://domain1.com/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false;
 
-			SetDomains4();
-            
+            SetDomains4();
+
             Assert.AreEqual("/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111));
-			Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
-           
+            Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
+
             requestMock.Setup(x => x.UseDomainPrefixes).Returns(true);
 
             Assert.AreEqual("http://domain1.com/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111));
-			Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
+            Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
 
             requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
             routingContext.UrlProvider.Mode = UrlProviderMode.Absolute;
 
-			Assert.AreEqual("http://domain1.com/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111));
-			Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
-		}
+            Assert.AreEqual("http://domain1.com/en/1001-1-1/", routingContext.UrlProvider.GetUrl(100111));
+            Assert.AreEqual("http://domain3.com/en/1003-1-1/", routingContext.UrlProvider.GetUrl(100311));
+        }
 
-		[Test]
-		public void Get_Nice_Url_Alternate()
-		{
+        [Test]
+        public void Get_Nice_Url_Alternate()
+        {
             var settings = SettingsForTests.GenerateMockSettings();
-			var routingContext = GetRoutingContext("http://domain1.com/en/test", 1111,umbracoSettings:settings);
+            var routingContext = GetRoutingContext("http://domain1.com/en/test", 1111, umbracoSettings: settings);
 
             SettingsForTests.UseDirectoryUrls = true;
             SettingsForTests.HideTopLevelNodeFromPath = false;
 
-			SetDomains5();
+            SetDomains5();
 
-		    var url = routingContext.UrlProvider.GetUrl(100111, true);
+            var url = routingContext.UrlProvider.GetUrl(100111, true);
             Assert.AreEqual("http://domain1.com/en/1001-1-1/", url);
 
-			var result = routingContext.UrlProvider.GetOtherUrls(100111).ToArray();
-			
-			Assert.AreEqual(2, result.Count());
-			Assert.IsTrue(result.Contains("http://domain1a.com/en/1001-1-1/"));
-			Assert.IsTrue(result.Contains("http://domain1b.com/en/1001-1-1/"));
-		}
-	}
+            var result = routingContext.UrlProvider.GetOtherUrls(100111).ToArray();
+
+            Assert.AreEqual(2, result.Count());
+            Assert.IsTrue(result.Contains("http://domain1a.com/en/1001-1-1/"));
+            Assert.IsTrue(result.Contains("http://domain1b.com/en/1001-1-1/"));
+        }
+    }
 }
diff --git a/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs b/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs
index 9a046925ef..4abbf43e63 100644
--- a/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs
+++ b/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
+using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
 using umbraco.cms.businesslogic.web;
@@ -181,8 +182,8 @@ namespace Umbraco.Tests.Routing
             var current = new Uri("http://domain1.com/foo/bar");
             var output = helper.MapDomain(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain1.com"), Uri.UriSchemeHttp), 
-                    new DomainAndUri(new MockDomain("domain2.com"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain1.com"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp), 
                 }).Uri.ToString();
             Assert.AreEqual("http://domain1.com/", output);
 
@@ -192,8 +193,8 @@ namespace Umbraco.Tests.Routing
             current = new Uri("http://domain1.com/foo/bar");
             output = helper.MapDomain(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain1.net"), Uri.UriSchemeHttp), 
-                    new DomainAndUri(new MockDomain("domain2.net"), Uri.UriSchemeHttp)
+                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain2.net"), Uri.UriSchemeHttp)
                 }).Uri.ToString();
             Assert.AreEqual("http://domain1.net/", output);
 
@@ -204,8 +205,8 @@ namespace Umbraco.Tests.Routing
             current = new Uri("http://domain1.com/foo/bar");
             output = helper.MapDomain(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain2.net"), Uri.UriSchemeHttp), 
-                    new DomainAndUri(new MockDomain("domain1.net"), Uri.UriSchemeHttp)
+                    new DomainAndUri(new UmbracoDomain("domain2.net"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp)
                 }).Uri.ToString();
             Assert.AreEqual("http://domain1.net/", output);
         }
@@ -231,11 +232,11 @@ namespace Umbraco.Tests.Routing
             var current = new Uri("http://domain1.com/foo/bar");
             var output = helper.MapDomains(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain1.com"), Uri.UriSchemeHttp), // no: current + what MapDomain would pick
-                    new DomainAndUri(new MockDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain3.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
+                    new DomainAndUri(new UmbracoDomain("domain1.com"), Uri.UriSchemeHttp), // no: current + what MapDomain would pick
+                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain3.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
                 }, true).ToArray();
 
             Assert.AreEqual(1, output.Count());
@@ -246,11 +247,11 @@ namespace Umbraco.Tests.Routing
             current = new Uri("http://domain1.com/foo/bar");
             output = helper.MapDomains(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain1.net"), Uri.UriSchemeHttp), // no: what MapDomain would pick
-                    new DomainAndUri(new MockDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain3.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
+                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp), // no: what MapDomain would pick
+                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain3.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
                 }, true).ToArray();
 
             Assert.AreEqual(1, output.Count());
@@ -264,12 +265,12 @@ namespace Umbraco.Tests.Routing
             current = new Uri("http://domain1.com/foo/bar");
             output = helper.MapDomains(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain1.com"), Uri.UriSchemeHttp), // no: current + what MapDomain would pick
-                    new DomainAndUri(new MockDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain3.com"), Uri.UriSchemeHttp), // yes: bound site
-                    new DomainAndUri(new MockDomain("domain3.org"), Uri.UriSchemeHttp), // yes: bound site
-                    new DomainAndUri(new MockDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
+                    new DomainAndUri(new UmbracoDomain("domain1.com"), Uri.UriSchemeHttp), // no: current + what MapDomain would pick
+                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain3.com"), Uri.UriSchemeHttp), // yes: bound site
+                    new DomainAndUri(new UmbracoDomain("domain3.org"), Uri.UriSchemeHttp), // yes: bound site
+                    new DomainAndUri(new UmbracoDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
                 }, true).ToArray();
 
             Assert.AreEqual(3, output.Count());
@@ -282,12 +283,12 @@ namespace Umbraco.Tests.Routing
             current = new Uri("http://domain1.com/foo/bar");
             output = helper.MapDomains(current, new[]
                 {
-                    new DomainAndUri(new MockDomain("domain1.net"), Uri.UriSchemeHttp), // no: what MapDomain would pick
-                    new DomainAndUri(new MockDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain3.com"), Uri.UriSchemeHttp), // yes: bound site
-                    new DomainAndUri(new MockDomain("domain3.org"), Uri.UriSchemeHttp), // yes: bound site
-                    new DomainAndUri(new MockDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
-                    new DomainAndUri(new MockDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
+                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp), // no: what MapDomain would pick
+                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain3.com"), Uri.UriSchemeHttp), // yes: bound site
+                    new DomainAndUri(new UmbracoDomain("domain3.org"), Uri.UriSchemeHttp), // yes: bound site
+                    new DomainAndUri(new UmbracoDomain("domain4.com"), Uri.UriSchemeHttp), // no: not same site
+                    new DomainAndUri(new UmbracoDomain("domain1.org"), Uri.UriSchemeHttp), // yes: same site (though bogus setup)
                 }, true).ToArray();
 
             Assert.AreEqual(3, output.Count());
@@ -296,14 +297,14 @@ namespace Umbraco.Tests.Routing
             Assert.Contains("http://domain3.org/", output.Select(d => d.Uri.ToString()).ToArray());
         }
 
-        class MockDomain : Domain
-        {
-            private static readonly FieldInfo NameField = typeof (Domain).GetField("_name", BindingFlags.Instance | BindingFlags.NonPublic);
+        //class MockDomain : Domain
+        //{
+        //    private static readonly FieldInfo NameField = typeof (Domain).GetField("_name", BindingFlags.Instance | BindingFlags.NonPublic);
 
-            public MockDomain(string name)
-            {
-                NameField.SetValue(this, name);
-            }
-        }
+        //    public MockDomain(string name)
+        //    {
+        //        NameField.SetValue(this, name);
+        //    }
+        //}
     }
 }
diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
index 86e5edc833..089f78ac3e 100644
--- a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
+++ b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
@@ -40,9 +40,9 @@ namespace Umbraco.Tests.Routing
             domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
                 .Returns((bool incWildcards) => new[]
                 {
-                    new UmbracoDomain{Id = 1,DomainName = "domain1.com/", Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)){ Id = 1001}}, 
-                    new UmbracoDomain{Id = 1,DomainName = "domain1.com/en", Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)){ Id = 10011}}, 
-                    new UmbracoDomain{Id = 1,DomainName = "domain1.com/fr", Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)){ Id = 10012}}
+                    new UmbracoDomain("domain1.com/"){Id = 1, Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)){ Id = 1001}}, 
+                    new UmbracoDomain("domain1.com/en"){Id = 1, Language = new Language("en-US"), RootContent = new Content("test2", -1, new ContentType(-1)){ Id = 10011}}, 
+                    new UmbracoDomain("domain1.com/fr"){Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)){ Id = 10012}}
                 });
             return svcCtx;
         }
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 9cd4474dcb..1378cd3547 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -80,8 +80,8 @@ namespace Umbraco.Tests.Routing
 		{
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain {Id = 1, DomainName = "http://domain1.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
-                new UmbracoDomain {Id = 1, DomainName = "http://domain2.com/", Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}}
+                new UmbracoDomain("http://domain1.com/") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}},
+                new UmbracoDomain("http://domain2.com/") {Id = 1, Language = new Language("en-US"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 10011}}
             });
 
 		}
diff --git a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs
index 0bcf7a2dd8..17e58fb408 100644
--- a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs
+++ b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.Services
                             },
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             var result = txtService.GetAllStoredValues(culture);
 
@@ -130,7 +130,7 @@ namespace Umbraco.Tests.Services
                             }
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             var result = txtService.Localize("testArea/testKey", culture);
 
@@ -155,7 +155,7 @@ namespace Umbraco.Tests.Services
                             }
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             var result = txtService.Localize("testKey", culture);
 
@@ -180,7 +180,7 @@ namespace Umbraco.Tests.Services
                             }
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             var result = txtService.Localize("testArea/doNotFind", culture);
 
@@ -206,7 +206,7 @@ namespace Umbraco.Tests.Services
                             }
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             var result = txtService.Localize("doNotFind", culture);
 
@@ -231,7 +231,7 @@ namespace Umbraco.Tests.Services
                             }
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             var result = txtService.Localize("testKey", culture,
                 new Dictionary<string, string> { { "0", "world" }, { "1", "great" }, { "2", "planet" } });
@@ -359,7 +359,7 @@ namespace Umbraco.Tests.Services
                             }
                         }
                     }
-                });
+                }, Mock.Of<ILogger>());
 
             Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
         }
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
index 723f621356..91ca2b1e0f 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.SessionState;
+using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Web;
@@ -34,20 +36,26 @@ namespace Umbraco.Tests.TestHelpers.Stubs
 			if (t == null)
 				return null;
 
+	        var possibleParams = new object[]
+	        {
+	            _umbracoContext, _logger
+	        };
 	        var ctors = t.GetConstructors();
-	        if (ctors.Any(x =>
+	        foreach (var ctor in ctors.OrderByDescending(x => x.GetParameters().Count()))
 	        {
-	            var parameters = x.GetParameters();
-	            if (parameters.Length != 2) return false;
-	            return parameters.First().ParameterType == typeof (ILogger) && parameters.Last().ParameterType == typeof (UmbracoContext);
-	        }))
-	        {
-                return Activator.CreateInstance(t, new object[]{_logger, _umbracoContext}) as IController;
-	        }
-	        else
-	        {
-                return Activator.CreateInstance(t) as IController;    
+	            var args = new List<object>();
+	            var allParams = ctor.GetParameters().ToArray();
+	            foreach (var parameter in allParams)
+	            {
+	                var found = possibleParams.SingleOrDefault(x => x.GetType() == parameter.ParameterType);
+	                if (found != null) args.Add(found);
+	            }
+	            if (args.Count == allParams.Length)
+	            {
+                    return Activator.CreateInstance(t, args.ToArray()) as IController;
+	            }
 	        }
+	        return null;
 		}
 
 		public System.Web.SessionState.SessionStateBehavior GetControllerSessionBehavior(RequestContext requestContext, string controllerName)
diff --git a/src/Umbraco.Web/WebServices/DomainsApiController.cs b/src/Umbraco.Web/WebServices/DomainsApiController.cs
index f6c55309c0..a72f7537b0 100644
--- a/src/Umbraco.Web/WebServices/DomainsApiController.cs
+++ b/src/Umbraco.Web/WebServices/DomainsApiController.cs
@@ -58,9 +58,8 @@ namespace Umbraco.Web.WebServices
                 else
                 {
                     // yet there is a race condition here...
-                    var newDomain = new UmbracoDomain
+                    var newDomain = new UmbracoDomain("*" + model.NodeId)
                     {
-                        DomainName = "*" + model.NodeId,
                         Language = Services.LocalizationService.GetLanguageById(model.Language),
                         RootContent = Services.ContentService.GetById(model.NodeId)
                     };
@@ -110,9 +109,8 @@ namespace Umbraco.Web.WebServices
                 else
                 {
                     // yet there is a race condition here...
-                    var newDomain = new UmbracoDomain
+                    var newDomain = new UmbracoDomain(name)
                     {
-                        DomainName = name,
                         Language = Services.LocalizationService.GetLanguageById(domainModel.Lang),
                         RootContent = Services.ContentService.GetById(model.NodeId)
                     };
diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs
index 3c1f8381bc..370d75b4db 100644
--- a/src/umbraco.cms/businesslogic/web/Domain.cs
+++ b/src/umbraco.cms/businesslogic/web/Domain.cs
@@ -164,9 +164,8 @@ namespace umbraco.cms.businesslogic.web
             var lang = ApplicationContext.Current.Services.LocalizationService.GetLanguageById(LanguageId);
             if (lang == null) throw new NullReferenceException("No language exists with id " + LanguageId);
 
-            var domain = new UmbracoDomain
+            var domain = new UmbracoDomain(DomainName)
             {
-                DomainName = DomainName,
                 RootContent = content,
                 Language = lang
             };

From ccea64f0faadc2d01c8dd17a79ede88d87c91349 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Jan 2015 17:43:43 +1100
Subject: [PATCH 16/18] fixes: U4-3170 Proxy legacy relations API through the
 new RelationService

---
 src/Umbraco.Core/Services/IRelationService.cs |   2 +
 src/Umbraco.Core/Services/RelationService.cs  |  17 ++
 src/Umbraco.Core/Services/SectionService.cs   |   2 -
 .../ContentFinderByNiceUrlWithDomainsTests.cs |  46 +----
 src/umbraco.businesslogic/UserType.cs         |   1 -
 src/umbraco.cms/businesslogic/macro/Macro.cs  |   1 -
 .../businesslogic/member/Member.cs            |   1 -
 .../businesslogic/member/MemberType.cs        |   1 -
 .../businesslogic/relation/Relation.cs        | 184 +++++++-----------
 .../businesslogic/relation/RelationType.cs    | 116 +++--------
 src/umbraco.cms/businesslogic/web/Document.cs |   3 -
 11 files changed, 119 insertions(+), 255 deletions(-)

diff --git a/src/Umbraco.Core/Services/IRelationService.cs b/src/Umbraco.Core/Services/IRelationService.cs
index 9dcc6df615..3719993a75 100644
--- a/src/Umbraco.Core/Services/IRelationService.cs
+++ b/src/Umbraco.Core/Services/IRelationService.cs
@@ -108,6 +108,8 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
         IEnumerable<IRelation> GetByParentOrChildId(int id);
 
+        IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias);
+
         /// <summary>
         /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index becde9c416..db2328047d 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -203,6 +203,23 @@ namespace Umbraco.Core.Services
             }
         }
 
+        public IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var relationTypeRepository = RepositoryFactory.CreateRelationTypeRepository(uow))
+            {
+                var rtQuery = new Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
+                var relationType = relationTypeRepository.GetByQuery(rtQuery).FirstOrDefault();
+                if (relationType == null) return Enumerable.Empty<IRelation>();
+
+                using (var relationRepo = RepositoryFactory.CreateRelationRepository(uow))
+                {
+                    var query = new Query<IRelation>().Where(x => (x.ChildId == id || x.ParentId == id) && x.RelationTypeId == relationType.Id);
+                    return relationRepo.GetByQuery(query);
+                }
+            }
+        }
+
         /// <summary>
         /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Services/SectionService.cs b/src/Umbraco.Core/Services/SectionService.cs
index fd9519bc1c..58026ceb1d 100644
--- a/src/Umbraco.Core/Services/SectionService.cs
+++ b/src/Umbraco.Core/Services/SectionService.cs
@@ -210,7 +210,6 @@ namespace Umbraco.Core.Services
         /// <param name="name">The application name.</param>
         /// <param name="alias">The application alias.</param>
         /// <param name="icon">The application icon, which has to be located in umbraco/images/tray folder.</param>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public void MakeNew(string name, string alias, string icon)
         {
             MakeNew(name, alias, icon, GetSections().Max(x => x.SortOrder) + 1);
@@ -223,7 +222,6 @@ namespace Umbraco.Core.Services
         /// <param name="alias">The alias.</param>
         /// <param name="icon">The icon.</param>
         /// <param name="sortOrder">The sort order.</param>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public void MakeNew(string name, string alias, string icon, int sortOrder)
         {            
             if (GetSections().All(x => x.Alias != alias))
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
index 13a3d7bca6..3dcc127f86 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
@@ -1,14 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Moq;
-using NUnit.Framework;
+using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
-using umbraco.cms.businesslogic.web;
-using System.Configuration;
 
 namespace Umbraco.Tests.Routing
 {
@@ -16,29 +9,6 @@ namespace Umbraco.Tests.Routing
 	[TestFixture]
     public class ContentFinderByNiceUrlWithDomainsTests : UrlRoutingTestBase
 	{
-        //public override void Initialize()
-        //{
-        //    base.Initialize();
-
-        //    // ensure we can create them although the content is not in the database
-        //    TestHelper.DropForeignKeys("umbracoDomains");
-            
-        //    InitializeLanguagesAndDomains();
-        //}
-
-        //void InitializeLanguagesAndDomains()
-        //{
-        //    var domains = Domain.GetDomains();
-        //    foreach (var d in domains)
-        //        d.Delete();
-
-        //    var langs = Language.GetAllAsList();
-        //    foreach (var l in langs.Skip(1))
-        //        l.Delete();
-
-        //    Language.MakeNew("fr-FR");
-        //}
-
 		void SetDomains3()
 		{
 		    SetupDomainServiceMock(new[]
@@ -46,10 +16,6 @@ namespace Umbraco.Tests.Routing
 		        new UmbracoDomain("domain1.com/") {Id = 1, Language = new Language("de-DE"), RootContent = new Content("test1", -1, new ContentType(-1)) {Id = 1001}}
 		    });
 
-		    //var langEn = Language.GetByCultureCode("en-US");
-		    //var langFr = Language.GetByCultureCode("fr-FR");
-
-		    //Domain.MakeNew("domain1.com/", 1001, langEn.id);
 		}
 
 		void SetDomains4()
@@ -64,16 +30,6 @@ namespace Umbraco.Tests.Routing
 		        new UmbracoDomain("http://domain3.com/fr") {Id = 1, Language = new Language("fr-FR"), RootContent = new Content("test3", -1, new ContentType(-1)) {Id = 10032}}
 		    });
 
-		    //var langEn = Language.GetByCultureCode("en-US");
-		    //var langFr = Language.GetByCultureCode("fr-FR");
-
-		    //Domain.MakeNew("domain1.com/", 1001, langEn.id);
-		    //Domain.MakeNew("domain1.com/en", 10011, langEn.id);
-		    //Domain.MakeNew("domain1.com/fr", 10012, langFr.id);
-
-		    //Domain.MakeNew("http://domain3.com/", 1003, langEn.id);
-		    //Domain.MakeNew("http://domain3.com/en", 10031, langEn.id);
-		    //Domain.MakeNew("http://domain3.com/fr", 10032, langFr.id);
 		}
 
 		protected override string GetXmlContent(int templateId)
diff --git a/src/umbraco.businesslogic/UserType.cs b/src/umbraco.businesslogic/UserType.cs
index 31604c3ce9..766b01301e 100644
--- a/src/umbraco.businesslogic/UserType.cs
+++ b/src/umbraco.businesslogic/UserType.cs
@@ -184,7 +184,6 @@ namespace umbraco.BusinessLogic
         /// <param name="name"></param>
         /// <param name="defaultPermissions"></param>
         /// <param name="alias"></param>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public static UserType MakeNew(string name, string defaultPermissions, string alias)
         {
             //ensure that the current alias does not exist
diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs
index 8c1239a056..3f0d69b6ca 100644
--- a/src/umbraco.cms/businesslogic/macro/Macro.cs
+++ b/src/umbraco.cms/businesslogic/macro/Macro.cs
@@ -379,7 +379,6 @@ namespace umbraco.cms.businesslogic.macro
 		/// </summary>
 		/// <param name="Name">Userfriendly name</param>
 		/// <returns>The newly macro</returns>
-        [MethodImpl(MethodImplOptions.Synchronized)]
 		public static Macro MakeNew(string Name) 
 		{
 		    var macro = new Umbraco.Core.Models.Macro
diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs
index c1d60380ed..0962524597 100644
--- a/src/umbraco.cms/businesslogic/member/Member.cs
+++ b/src/umbraco.cms/businesslogic/member/Member.cs
@@ -217,7 +217,6 @@ namespace umbraco.cms.businesslogic.member
         /// <param name="u">The umbraco usercontext</param>
         /// <param name="Email">The email of the user</param>
         /// <returns>The new member</returns>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public static Member MakeNew(string Name, string LoginName, string Email, MemberType mbt, User u)
         {
             if (mbt == null) throw new ArgumentNullException("mbt");            
diff --git a/src/umbraco.cms/businesslogic/member/MemberType.cs b/src/umbraco.cms/businesslogic/member/MemberType.cs
index 7d6bcd4f07..d61d6e7b0e 100644
--- a/src/umbraco.cms/businesslogic/member/MemberType.cs
+++ b/src/umbraco.cms/businesslogic/member/MemberType.cs
@@ -216,7 +216,6 @@ namespace umbraco.cms.businesslogic.member
         /// </summary>
         /// <param name="Text">The name of the MemberType</param>
         /// <param name="u">Creator of the MemberType</param>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public static MemberType MakeNew(User u, string Text)
         {
             var alias = helpers.Casing.SafeAliasWithForcingCheck(Text);
diff --git a/src/umbraco.cms/businesslogic/relation/Relation.cs b/src/umbraco.cms/businesslogic/relation/Relation.cs
index 19cd4d7798..dd66cf5c4c 100644
--- a/src/umbraco.cms/businesslogic/relation/Relation.cs
+++ b/src/umbraco.cms/businesslogic/relation/Relation.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Data;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Collections.Generic;
-
+using Umbraco.Core;
+using Umbraco.Core.Models;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 
@@ -11,15 +13,28 @@ namespace umbraco.cms.businesslogic.relation
 	/// <summary>
 	/// Summary description for Relation.
 	/// </summary>
-	[Obsolete("Use the RelationService instead")]
+	[Obsolete("Use the IRelationService instead")]
 	public class Relation
 	{
-		private int _id;
-		private CMSNode _parentNode;
-		private CMSNode _childNode;
-		private string _comment;
-		private DateTime _datetime;
-		private RelationType _relType;
+        private CMSNode _parentNode;
+        private CMSNode _childNode;
+
+	    internal IRelation RelationEntity;
+
+        internal Relation(IRelation relation)
+        {
+            RelationEntity = relation;
+        }
+
+        public Relation(int Id)
+        {
+            var found = ApplicationContext.Current.Services.RelationService.GetById(Id);
+            if (found == null)
+            {
+                throw new NullReferenceException("No relation found with id " + Id);
+            }
+            RelationEntity = found;
+        }
 
         protected static ISqlHelper SqlHelper
         {
@@ -28,133 +43,84 @@ namespace umbraco.cms.businesslogic.relation
 
 		public CMSNode Parent 
 		{
-			get {return _parentNode;}
-			set 
-			{
-				SqlHelper.ExecuteNonQuery("update umbracoRelation set parentId = @parent where id = " + this.Id, SqlHelper.CreateParameter("@parent", value.Id));
-				_parentNode = value;
-			}
+		    get { return _parentNode ?? (_parentNode = new CMSNode(RelationEntity.ParentId)); }
+		    set
+		    {
+                _parentNode = value;
+		        RelationEntity.ParentId = value.Id;
+		    }
 		}
 
 		public CMSNode Child 
 		{
-			get {return _childNode;}
-			set 
-			{
-				SqlHelper.ExecuteNonQuery("update umbracoRelation set childId = @child where id = " + this.Id, SqlHelper.CreateParameter("@child", value.Id));
-				_childNode = value;
-			}
+            get { return _childNode ?? (_childNode = new CMSNode(RelationEntity.ChildId)); }
+            set
+            {
+                _childNode = value;
+                RelationEntity.ChildId = value.Id;
+            }
 		}
 
 		public string Comment 
 		{
-			get {return _comment;}
-			set 
-			{
-				SqlHelper.ExecuteNonQuery("update umbracoRelation set comment = @comment where id = " + this.Id, SqlHelper.CreateParameter("@comment", value));
-				_comment = value;
-			}
+			get {return RelationEntity.Comment;}
+			set { RelationEntity.Comment = value; }
 		}
 
 		public DateTime CreateDate 
 		{
-			get {return _datetime;}
+			get {return RelationEntity.CreateDate;}
 		}
 
 		public RelationType RelType
 		{
-			get {return _relType;}
-			set 
-			{
-				SqlHelper.ExecuteNonQuery("update umbracoRelation set relType = @relType where id = " + this.Id, SqlHelper.CreateParameter("@relType", value.Id));
-				_relType = value;
-			}
+			get { return new RelationType(RelationEntity.RelationType); }
+			set { RelationEntity.RelationType = value.RelationTypeEntity; }
 		}
 
 		public int Id 
 		{
-			get {return _id;}
-		}
-
-		public Relation(int Id)
-		{
-			using (IRecordsReader dr = SqlHelper.ExecuteReader("select * from umbracoRelation where id = @id", SqlHelper.CreateParameter("@id", Id)))
-			{
-                if (dr.Read())
-                {
-                    this._id = dr.GetInt("id");
-                    this._parentNode = new CMSNode(dr.GetInt("parentId"));
-                    this._childNode = new CMSNode(dr.GetInt("childId"));
-                    this._relType = RelationType.GetById(dr.GetInt("relType"));
-                    this._comment = dr.GetString("comment");
-                    this._datetime = dr.GetDateTime("datetime");
-                }
-                else
-                {
-                    throw new ArgumentException("No relation found for id " + Id.ToString());
-                }
-			}
+			get {return RelationEntity.Id;}
 		}
 
         /// <summary>
-        /// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility
+        /// Used to persist object changes to the database
         /// </summary>
         public virtual void Save()
         {
+            ApplicationContext.Current.Services.RelationService.Save(RelationEntity);
         }
 
-
-		public void Delete() 
+		public void Delete()
 		{
-			SqlHelper.ExecuteNonQuery("DELETE FROM umbracoRelation WHERE id = @id", SqlHelper.CreateParameter("@id", this.Id));
+		    ApplicationContext.Current.Services.RelationService.Delete(RelationEntity);
 		}
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
-		public static Relation MakeNew(int ParentId, int ChildId, RelationType RelType, string Comment) 
-		{
-            // The method is synchronized
-            SqlHelper.ExecuteNonQuery("INSERT INTO umbracoRelation (childId, parentId, relType, comment) VALUES (@childId, @parentId, @relType, @comment)",
-                SqlHelper.CreateParameter("@childId", ChildId),
-                SqlHelper.CreateParameter("@parentId", ParentId),
-                SqlHelper.CreateParameter("@relType", RelType.Id),
-                SqlHelper.CreateParameter("@comment", Comment));
-            return new Relation(SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM umbracoRelation"));
-		}
-
-
-
-		public static List<Relation> GetRelationsAsList(int NodeId) 
-		{
-            List<Relation> _rels = new List<Relation>();
-			System.Collections.ArrayList tmp = new System.Collections.ArrayList();
-			using (IRecordsReader dr = SqlHelper.ExecuteReader("select umbracoRelation.id from umbracoRelation inner join umbracoRelationType on umbracoRelationType.id = umbracoRelation.relType where umbracoRelation.parentId = @id or (umbracoRelation.childId = @id and umbracoRelationType.[dual] = 1)", SqlHelper.CreateParameter("@id", NodeId)))
-			{
-				while(dr.Read())
-				{
-                    _rels.Add(new Relation(dr.GetInt("id")));
-				}
-			}
-
-			return _rels;
-		}
-
-        public static bool IsRelated(int ParentID, int ChildId) {
-            int count = SqlHelper.ExecuteScalar<int>("SELECT count(*) FROM umbracoRelation WHERE childId = @childId AND parentId = @parentId",
-                  SqlHelper.CreateParameter("@childId", ChildId),
-                  SqlHelper.CreateParameter("@parentId", ParentID));
-
-            return (count > 0);
+		public static Relation MakeNew(int ParentId, int ChildId, RelationType RelType, string Comment)
+        {
+            var relation = new Umbraco.Core.Models.Relation(ParentId, ChildId, RelType.RelationTypeEntity)
+            {
+                Comment = Comment
+            };
+            ApplicationContext.Current.Services.RelationService.Save(relation);
+            return new Relation(relation);
         }
 
-        public static bool IsRelated(int ParentID, int ChildId, RelationType Filter) {
-            
-            int count = SqlHelper.ExecuteScalar<int>("SELECT count(*) FROM umbracoRelation WHERE childId = @childId AND parentId = @parentId AND relType = @relType",
-                 SqlHelper.CreateParameter("@childId", ChildId),
-                 SqlHelper.CreateParameter("@parentId", ParentID),
-                 SqlHelper.CreateParameter("@relType", Filter.Id) 
-            );
+		public static List<Relation> GetRelationsAsList(int NodeId)
+		{
+		    return ApplicationContext.Current.Services.RelationService.GetByParentOrChildId(NodeId)
+		        .Select(x => new Relation(x))
+		        .ToList();
+		}
 
-            return (count > 0);
+        public static bool IsRelated(int ParentID, int ChildId)
+        {
+            return ApplicationContext.Current.Services.RelationService.AreRelated(ParentID, ChildId);
+        }
+
+        public static bool IsRelated(int ParentID, int ChildId, RelationType Filter) 
+        {
+            return ApplicationContext.Current.Services.RelationService.AreRelated(ParentID, ChildId, Filter.Alias);
         }
 
         public static Relation[] GetRelations(int NodeId)
@@ -164,19 +130,9 @@ namespace umbraco.cms.businesslogic.relation
 
         public static Relation[] GetRelations(int NodeId, RelationType Filter)
         {
-            System.Collections.ArrayList tmp = new System.Collections.ArrayList();
-			using (IRecordsReader dr = SqlHelper.ExecuteReader("select umbracoRelation.id from umbracoRelation inner join umbracoRelationType on umbracoRelationType.id = umbracoRelation.relType and umbracoRelationType.id = @relTypeId where umbracoRelation.parentId = @id or (umbracoRelation.childId = @id and umbracoRelationType.[dual] = 1)", SqlHelper.CreateParameter("@id", NodeId), SqlHelper.CreateParameter("@relTypeId", Filter.Id)))
-			{
-				while(dr.Read())
-				{
-					tmp.Add(dr.GetInt("id"));
-				}
-			}
-
-            Relation[] retval = new Relation[tmp.Count];
-
-            for (int i = 0; i < tmp.Count; i++) retval[i] = new Relation((int)tmp[i]);
-            return retval;
+            return ApplicationContext.Current.Services.RelationService.GetByParentOrChildId(NodeId, Filter.RelationTypeEntity.Alias)
+                .Select(x => new Relation(x))
+                .ToArray();
         }
 	}
 }
diff --git a/src/umbraco.cms/businesslogic/relation/RelationType.cs b/src/umbraco.cms/businesslogic/relation/RelationType.cs
index 43b297cbbb..bedb51e440 100644
--- a/src/umbraco.cms/businesslogic/relation/RelationType.cs
+++ b/src/umbraco.cms/businesslogic/relation/RelationType.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Data;
+using System.Linq;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using umbraco.BusinessLogic;
+using Umbraco.Core.Models;
 using umbraco.DataLayer;
 using System.Collections.Generic;
 using umbraco.cms.businesslogic.web;
@@ -13,17 +15,13 @@ namespace umbraco.cms.businesslogic.relation
 	/// <summary>
 	/// Summary description for RelationType.
 	/// </summary>
+    [Obsolete("Use the IRelationService instead")]
 	public class RelationType
 	{
 		#region Declarations
 
-		private int _id;
-		private bool _dual;
-		private string _name;
-		//private Guid _parentObjectType;
-		//private Guid _childObjectType;
-		private string _alias;
-        
+	    internal IRelationType RelationTypeEntity;
+
 		#endregion
 
         private static ISqlHelper SqlHelper
@@ -33,25 +31,18 @@ namespace umbraco.cms.businesslogic.relation
 
 		#region Constructors
 
-        /// <summary>
-        /// Internal constructor to create a new relation type
-        /// </summary>
-        internal RelationType() { }
+	    /// <summary>
+	    /// Internal constructor to create a new relation type
+	    /// </summary>
+	    internal RelationType(IRelationType rt)
+	    {
+	        RelationTypeEntity = rt;
+	    }
 
 		public RelationType(int id)
 		{
-			using (IRecordsReader dr = SqlHelper.ExecuteReader(
-				"SELECT id, [dual], name, alias FROM umbracoRelationType WHERE id = @id", SqlHelper.CreateParameter("@id", id)))
-			{
-                if (dr.Read())
-                {
-                    PopulateFromReader(dr);
-                }
-                else
-                {
-                    throw new ArgumentException("Not RelationType found for id " + id.ToString());
-                }
-			}
+		    RelationTypeEntity = ApplicationContext.Current.Services.RelationService.GetRelationTypeById(id);
+		    if (RelationTypeEntity == null) throw new NullReferenceException("No relation type found with id " + id);
 		}
 
 		#endregion
@@ -60,61 +51,37 @@ namespace umbraco.cms.businesslogic.relation
 
 		public int Id
 		{
-			get { return _id; }
+            get { return RelationTypeEntity.Id; }
 		}
 
 		public string Name
 		{
-			get { return _name; }
-			set
-			{
-				_name = value;
-				SqlHelper.ExecuteNonQuery(
-					"UPDATE umbracoRelationType SET name = @name WHERE id = " + this.Id.ToString(), SqlHelper.CreateParameter("@name", value));
-			}
+            get { return RelationTypeEntity.Name; }
+			set { RelationTypeEntity.Name = value; }
 		}
 
 		public string Alias
 		{
-			get { return _alias; }
-			set
-			{
-				_alias = value;
-				SqlHelper.ExecuteNonQuery(
-					"UPDATE umbracoRelationType SET alias = @alias WHERE id = " + this.Id.ToString(), SqlHelper.CreateParameter("@alias", value));
-			}
+            get { return RelationTypeEntity.Alias; }
+			set { RelationTypeEntity.Alias = value; }
 		}
 
 		public bool Dual
 		{
-			get { return _dual; }
-			set
-			{
-				_dual = value;
-				SqlHelper.ExecuteNonQuery(
-					"UPDATE umbracoRelationType SET [dual] = @dual WHERE id = " + this.Id.ToString(), SqlHelper.CreateParameter("@dual", value));
-			}
+            get { return RelationTypeEntity.IsBidirectional; }
+			set { RelationTypeEntity.IsBidirectional = value; }
 		}
 
 		#endregion
 
-        private void PopulateFromReader(IRecordsReader dr)
-        {
-            this._id = dr.GetInt("id");
-            this._dual = dr.GetBoolean("dual");
-            //this._parentObjectType = dr.GetGuid("parentObjectType");
-            //this._childObjectType = dr.GetGuid("childObjectType");
-            this._name = dr.GetString("name");
-            this._alias = dr.GetString("alias");
-        }
-
 		#region Methods
 
 		/// <summary>
-		/// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility
+		/// Used to persist object changes to the databasey
 		/// </summary>
 		public virtual void Save()
 		{
+		    ApplicationContext.Current.Services.RelationService.Save(RelationTypeEntity);
 		}
 
         /// <summary>
@@ -123,45 +90,20 @@ namespace umbraco.cms.businesslogic.relation
         /// <returns></returns>
         public static IEnumerable<RelationType> GetAll()
         {
-            var relationTypes = new List<RelationType>();
-
-            using (IRecordsReader dr = SqlHelper.ExecuteReader("SELECT id, [dual], name, alias FROM umbracoRelationType"))
-            {
-                while (dr.Read())
-                {
-                    var rt = new RelationType();
-                    rt.PopulateFromReader(dr);
-                    relationTypes.Add(rt);
-                }
-            }
-
-            return relationTypes;
+            return ApplicationContext.Current.Services.RelationService.GetAllRelationTypes()
+                .Select(x => new RelationType(x));
         }
 
 		public static RelationType GetById(int id)
 		{
-			try
-			{
-			    return new RelationType(id);
-			}
-			catch
-			{
-				return null;
-			}
+		    var found = ApplicationContext.Current.Services.RelationService.GetRelationTypeById(id);
+		    return found == null ? null : new RelationType(found);
 		}
 
 		public static RelationType GetByAlias(string Alias)
 		{
-			try
-			{
-				return GetById(SqlHelper.ExecuteScalar<int>(
-					"select id from umbracoRelationType where alias = @alias",
-					SqlHelper.CreateParameter("@alias", Alias)));
-			}
-			catch
-			{
-				return null;
-			}
+            var found = ApplicationContext.Current.Services.RelationService.GetRelationTypeByAlias(Alias);
+            return found == null ? null : new RelationType(found);
 		}
         
 		#endregion
diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs
index 95d0f31a76..d9d80e1cc8 100644
--- a/src/umbraco.cms/businesslogic/web/Document.cs
+++ b/src/umbraco.cms/businesslogic/web/Document.cs
@@ -422,7 +422,6 @@ namespace umbraco.cms.businesslogic.web
         /// <remarks>
         /// This method is thread safe
         /// </remarks>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.RePublishAll()", false)]
         public static void RePublishAll()
         {
@@ -796,14 +795,12 @@ namespace umbraco.cms.businesslogic.web
         /// This method needs to be marked with [MethodImpl(MethodImplOptions.Synchronized)]
         /// because we execute multiple queries affecting the same data, if two thread are to do this at the same time for the same node we may have problems
         /// </remarks>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Publish()", false)]
         public bool PublishWithResult(User u)
         {
             return PublishWithResult(u, true);
         }
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
         [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Publish()", false)]
         internal bool PublishWithResult(User u, bool omitCacheRefresh)
         {

From 0f4185b6a53b088d832e733ab64b5c4156551e43 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Jan 2015 19:19:21 +1100
Subject: [PATCH 17/18] Gets legacy tasks apis wrapping new apis, added more
 tests and got the new tasks apis up to speed with all required methods.

---
 .../Persistence/Factories/TaskFactory.cs      |   2 -
 .../Persistence/Factories/TaskTypeFactory.cs  |  27 +++
 .../Interfaces/ITaskRepository.cs             |  12 +-
 .../Repositories/TaskRepository.cs            |  19 +-
 .../Repositories/TaskTypeRepository.cs        | 121 ++++++++++
 .../Persistence/RepositoryFactory.cs          |  11 +-
 src/Umbraco.Core/Services/ITaskService.cs     |  11 +-
 src/Umbraco.Core/Services/ServiceContext.cs   |  98 ++++----
 src/Umbraco.Core/Services/TaskService.cs      |  70 +++++-
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +
 .../Repositories/TaskRepositoryTest.cs        |  27 +++
 .../Repositories/TaskTypeRepositoryTest.cs    |  48 ++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |   1 +
 .../umbraco/config/lang/en_us.xml             |   2 +-
 src/umbraco.cms/businesslogic/task/Task.cs    | 223 +++++++-----------
 .../businesslogic/task/TaskType.cs            |  98 +++-----
 17 files changed, 484 insertions(+), 289 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs
 create mode 100644 src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs

diff --git a/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs b/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs
index 599eae12cb..81a6703324 100644
--- a/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs
@@ -10,8 +10,6 @@ namespace Umbraco.Core.Persistence.Factories
     /// </summary>
     internal class TaskFactory
     {
-       
-
         public Task BuildEntity(TaskDto dto)
         {
             var entity = new Task(new TaskType(dto.TaskTypeDto.Alias) { Id = dto.TaskTypeDto.Id })
diff --git a/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs
new file mode 100644
index 0000000000..a17abebad6
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Factories/TaskTypeFactory.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+
+namespace Umbraco.Core.Persistence.Factories
+{
+    internal class TaskTypeFactory
+    {
+        public TaskType BuildEntity(TaskTypeDto dto)
+        {
+            var entity = new TaskType(dto.Alias) {Id = dto.Id};
+            //on initial construction we don't want to have dirty properties tracked
+            // http://issues.umbraco.org/issue/U4-1946
+            entity.ResetDirtyProperties(false);
+            return entity;
+        }
+
+        public TaskTypeDto BuildDto(TaskType entity)
+        {
+            var dto = new TaskTypeDto
+            {
+                Id = (byte)entity.Id,
+                Alias = entity.Alias
+            };
+            return dto;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs
index aac8f09872..d2b4770082 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs
@@ -4,15 +4,13 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
+    public interface ITaskTypeRepository : IRepositoryQueryable<int, TaskType>
+    {
+        
+    }
+
     public interface ITaskRepository : IRepositoryQueryable<int, Task>
     {
-        //IEnumerable<Task> GetTasks(Guid? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false);
         IEnumerable<Task> GetTasks(int? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false);
-
-        //IEnumerable<Task> GetTasksForItem(int id);
-        //IEnumerable<Task> GetTasksForItem(Guid uniqueId);
-        //IEnumerable<Task> GetTasksByType(int typeId);
-        //IEnumerable<Task> GetTasksByType(string typeAlias);
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
index c6a569eb9f..1e59562b5a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             if (ids.Any())
             {
-                sql.Where("cmsTask.id IN (@ids)", new {ids = ids});
+                sql.Where("cmsTask.id IN (@ids)", new { ids = ids });
             }
 
             var factory = new TaskFactory();
@@ -109,10 +109,10 @@ namespace Umbraco.Core.Persistence.Repositories
             entity.AddingEntity();
 
             //ensure the task type exists
-            var taskType = Database.SingleOrDefault<TaskTypeDto>("Where alias = @alias", new {alias = entity.TaskType.Alias});
+            var taskType = Database.SingleOrDefault<TaskTypeDto>("Where alias = @alias", new { alias = entity.TaskType.Alias });
             if (taskType == null)
             {
-                var taskTypeId = Convert.ToInt32(Database.Insert(new TaskTypeDto {Alias = entity.TaskType.Alias}));
+                var taskTypeId = Convert.ToInt32(Database.Insert(new TaskTypeDto { Alias = entity.TaskType.Alias }));
                 entity.TaskType.Id = taskTypeId;
             }
             else
@@ -141,19 +141,6 @@ namespace Umbraco.Core.Persistence.Repositories
             entity.ResetDirtyProperties();
         }
 
-        //public IEnumerable<Task> GetTasks(Guid? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false)
-        //{
-        //    var sql = GetGetTasksQuery(assignedUser, ownerUser, taskTypeAlias, includeClosed);
-        //    if (itemId.HasValue)
-        //    {
-        //        sql.Where<NodeDto>(dto => dto.UniqueId == itemId.Value);
-        //    }
-
-        //    var dtos = Database.Fetch<TaskDto, TaskTypeDto>(sql);
-        //    var entities = Mapper.Map<IEnumerable<Task>>(dtos);
-        //    return entities;
-        //}
-
         public IEnumerable<Task> GetTasks(int? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false)
         {
             var sql = GetGetTasksQuery(assignedUser, ownerUser, taskTypeAlias, includeClosed);
diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs
new file mode 100644
index 0000000000..564e949172
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    internal class TaskTypeRepository : PetaPocoRepositoryBase<int, TaskType>, ITaskTypeRepository
+    {
+        public TaskTypeRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
+            : base(work, cache, logger, sqlSyntax)
+        {
+        }
+
+        protected override TaskType PerformGet(int id)
+        {
+            var sql = GetBaseQuery(false);
+            sql.Where(GetBaseWhereClause(), new { Id = id });
+
+            var taskDto = Database.Fetch<TaskTypeDto>(sql).FirstOrDefault();
+            if (taskDto == null)
+                return null;
+
+            var factory = new TaskTypeFactory();
+            var entity = factory.BuildEntity(taskDto);
+            return entity;
+        }
+
+        protected override IEnumerable<TaskType> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false);
+
+            if (ids.Any())
+            {
+                sql.Where("cmsTaskType.id IN (@ids)", new { ids = ids });
+            }
+
+            var factory = new TaskTypeFactory();
+            var dtos = Database.Fetch<TaskTypeDto>(sql);
+            return dtos.Select(factory.BuildEntity);
+        }
+
+        protected override IEnumerable<TaskType> PerformGetByQuery(IQuery<TaskType> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<TaskType>(sqlClause, query);
+            var sql = translator.Translate();
+
+            var factory = new TaskTypeFactory();
+            var dtos = Database.Fetch<TaskTypeDto>(sql);
+            return dtos.Select(factory.BuildEntity);
+        }
+
+        protected override Sql GetBaseQuery(bool isCount)
+        {
+            var sql = new Sql();
+            sql.Select("*").From<TaskTypeDto>(SqlSyntax);
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "cmsTaskType.id = @Id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+            {
+                "DELETE FROM cmsTask WHERE taskTypeId = @Id",
+                "DELETE FROM cmsTaskType WHERE id = @Id"
+            };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        protected override void PersistNewItem(TaskType entity)
+        {
+            entity.AddingEntity();
+
+            //TODO: Just remove the task type db table or add a unique index to the alias
+
+            //ensure the task type exists
+            var taskType = Database.SingleOrDefault<TaskTypeDto>("Where alias = @alias", new { alias = entity.Alias });
+            if (taskType != null)
+            {
+                throw new InvalidOperationException("A task type already exists with the given alias " + entity.Alias);
+            }
+
+            var factory = new TaskTypeFactory();
+            var dto = factory.BuildDto(entity);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            entity.Id = id;
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(TaskType entity)
+        {
+            entity.UpdatingEntity();
+
+            var factory = new TaskTypeFactory();
+            var dto = factory.BuildDto(entity);
+
+            Database.Update(dto);
+
+            entity.ResetDirtyProperties();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/RepositoryFactory.cs b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
index fbd91e5f31..2afe184b3a 100644
--- a/src/Umbraco.Core/Persistence/RepositoryFactory.cs
+++ b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
@@ -66,7 +66,9 @@ namespace Umbraco.Core.Persistence
 
         public virtual ITaskRepository CreateTaskRepository(IDatabaseUnitOfWork uow)
         {
-            return new TaskRepository(uow, _cacheHelper, _logger, _sqlSyntax);
+            return new TaskRepository(uow, 
+                CacheHelper.CreateDisabledCacheHelper(), //never cache
+                _logger, _sqlSyntax);
         }
 
         public virtual IAuditRepository CreateAuditRepository(IDatabaseUnitOfWork uow)
@@ -267,5 +269,12 @@ namespace Umbraco.Core.Persistence
         {
             return new DomainRepository(uow, _cacheHelper, _logger, _sqlSyntax, CreateContentRepository(uow), CreateLanguageRepository(uow));
         }
+
+        public ITaskTypeRepository CreateTaskTypeRepository(IDatabaseUnitOfWork uow)
+        {
+            return new TaskTypeRepository(uow, 
+                CacheHelper.CreateDisabledCacheHelper(), //never cache
+                _logger, _sqlSyntax);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ITaskService.cs b/src/Umbraco.Core/Services/ITaskService.cs
index 4c9038350d..2586f4ea89 100644
--- a/src/Umbraco.Core/Services/ITaskService.cs
+++ b/src/Umbraco.Core/Services/ITaskService.cs
@@ -4,8 +4,13 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services
 {
-    public interface ITaskService
+    public interface ITaskService : IService
     {
+        TaskType GetTaskTypeByAlias(string taskTypeAlias);
+        TaskType GetTaskTypeById(int id);
+        void Save(TaskType taskType);
+        void Delete(TaskType taskTypeEntity);
+
         //IEnumerable<Task> GetTasks(Guid? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false);
         IEnumerable<Task> GetTasks(int? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false);
 
@@ -14,5 +19,9 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="task"></param>
         void Save(Task task);
+        void Delete(Task task);
+
+        IEnumerable<TaskType> GetAllTaskTypes();
+        Task GetTaskById(int id);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index 4cbe9e6b37..b635e33e9b 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Publishing;
+using umbraco.interfaces;
 
 namespace Umbraco.Core.Services
 {
@@ -16,6 +17,7 @@ namespace Umbraco.Core.Services
     /// </summary>
     public class ServiceContext
     {
+        private Lazy<ITaskService> _taskService; 
         private Lazy<IDomainService> _domainService; 
         private Lazy<IAuditService> _auditService; 
         private Lazy<ILocalizedTextService> _localizedTextService;
@@ -40,7 +42,7 @@ namespace Umbraco.Core.Services
         private Lazy<INotificationService> _notificationService;
 
         /// <summary>
-        /// public ctor - will generally just be used for unit testing
+        /// public ctor - will generally just be used for unit testing all items are optional and if not specified, the defaults will be used
         /// </summary>
         /// <param name="contentService"></param>
         /// <param name="mediaService"></param>
@@ -62,48 +64,51 @@ namespace Umbraco.Core.Services
         /// <param name="localizedTextService"></param>
         /// <param name="auditService"></param>
         /// <param name="domainService"></param>
+        /// <param name="taskService"></param>
         public ServiceContext(
-            IContentService contentService, 
-            IMediaService mediaService, 
-            IContentTypeService contentTypeService, 
-            IDataTypeService dataTypeService, 
-            IFileService fileService, 
-            ILocalizationService localizationService, 
-            IPackagingService packagingService, 
-            IEntityService entityService,
-            IRelationService relationService,
-            IMemberGroupService memberGroupService,
-            IMemberTypeService memberTypeService,
-            IMemberService memberService,
-            IUserService userService,
-            ISectionService sectionService,
-            IApplicationTreeService treeService,
-            ITagService tagService,
-            INotificationService notificationService,             
-            ILocalizedTextService localizedTextService,
-            IAuditService auditService,
-            IDomainService domainService)
+            IContentService contentService = null,
+            IMediaService mediaService = null,
+            IContentTypeService contentTypeService = null,
+            IDataTypeService dataTypeService = null,
+            IFileService fileService = null,
+            ILocalizationService localizationService = null,
+            IPackagingService packagingService = null,
+            IEntityService entityService = null,
+            IRelationService relationService = null,
+            IMemberGroupService memberGroupService = null,
+            IMemberTypeService memberTypeService = null,
+            IMemberService memberService = null,
+            IUserService userService = null,
+            ISectionService sectionService = null,
+            IApplicationTreeService treeService = null,
+            ITagService tagService = null,
+            INotificationService notificationService = null,
+            ILocalizedTextService localizedTextService = null,
+            IAuditService auditService = null,
+            IDomainService domainService = null,
+            ITaskService taskService = null)
         {
-            _auditService = new Lazy<IAuditService>(() => auditService);
-            _localizedTextService = new Lazy<ILocalizedTextService>(() => localizedTextService);     
-            _tagService = new Lazy<ITagService>(() => tagService);     
-            _contentService = new Lazy<IContentService>(() => contentService);        
-            _mediaService = new Lazy<IMediaService>(() => mediaService);
-            _contentTypeService = new Lazy<IContentTypeService>(() => contentTypeService);
-            _dataTypeService = new Lazy<IDataTypeService>(() => dataTypeService);
-            _fileService = new Lazy<IFileService>(() => fileService);
-            _localizationService = new Lazy<ILocalizationService>(() => localizationService);
-            _packagingService = new Lazy<IPackagingService>(() => packagingService);
-            _entityService = new Lazy<IEntityService>(() => entityService);
-            _relationService = new Lazy<IRelationService>(() => relationService);
-            _sectionService = new Lazy<ISectionService>(() => sectionService);
-            _memberGroupService = new Lazy<IMemberGroupService>(() => memberGroupService);
-            _memberTypeService = new Lazy<IMemberTypeService>(() => memberTypeService);
-            _treeService = new Lazy<IApplicationTreeService>(() => treeService);
-            _memberService = new Lazy<IMemberService>(() => memberService);
-            _userService = new Lazy<IUserService>(() => userService);
-            _notificationService = new Lazy<INotificationService>(() => notificationService);
-            _domainService = new Lazy<IDomainService>(() => domainService);
+            if (_auditService != null) _auditService = new Lazy<IAuditService>(() => auditService);
+            if (_localizedTextService != null) _localizedTextService = new Lazy<ILocalizedTextService>(() => localizedTextService);
+            if (_tagService != null) _tagService = new Lazy<ITagService>(() => tagService);
+            if (_contentService != null) _contentService = new Lazy<IContentService>(() => contentService);
+            if (_mediaService != null) _mediaService = new Lazy<IMediaService>(() => mediaService);
+            if (_contentTypeService != null) _contentTypeService = new Lazy<IContentTypeService>(() => contentTypeService);
+            if (_dataTypeService != null) _dataTypeService = new Lazy<IDataTypeService>(() => dataTypeService);
+            if (_fileService != null) _fileService = new Lazy<IFileService>(() => fileService);
+            if (_localizationService != null) _localizationService = new Lazy<ILocalizationService>(() => localizationService);
+            if (_packagingService != null) _packagingService = new Lazy<IPackagingService>(() => packagingService);
+            if (_entityService != null) _entityService = new Lazy<IEntityService>(() => entityService);
+            if (_relationService != null) _relationService = new Lazy<IRelationService>(() => relationService);
+            if (_sectionService != null) _sectionService = new Lazy<ISectionService>(() => sectionService);
+            if (_memberGroupService != null) _memberGroupService = new Lazy<IMemberGroupService>(() => memberGroupService);
+            if (_memberTypeService != null) _memberTypeService = new Lazy<IMemberTypeService>(() => memberTypeService);
+            if (_treeService != null) _treeService = new Lazy<IApplicationTreeService>(() => treeService);
+            if (_memberService != null) _memberService = new Lazy<IMemberService>(() => memberService);
+            if (_userService != null) _userService = new Lazy<IUserService>(() => userService);
+            if (_notificationService != null) _notificationService = new Lazy<INotificationService>(() => notificationService);
+            if (_domainService != null) _domainService = new Lazy<IDomainService>(() => domainService);
+            if (_taskService != null) _taskService = new Lazy<ITaskService>(() => taskService);
         }
 
         internal ServiceContext(
@@ -133,6 +138,9 @@ namespace Umbraco.Core.Services
             var provider = dbUnitOfWorkProvider;
             var fileProvider = fileUnitOfWorkProvider;
 
+            if (_taskService == null)
+                _taskService = new Lazy<ITaskService>(() => new TaskService(provider, repositoryFactory, logger));
+
             if (_domainService == null)
                 _domainService = new Lazy<IDomainService>(() => new DomainService(provider, repositoryFactory, logger));
 
@@ -205,6 +213,14 @@ namespace Umbraco.Core.Services
 
         }
 
+        /// <summary>
+        /// Gets the <see cref="ITaskService"/>
+        /// </summary>
+        public ITaskService TaskService
+        {
+            get { return _taskService.Value; }
+        }
+
         /// <summary>
         /// Gets the <see cref="IDomainService"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Services/TaskService.cs b/src/Umbraco.Core/Services/TaskService.cs
index 08a641c359..861e49c9fc 100644
--- a/src/Umbraco.Core/Services/TaskService.cs
+++ b/src/Umbraco.Core/Services/TaskService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -16,13 +17,50 @@ namespace Umbraco.Core.Services
         {
         }
 
-        //public IEnumerable<Task> GetTasks(Guid? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false)
-        //{
-        //    using (var repo = RepositoryFactory.CreateTaskRepository(UowProvider.GetUnitOfWork()))
-        //    {
-        //        return repo.GetTasks(itemId, assignedUser, ownerUser, taskTypeAlias);
-        //    }
-        //}
+        public TaskType GetTaskTypeByAlias(string taskTypeAlias)
+        {
+            using (var repo = RepositoryFactory.CreateTaskTypeRepository(UowProvider.GetUnitOfWork()))
+            {
+                return repo.GetByQuery(new Query<TaskType>().Where(type => type.Alias == taskTypeAlias)).FirstOrDefault();
+            }
+        }
+
+        public TaskType GetTaskTypeById(int id)
+        {
+            using (var repo = RepositoryFactory.CreateTaskTypeRepository(UowProvider.GetUnitOfWork()))
+            {
+                return repo.Get(id);
+            }
+        }
+
+        public void Save(TaskType taskType)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateTaskTypeRepository(uow))
+            {
+                repo.AddOrUpdate(taskType);
+                uow.Commit();
+            }
+        }
+
+        public void Delete(TaskType taskTypeEntity)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateTaskTypeRepository(uow))
+            {
+                repo.Delete(taskTypeEntity);
+                uow.Commit();
+            }
+        }
+
+        public IEnumerable<TaskType> GetAllTaskTypes()
+        {
+            using (var repo = RepositoryFactory.CreateTaskTypeRepository(UowProvider.GetUnitOfWork()))
+            {
+                return repo.GetAll();
+            }
+        }
+
 
         public IEnumerable<Task> GetTasks(int? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false)
         {
@@ -45,5 +83,23 @@ namespace Umbraco.Core.Services
                 uow.Commit();
             }
         }
+
+        public void Delete(Task task)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repo = RepositoryFactory.CreateTaskRepository(uow))
+            {
+                repo.Delete(task);
+                uow.Commit();
+            }
+        }
+
+        public Task GetTaskById(int id)
+        {
+            using (var repo = RepositoryFactory.CreateTaskRepository(UowProvider.GetUnitOfWork()))
+            {
+                return repo.Get(id);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 6fc8a8f888..4c904fc3e3 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -324,6 +324,7 @@
     <Compile Include="Models\DoNotCloneAttribute.cs" />
     <Compile Include="Models\IDomain.cs" />
     <Compile Include="Persistence\Factories\TaskFactory.cs" />
+    <Compile Include="Persistence\Factories\TaskTypeFactory.cs" />
     <Compile Include="Persistence\Mappers\DomainMapper.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\RemoveStylesheetDataAndTables.cs" />
     <Compile Include="Persistence\Repositories\AuditRepository.cs" />
@@ -332,6 +333,7 @@
     <Compile Include="Persistence\Repositories\Interfaces\IDomainRepository.cs" />
     <Compile Include="Persistence\Repositories\Interfaces\ITaskRepository.cs" />
     <Compile Include="Persistence\Repositories\TaskRepository.cs" />
+    <Compile Include="Persistence\Repositories\TaskTypeRepository.cs" />
     <Compile Include="ServiceProviderExtensions.cs" />
     <Compile Include="IO\ResizedImage.cs" />
     <Compile Include="IO\UmbracoMediaFile.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
index c1ad6375d6..1477f62e9f 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
@@ -12,6 +12,33 @@ namespace Umbraco.Tests.Persistence.Repositories
     [TestFixture]
     public class TaskRepositoryTest : BaseDatabaseFactoryTest
     {
+        [Test]
+        public void Can_Delete()
+        {
+             var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
+            {
+                var created = DateTime.Now;
+                var task = new Task(new TaskType("asdfasdf"))
+                {
+                    AssigneeUserId = 0,
+                    Closed = false,
+                    Comment = "hello world",
+                    EntityId = -1,
+                    OwnerUserId = 0
+                };
+                repo.AddOrUpdate(task);
+                unitOfWork.Commit();
+
+                repo.Delete(task);
+                unitOfWork.Commit();
+
+                task = repo.Get(task.Id);
+                Assert.IsNull(task);
+            }
+        }
+
         [Test]
         public void Can_Add()
         {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs
new file mode 100644
index 0000000000..ef80df5f3a
--- /dev/null
+++ b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Tests.TestHelpers;
+
+namespace Umbraco.Tests.Persistence.Repositories
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture]
+    public class TaskTypeRepositoryTest : BaseDatabaseFactoryTest
+    {
+        [Test]
+        public void Can_Delete()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            var taskType = new TaskType("asdfasdf");
+            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
+            using (var taskTypeRepo = new TaskTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
+            {
+                var created = DateTime.Now;
+                var task = new Task(taskType)
+                {
+                    AssigneeUserId = 0,
+                    Closed = false,
+                    Comment = "hello world",
+                    EntityId = -1,
+                    OwnerUserId = 0
+                };
+                repo.AddOrUpdate(task);
+                unitOfWork.Commit();
+
+                var alltasktypes = taskTypeRepo.GetAll();
+
+                taskTypeRepo.Delete(taskType);
+                unitOfWork.Commit();
+
+                Assert.AreEqual(alltasktypes.Count() - 1, taskTypeRepo.GetAll().Count());
+                Assert.AreEqual(0, repo.GetAll().Count());
+            }
+
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 02527308c2..7d4fe26670 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -177,6 +177,7 @@
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\TaskRepositoryTest.cs" />
+    <Compile Include="Persistence\Repositories\TaskTypeRepositoryTest.cs" />
     <Compile Include="Resolvers\ResolverBaseTest.cs" />
     <Compile Include="Routing\UrlRoutingTestBase.cs" />
     <Compile Include="Strings\StylesheetHelperTests.cs" />
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 8acd5e3933..01a18ac39d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1035,6 +1035,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="usertype">User type</key>
     <key alias="userTypes">User types</key>
     <key alias="writer">Writer</key>
+    <key alias="translator">Translator</key>
     <key alias="yourProfile" version="7.0">Your profile</key>
     <key alias="yourHistory" version="7.0">Your recent history</key>
     <key alias="sessionExpires" version="7.0">Session expires in</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 26df92a44b..2a48541a6b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1038,7 +1038,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="usertype">User type</key>
     <key alias="userTypes">User types</key>
     <key alias="writer">Writer</key>
-
+    <key alias="translator">Translator</key>
     <key alias="yourProfile" version="7.0">Your profile</key>
     <key alias="yourHistory" version="7.0">Your recent history</key>
     <key alias="sessionExpires" version="7.0">Session expires in</key>
diff --git a/src/umbraco.cms/businesslogic/task/Task.cs b/src/umbraco.cms/businesslogic/task/Task.cs
index b7cf1bfc8c..678cd60225 100644
--- a/src/umbraco.cms/businesslogic/task/Task.cs
+++ b/src/umbraco.cms/businesslogic/task/Task.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Runtime.CompilerServices;
 
 using umbraco.BusinessLogic;
+using Umbraco.Core;
 using umbraco.DataLayer;
 
 namespace umbraco.cms.businesslogic.task
@@ -17,11 +18,13 @@ namespace umbraco.cms.businesslogic.task
     /// 
     /// Tasks can in umbraco be used for setting up simple workflows, and contains basic controls structures to determine if the task is completed or not.
     /// </summary>
+    [Obsolete("Use Umbraco.Core.Service.ITaskService instead")]
     public class Task
     {
 
+        internal Umbraco.Core.Models.Task TaskEntity;
+
         #region Properties
-        private int _id;
 
         /// <summary>
         /// Gets or sets the id.
@@ -29,20 +32,18 @@ namespace umbraco.cms.businesslogic.task
         /// <value>The id.</value>
         public int Id
         {
-            get { return _id; }
-            set { _id = value; }
+            get { return TaskEntity.Id; }
+            set { TaskEntity.Id = value; }
         }
-
-        private bool _closed;
-
+        
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="Task"/> is closed.
         /// </summary>
         /// <value><c>true</c> if closed; otherwise, <c>false</c>.</value>
         public bool Closed
         {
-            get { return _closed; }
-            set { _closed = value; }
+            get { return TaskEntity.Closed; }
+            set { TaskEntity.Closed = value; }
         }
 	
 
@@ -54,8 +55,12 @@ namespace umbraco.cms.businesslogic.task
         /// <value>The node.</value>
         public CMSNode Node
         {
-            get { return _node; }
-            set { _node = value; }
+            get { return _node ?? (_node = new CMSNode(TaskEntity.EntityId)); }
+            set
+            {
+                _node = value;
+                TaskEntity.EntityId = value.Id;
+            }
         }
 
         private TaskType _type;
@@ -66,8 +71,15 @@ namespace umbraco.cms.businesslogic.task
         /// <value>The type.</value>
         public TaskType Type
         {
-            get { return _type; }
-            set { _type = value; }
+            get { return _type ?? (_type = new TaskType(TaskEntity.TaskType)); }
+            set
+            {
+                _type = value;
+                TaskEntity.TaskType = new Umbraco.Core.Models.TaskType(_type.Alias)
+                {
+                    Id = _type.Id
+                };
+            }
         }
 	
 
@@ -79,33 +91,32 @@ namespace umbraco.cms.businesslogic.task
         /// <value>The parent user.</value>
         public User ParentUser
         {
-            get { return _parentUser; }
-            set { _parentUser = value; }
+            get { return _parentUser ?? (_parentUser = new User(TaskEntity.OwnerUserId)); }
+            set
+            {
+                _parentUser = value;
+                TaskEntity.OwnerUserId = _parentUser.Id;
+            }
         }
-
-        private string _comment;
-
+        
         /// <summary>
         /// Gets or sets the comment.
         /// </summary>
         /// <value>The comment.</value>
         public string Comment
         {
-            get { return _comment; }
-            set { _comment = value; }
+            get { return TaskEntity.Comment; }
+            set { TaskEntity.Comment = value; }
         }
 	
-
-        private DateTime _date;
-
         /// <summary>
         /// Gets or sets the date.
         /// </summary>
         /// <value>The date.</value>
         public DateTime Date
         {
-            get { return _date; }
-            set { _date = value; }
+            get { return TaskEntity.CreateDate; }
+            set { TaskEntity.CreateDate = value; }
         }
 	
         private User _user;
@@ -116,8 +127,12 @@ namespace umbraco.cms.businesslogic.task
         /// <value>The user.</value>
         public User User
         {
-            get { return _user; }
-            set { _user = value; }
+            get { return _user ?? (_user = new User(TaskEntity.AssigneeUserId)); }
+            set
+            {
+                _user = value;
+                TaskEntity.OwnerUserId = _user.Id;
+            }
         }
 
         /// <summary>
@@ -140,26 +155,19 @@ namespace umbraco.cms.businesslogic.task
         {
         }
 
+        internal Task(Umbraco.Core.Models.Task task)
+        {
+            TaskEntity = task;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Task"/> class.
         /// </summary>
         /// <param name="TaskId">The task id.</param>
         public Task(int TaskId)
         {
-			using (IRecordsReader dr =
-				SqlHelper.ExecuteReader(
-				"select id, taskTypeId, nodeId, parentUserId, userId, DateTime, comment, closed from cmsTask where id = @id",
-				SqlHelper.CreateParameter("@id", TaskId)))
-			{
-                if (dr.Read())
-                {
-                    PopulateTaskFromReader(dr);
-                }
-                else
-                {
-                    throw new ArgumentException("Task with id: '" + TaskId + "' not found");
-                }
-			}
+            TaskEntity = ApplicationContext.Current.Services.TaskService.GetTaskById(TaskId);
+            if (TaskEntity == null) throw new NullReferenceException("No task found with id " + TaskId);
         }
 
         #endregion
@@ -172,63 +180,19 @@ namespace umbraco.cms.businesslogic.task
         /// </summary>
         public void Delete()
         {
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsTask WHERE id = @id", SqlHelper.CreateParameter("@id", this._id));
+            ApplicationContext.Current.Services.TaskService.Delete(TaskEntity);
         }
 
         /// <summary>
         /// Saves this instance.
         /// </summary>
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public void Save()
         {
-            //error checking
-            if (Node == null) throw new ArgumentNullException("Node");
-            if (ParentUser == null) throw new ArgumentNullException("ParentUser");
-            if (User == null) throw new ArgumentNullException("User");
-
-            if (Id == 0)
-            {
-                // The method is synchronized
-                SqlHelper.ExecuteNonQuery(
-                    "insert into cmsTask (closed, taskTypeId, nodeId, parentUserId, userId, comment) values (@closed, @taskTypeId, @nodeId, @parentUserId, @userId, @comment)",
-                    SqlHelper.CreateParameter("@closed", Closed),
-                    SqlHelper.CreateParameter("@taskTypeId", Type.Id),
-                    SqlHelper.CreateParameter("@nodeId", Node.Id),
-                    SqlHelper.CreateParameter("@parentUserId", ParentUser.Id),
-                    SqlHelper.CreateParameter("@userId", User.Id),
-                    SqlHelper.CreateParameter("@comment", Comment));
-                Id = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsTask");
-            }
-            else
-            {
-                SqlHelper.ExecuteNonQuery(
-                    "update cmsTask set closed = @closed, taskTypeId = @taskTypeId, nodeId = @nodeId, parentUserId = @parentUserId, userId = @userId, comment = @comment where id = @id",
-                    SqlHelper.CreateParameter("@closed", Closed),
-                    SqlHelper.CreateParameter("@taskTypeId", Type.Id),
-                    SqlHelper.CreateParameter("@nodeId", Node.Id),
-                    SqlHelper.CreateParameter("@parentUserId", ParentUser.Id),
-                    SqlHelper.CreateParameter("@userId", User.Id),
-                    SqlHelper.CreateParameter("@comment", Comment),
-                    SqlHelper.CreateParameter("@id", Id));
-            }
+            ApplicationContext.Current.Services.TaskService.Save(TaskEntity);
         }
 
         #endregion
 
-        #region Private methods
-        private void PopulateTaskFromReader(IRecordsReader dr)
-        {
-            _id = dr.GetInt("id");
-            Type = new TaskType((int)dr.GetByte("taskTypeId"));
-            Node = new CMSNode(dr.GetInt("nodeId"));
-            ParentUser = User.GetUser(dr.GetInt("parentUserId"));
-            User = User.GetUser(dr.GetInt("userId"));
-            Date = dr.GetDateTime("DateTime");
-            Comment = dr.GetString("comment");
-            Closed = dr.GetBoolean("closed");
-        } 
-        #endregion
-
         #region static methods
 
         /// <summary>
@@ -238,19 +202,17 @@ namespace umbraco.cms.businesslogic.task
         /// <returns></returns>
         public static Tasks GetTasksByType(int taskType)
         {
-            var sql = "select id, taskTypeId, nodeId, parentUserId, userId, DateTime, comment, closed from cmsTask where taskTypeId = @taskTypeId";
-            Tasks tasks = new Tasks();
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(sql, SqlHelper.CreateParameter("@taskTypeId", taskType)))
+            var foundTaskType = ApplicationContext.Current.Services.TaskService.GetTaskTypeById(taskType);
+            if (foundTaskType == null) return null;
+
+            var result = new Tasks();
+            var tasks = ApplicationContext.Current.Services.TaskService.GetTasks(taskTypeAlias: foundTaskType.Alias);
+            foreach (var task in tasks)
             {
-                while (dr.Read())
-                {
-                    var t = new Task();
-                    t.PopulateTaskFromReader(dr);
-                    tasks.Add(t);
-                }
+                result.Add(new Task(task));
             }
 
-            return tasks;
+            return result;
         }
 
         /// <summary>
@@ -260,19 +222,14 @@ namespace umbraco.cms.businesslogic.task
         /// <returns></returns>
         public static Tasks GetTasks(int nodeId)
         {
-            var sql = "select id, taskTypeId, nodeId, parentUserId, userId, DateTime, comment, closed from cmsTask where nodeId = @nodeId";
-            Tasks tasks = new Tasks();
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(sql, SqlHelper.CreateParameter("@nodeId", nodeId)))
+            var result = new Tasks();
+            var tasks = ApplicationContext.Current.Services.TaskService.GetTasks(itemId:nodeId);
+            foreach (var task in tasks)
             {
-                while (dr.Read())
-                {
-                    var t = new Task();
-                    t.PopulateTaskFromReader(dr);
-                    tasks.Add(t);
-                }                    
+                result.Add(new Task(task));
             }
 
-            return tasks;
+            return result;
         }
 
         /// <summary>
@@ -281,26 +238,16 @@ namespace umbraco.cms.businesslogic.task
         /// <param name="User">The User who have the tasks assigned</param>
         /// <param name="IncludeClosed">If true both open and closed tasks will be returned</param>
         /// <returns>A collections of tasks</returns>
-        public static Tasks GetTasks(User User, bool IncludeClosed) {
-            string sql = "select id, taskTypeId, nodeId, parentUserId, userId, DateTime, comment, closed from cmsTask where userId = @userId";
-            if (!IncludeClosed)
-                sql += " and closed = 0";
-            sql += " order by DateTime desc";
+        public static Tasks GetTasks(User User, bool IncludeClosed) 
+        {
+            var result = new Tasks();
+            var tasks = ApplicationContext.Current.Services.TaskService.GetTasks(assignedUser:User.Id, includeClosed:IncludeClosed);
+            foreach (var task in tasks)
+            {
+                result.Add(new Task(task));
+            }
 
-            Tasks tasks = new Tasks();
-			using (IRecordsReader dr = SqlHelper.ExecuteReader(
-				sql,
-				SqlHelper.CreateParameter("@userId", User.Id)))
-			{
-                while (dr.Read())
-                {
-                    var t = new Task();
-                    t.PopulateTaskFromReader(dr);
-                    tasks.Add(t);
-                }   				
-			}
-
-            return tasks;
+            return result;
         }
 
         /// <summary>
@@ -309,25 +256,15 @@ namespace umbraco.cms.businesslogic.task
         /// <param name="User">The User who have the tasks assigned</param>
         /// <param name="IncludeClosed">If true both open and closed tasks will be returned</param>
         /// <returns>A collections of tasks</returns>
-        public static Tasks GetOwnedTasks(User User, bool IncludeClosed) {
-            string sql = "select id, taskTypeId, nodeId, parentUserId, userId, DateTime, comment, closed from cmsTask where parentUserId = @userId";
-            if (!IncludeClosed)
-                sql += " and closed = 0";
-            sql += " order by DateTime desc";
-
-            Tasks tasks = new Tasks();
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(
-                sql,
-                SqlHelper.CreateParameter("@userId", User.Id))) {
-                    while (dr.Read())
-                    {
-                        var t = new Task();
-                        t.PopulateTaskFromReader(dr);
-                        tasks.Add(t);
-                    }   
+        public static Tasks GetOwnedTasks(User User, bool IncludeClosed) 
+        {
+            var result = new Tasks();
+            var tasks = ApplicationContext.Current.Services.TaskService.GetTasks(ownerUser:User.Id, includeClosed: IncludeClosed);
+            foreach (var task in tasks)
+            {
+                result.Add(new Task(task));
             }
-
-            return tasks;
+            return result;
         }
 
         #endregion
diff --git a/src/umbraco.cms/businesslogic/task/TaskType.cs b/src/umbraco.cms/businesslogic/task/TaskType.cs
index 402c404968..ce21a2f85c 100644
--- a/src/umbraco.cms/businesslogic/task/TaskType.cs
+++ b/src/umbraco.cms/businesslogic/task/TaskType.cs
@@ -1,33 +1,34 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 using System.Runtime.CompilerServices;
 
 using umbraco.BusinessLogic;
+using Umbraco.Core;
 using umbraco.DataLayer;
 
 
 namespace umbraco.cms.businesslogic.task
 {
+    [Obsolete("Use Umbraco.Core.Service.ITaskService instead")]
     public class TaskType
     {
-        
+        internal Umbraco.Core.Models.TaskType TaskTypeEntity;
 
         #region Public Properties
 
         public int Id
         {
-            get { return _id; }
-            set { _id = value; }
+            get { return TaskTypeEntity.Id; }
+            set { TaskTypeEntity.Id = value; }
         }
 
-        private string _alias;
-
         public string Alias
         {
-            get { return _alias; }
-            set { _alias = value; }
+            get { return TaskTypeEntity.Alias; }
+            set { TaskTypeEntity.Alias = value; }
         }
 
         /// <summary>
@@ -38,11 +39,11 @@ namespace umbraco.cms.businesslogic.task
             get
             {
                 //lazy load the tasks
-                if (m_Tasks == null)
+                if (_tasks == null)
                 {
-                    m_Tasks = Task.GetTasksByType(this.Id);
+                    _tasks = Task.GetTasksByType(this.Id);
                 }
-                return m_Tasks;
+                return _tasks;
             }
         }
 
@@ -54,70 +55,40 @@ namespace umbraco.cms.businesslogic.task
         {
             get { return Application.SqlHelper; }
         }
-        private int _id;
-        private Tasks m_Tasks;
+
+        private Tasks _tasks;
 
         #endregion
 
         #region Constructors
+
+        internal TaskType(Umbraco.Core.Models.TaskType tt)
+        {
+            TaskTypeEntity = tt;
+        }
+        
         public TaskType()
         {
         }
 
         public TaskType(string TypeAlias)
         {
-            Id = SqlHelper.ExecuteScalar<int>(
-                "select id from cmsTaskType where alias = @alias",
-                SqlHelper.CreateParameter("@alias", TypeAlias));
-            setup();
+            TaskTypeEntity = ApplicationContext.Current.Services.TaskService.GetTaskTypeByAlias(TypeAlias);
+            if (TaskTypeEntity == null) throw new NullReferenceException("No task type found by alias " + TypeAlias);            
         }
 
         public TaskType(int TaskTypeId)
         {
-            Id = TaskTypeId;
-            setup();
+            TaskTypeEntity = ApplicationContext.Current.Services.TaskService.GetTaskTypeById(TaskTypeId);
+            if (TaskTypeEntity == null) throw new NullReferenceException("No task type found by alias " + TaskTypeId);            
         } 
-        #endregion
-
-        #region Private methods
-        private void setup()         
-        {
-			using (IRecordsReader dr =
-				SqlHelper.ExecuteReader("select alias from cmsTaskType where id = @id",
-				                        SqlHelper.CreateParameter("@id", Id)))
-			{
-                if (dr.Read())
-                {
-                    _id = Id;
-                    Alias = dr.GetString("alias");
-                }
-                else
-                {
-                    throw new ArgumentException("No Task type found for the id specified");
-                }
-			}
-        }
-        #endregion
+        #endregion      
 
         #region Public methods
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public void Save()
         {
-            if (Id == 0)
-            {
-                // The method is synchronized
-                SqlHelper.ExecuteNonQuery("INSERT INTO cmsTaskType (alias) values (@alias)",
-                    SqlHelper.CreateParameter("@alias", Alias));
-                Id = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsTaskType");
-            }
-            else
-            {
-                SqlHelper.ExecuteNonQuery(
-                    "update cmsTaskType set alias = @alias where id = @id",
-                    SqlHelper.CreateParameter("@alias", Alias),
-                    SqlHelper.CreateParameter("@id", Id));
-            }
+            ApplicationContext.Current.Services.TaskService.Save(TaskTypeEntity);
         }
 
         /// <summary>
@@ -126,12 +97,7 @@ namespace umbraco.cms.businesslogic.task
         /// </summary>
         public void Delete()
         {
-            foreach (Task t in Tasks)
-            {
-                t.Delete();
-            }
-            m_Tasks.Clear(); //remove the internal collection
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsTaskType WHERE id = @id", SqlHelper.CreateParameter("@id", this._id));
+            ApplicationContext.Current.Services.TaskService.Delete(TaskTypeEntity);
         } 
 
         #endregion
@@ -143,16 +109,8 @@ namespace umbraco.cms.businesslogic.task
         /// <returns></returns>
         public static IEnumerable<TaskType> GetAll()
         {
-            var sql = "SELECT id, alias FROM cmsTaskType";
-            var types = new List<TaskType>();
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(sql))
-            {
-                while (dr.Read())
-                {
-                    types.Add(new TaskType() { _alias = dr.GetString("alias"), _id = Convert.ToInt32(dr.Get<object>("id")) });
-                }
-            }
-            return types;
+            return ApplicationContext.Current.Services.TaskService.GetAllTaskTypes()
+                .Select(x => new TaskType(x));
         } 
         #endregion
 	

From b5dd742257ab1411e50cca60d284de1adc82ccb8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 23 Jan 2015 12:19:09 +1100
Subject: [PATCH 18/18] fixes issue with task query

---
 src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
index 1e59562b5a..f30f945851 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
@@ -168,11 +168,11 @@ namespace Umbraco.Core.Persistence.Repositories
             }
             if (ownerUser.HasValue)
             {
-                sql.Where<TaskDto>(dto => dto.UserId == ownerUser.Value);
+                sql.Where<TaskDto>(dto => dto.ParentUserId == ownerUser.Value);
             }
             if (assignedUser.HasValue)
             {
-                sql.Where<TaskDto>(dto => dto.ParentUserId == assignedUser.Value);
+                sql.Where<TaskDto>(dto => dto.UserId == assignedUser.Value);
             }
             return sql;
         }