Merge pull request #147 from AndyButland/u4-2958

Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
Fixed issue where member type properties would not persist after first save without reloading page
2013-10-05 10:04:08 -07:00 · 2013-10-02 21:20:05 +02:00 · 2013-09-30 16:10:14 +02:00 · 2013-09-30 14:32:06 +02:00 · 2013-09-30 12:39:28 +02:00 · 2013-09-30 12:12:17 +02:00
3230 changed files with 82618 additions and 317429 deletions
@@ -1,105 +1,86 @@
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-.DS_Store
-._.DS_Store
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.suo
-[sS]ource
-[sS]andbox
-umbraco.config
-*.vs10x
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Web.UI/[Cc]ss/*
-src/Umbraco.Web.UI/App_Code/*
-src/Umbraco.Web.UI/App_Data/*
-src/Umbraco.Tests/App_Data/*
-src/Umbraco.Web.UI/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
-src/Umbraco.Web.UI/[Xx]slt/*
-src/Umbraco.Web.UI/[Ii]mages/*
-src/Umbraco.Web.UI/[Ss]cripts/*
-src/Umbraco.Web.UI/Web.*.config.transformed
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-_BuildOutput/*
-*.ncrunchsolution
-build/UmbracoCms.AllBinaries*zip
-build/UmbracoCms.WebPI*zip
-build/UmbracoCms*zip
-build/*.nupkg
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-*.orig
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-webpihash.txt
-
-node_modules
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-build/_BuildOutput/
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-tools/NDepend/
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
-NDependOut/*
-*.ndproj
-QueryResult.htm
-*.ndproj
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+*.suo
+[sS]ource
+[sS]andbox
+umbraco.config
+*.vs10x
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+_BuildOutput/*
+build/UmbracoCms.AllBinaries*zip
+build/UmbracoCms.WebPI*zip
+build/UmbracoCms*zip
+build/*.nupkg
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+*.orig
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+webpihash.txt
+
+node_modules
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
+tools/NDepend/
+src/*.vspx
+src/*.psess
+NDependOut/*
+QueryResult.htm
+*.ndproj
@@ -1,9 +1,9 @@
-# The MIT License (MIT) #
-
-Copyright (c) 2013 Umbraco
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# The MIT License (MIT) #
+
+Copyright (c) 2013 Umbraco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,36 +1,33 @@
-Umbraco CMS
-===========
-##Note: Building version 7 from source##
-If you're interested in using the source code and building version 7, make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
-
-## Watch a five minute introduction video ##
-
-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
-
-## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
-
-**More than 177,000 sites trust Umbraco** 
-
-For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
-
-Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
-
-To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
-
-## Downloading ##
-
-The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
-
-## Forums ##
-
-We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
-
-## Contribute to Umbraco ##
-
-If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
-
-## Found a bug? ##
-
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
-
-To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
+Umbraco CMS
+===========
+## Watch a five minute introduction video ##
+
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
+
+**More than 177,000 sites trust Umbraco** 
+
+For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
+
+Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
+
+To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+
+## Downloading ##
+
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
+
+## Forums ##
+
+We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
+
+## Contribute to Umbraco ##
+
+If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
+
+## Found a bug? ##
+
+Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+
+To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
@@ -1,6 +1,6 @@
@ECHO OFF
-SET release=7.0.0
-SET comment=alpha
+SET release=6.1.6
+SET comment=
 SET version=%release%

 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
@@ -20,6 +20,7 @@ echo This file is only here so that the containing folder will be included in th
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt

 ..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
 ..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
@@ -162,21 +162,10 @@
    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
  </Target>

-  <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+  <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
    <MakeDir Directories="@(SystemFolders)" />
  </Target>

-  <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
-    <ItemGroup>
-      <BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
-    </ItemGroup>	
-	
-	<Copy SourceFiles="@(BelleFiles)"
-        DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-  </Target>
-  
  <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
    <!-- Copy SQL CE -->
    <ItemGroup>
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms.Core</id>
-        <version>7.0.0</version>
+        <version>6.2.0</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -20,13 +20,12 @@
            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
            <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
            <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
-            <dependency id="Lucene.Net" version="[2.9.4.1]" />
+            <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
            <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
            <dependency id="MySql.Data" version="[6.6.5]" />
            <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-            <dependency id="ClientDependency" version="[1.7.0, 1.7.1)" />
-            <dependency id="ClientDependency-Mvc" version="[1.7.0, 1.7.1)" />
-            <dependency id="AutoMapper" version="[2.2.1, 3.0.0)" />
+            <dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
        </dependencies>
    </metadata>
    <files>
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms</id>
-        <version>7.0.0</version>
+        <version>6.1.2</version>
        <title>Umbraco Cms</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-	
-	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
 </Project>
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-	
-	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
 </Project>
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-	
-	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
 </Project>
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
@@ -0,0 +1,31 @@
+/*******************************************************************************************
+
+    Umbraco database installation script for SQL CE (upgrade from Umbraco 4.0.x)
+ 
+	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+ 
+    Database version: 4.8.0.0
+    
+    Please increment this version number if ANY change is made to this script,
+    so compatibility with scripts for other database systems can be verified easily.
+    The first 3 digits depict the Umbraco version, the last digit is the database version.
+    (e.g. version 4.0.0.3 means "Umbraco version 4.0.0, database version 3")
+    
+    Check-in policy: only commit this script if
+     * you ran the Umbraco installer completely;
+     * you ran it on the targetted database system;
+     * you ran the Runway and Module installations;
+     * you were able to browse the Boost site;
+     * you were able to open the Umbraco administration panel;
+     * you have documented the code change in this script;
+     * you have incremented the version number in this script.
+ 
+	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+
+********************************************************************************************/
+
+/* REMOVE CONSTRAINTS */
+ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoApp] 
+;
+ALTER TABLE [umbracoAppTree] DROP CONSTRAINT [FK_umbracoAppTree_umbracoApp] 
+;
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SQLCE4Umbraco</RootNamespace>
    <AssemblyName>SQLCE4Umbraco</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SccProjectName>
    </SccProjectName>
@@ -22,7 +22,6 @@
    </SccProvider>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -32,7 +31,6 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -42,7 +40,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@@ -73,11 +70,25 @@
    <Compile Include="SqlCEInstaller.cs" />
    <Compile Include="SqlCEParameter.cs" />
    <Compile Include="SqlCeProviderException.cs" />
+    <Compile Include="SqlCEResources1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>SqlCEResources.resx</DependentUpon>
+    </Compile>
    <Compile Include="SqlCETableUtility.cs" />
    <Compile Include="SqlCEUtility.cs" />
  </ItemGroup>
  <ItemGroup>
+    <Content Include="Sql\Total.sql" />
    <None Include="packages.config" />
+    <None Include="Sql\Version4_1_Upgrade.sql" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SqlCEResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>SqlCEResources1.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
@@ -17,7 +17,6 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// Database installer for an SQL Server data source.
    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
    {
        #region Private Constants
@@ -98,7 +97,7 @@ namespace SqlCE4Umbraco
 		/// </summary>
 		protected override string FullInstallSql
 		{
-			get { return string.Empty; }
+			get { return SqlCEResources.Total; }
 		}


@@ -107,7 +106,11 @@ namespace SqlCE4Umbraco
 		/// </summary>
 		protected override string UpgradeSql
 		{
-			get { return string.Empty; }
+			get
+			{
+				string upgradeFile = string.Format("{0}_Upgrade", CurrentVersion.ToString());
+				return SqlCEResources.ResourceManager.GetString(upgradeFile);
+			}
 		}

        // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
@@ -118,13 +118,10 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="JsInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>jsinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="Total" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>sql\total.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  </data>
-  <data name="Main" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Main.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
-  <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="Version4_1_Upgrade" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>sql\version4_1_upgrade.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
 </root>
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18046
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace Umbraco.Web.UI.JavaScript {
+namespace SQLCE4Umbraco {
    using System;
    
    
@@ -22,14 +22,14 @@ namespace Umbraco.Web.UI.JavaScript {
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    internal class SqlCEResources {
        
        private static global::System.Resources.ResourceManager resourceMan;
        
        private static global::System.Globalization.CultureInfo resourceCulture;
        
        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
+        internal SqlCEResources() {
        }
        
        /// <summary>
@@ -39,7 +39,7 @@ namespace Umbraco.Web.UI.JavaScript {
        internal static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.UI.JavaScript.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SQLCE4Umbraco.SqlCEResources", typeof(SqlCEResources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
@@ -61,64 +61,46 @@ namespace Umbraco.Web.UI.JavaScript {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to [
-        ///    &apos;lib/jquery/jquery-1.8.2.min.js&apos;,
-        ///    &apos;lib/jquery/jquery.cookie.js&apos;,
-        ///    &apos;lib/angular/angular.min.js&apos;,
-        ///    &apos;lib/bootstrap/js/bootstrap.js&apos;,
-        ///    &apos;lib/underscore/underscore.js&apos;,
-        ///    &apos;lib/umbraco/Extensions.js&apos;,
+        ///   Looks up a localized string similar to /*******************************************************************************************
        ///
-        ///    &apos;js/app.js&apos;,
        ///
-        ///    &apos;js/umbraco.resources.js&apos;,
-        ///    &apos;js/umbraco.directives.js&apos;,
-        ///    &apos;js/umbraco.filters.js&apos;,
-        ///    &apos;js/umbraco.services.js&apos;,
-        ///    &apos;js/umbraco.security.js&apos;,
-        ///    &apos;js/umbraco.controllers.js&apos;,
-        ///    &apos;js/routes.js&apos;
-        ///].
+        ///
+        ///
+        ///
+        ///
+        ///
+        ///    Umbraco database installation script for SQL Server CE 4
+        /// 
+        ///IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+        /// 
+        ///    Database version: 4.10.0.0
+        ///    
+        ///    Please increment this version number if ANY change is made to this script,
+        ///    so compatibility with scripts for other database systems can be verified easily.
+        ///    The first 3 digits depict the Umbraco [rest of string was truncated]&quot;;.
        /// </summary>
-        internal static string JsInitialize {
+        internal static string Total {
            get {
-                return ResourceManager.GetString("JsInitialize", resourceCulture);
+                return ResourceManager.GetString("Total", resourceCulture);
            }
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to yepnope({
+        ///   Looks up a localized string similar to /*******************************************************************************************
        ///
-        ///    load: &quot;##JsInitialize##&quot;,
-        ///
-        ///    complete: function () {
-        ///        jQuery(document).ready(function () {
-        ///            angular.bootstrap(document, [&apos;umbraco&apos;]);
-        ///        });
-        ///
-        ///    }
-        ///});.
+        ///    Umbraco database installation script for SQL CE (upgrade from Umbraco 4.0.x)
+        /// 
+        ///	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+        /// 
+        ///    Database version: 4.8.0.0
+        ///    
+        ///    Please increment this version number if ANY change is made to this script,
+        ///    so compatibility with scripts for other database systems can be verified easily.
+        ///    The first 3 digits depict the [rest of string was truncated]&quot;;.
        /// </summary>
-        internal static string Main {
+        internal static string Version4_1_Upgrade {
            get {
-                return ResourceManager.GetString("Main", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to //TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
-        ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
-        ///// to force load JS files ?
-        ///
-        /////create the namespace (NOTE: This loads before any dependencies so we don&apos;t have a namespace mgr so we just create it manually)
-        ///var Umbraco = {};
-        ///Umbraco.Sys = {};
-        /////define a global static object
-        ///Umbraco.Sys.ServerVariables = ##Variables## ;.
-        /// </summary>
-        internal static string ServerVariables {
-            get {
-                return ResourceManager.GetString("ServerVariables", resourceCulture);
+                return ResourceManager.GetString("Version4_1_Upgrade", resourceCulture);
            }
        }
    }
@@ -11,7 +11,6 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// SQL Server implementation of <see cref="DefaultTableUtility&lt;S&gt;"/>.
    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCETableUtility : DefaultTableUtility<SqlCEHelper>
    {
        /// <summary>
@@ -6,7 +6,6 @@
 * 
 ***********************************************************************************/

-using System;
 using umbraco.DataLayer.SqlHelpers.SqlServer;
 using umbraco.DataLayer.Utility;
 using umbraco.DataLayer.Utility.Installer;
@@ -17,7 +16,6 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// Utility for an SQL Server data source.
    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCEUtility : DefaultUtility<SqlCEHelper>
    {
        #region Public Constructors
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
@@ -34,17 +33,6 @@ namespace Umbraco.Core
 			}
 		}

-        /// <summary>
-        /// Gets an Action if it exists.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        internal IAction GetAction<T>()
-            where T : IAction
-        {
-            return Actions.SingleOrDefault(x => x.GetType() == typeof (T));
-        }
-
 		protected override IEnumerable<IAction> CreateInstances()
 		{					
 			var actions = new List<IAction>();
@@ -5,7 +5,6 @@ using System.Web;
 using System.Web.Caching;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Services;
@@ -21,31 +20,49 @@ namespace Umbraco.Core
    /// </remarks>
    public class ApplicationContext : IDisposable
    {
-        
+    	/// <summary>
+        /// Constructor
+        /// </summary>        
+        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
+            : this(dbContext, serviceContext, true)
+    	{
+    			
+    	}
+
        /// <summary>
        /// Constructor
        /// </summary>
        /// <param name="dbContext"></param>
        /// <param name="serviceContext"></param>
-        /// <param name="cache"></param>
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
+        /// <param name="enableCache"></param>
+        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, bool enableCache)
+            : this(enableCache)
        {
            if (dbContext == null) throw new ArgumentNullException("dbContext");
            if (serviceContext == null) throw new ArgumentNullException("serviceContext");
-            if (cache == null) throw new ArgumentNullException("cache");

            _databaseContext = dbContext;
-            _services = serviceContext;
-            ApplicationCache = cache;
+            _services = serviceContext;		
        }

+		/// <summary>
+		/// Empty constructor normally reserved for unit tests when a DatabaseContext or a ServiceContext is not
+		/// necessarily required or needs to be set after construction.
+		/// </summary>
+		internal ApplicationContext() : this(true)
+		{			
+		}
+
        /// <summary>
-        /// Creates a basic app context
+        /// Constructor used to specify if we will enable application cache or not
        /// </summary>
-        /// <param name="cache"></param>
-        internal ApplicationContext(CacheHelper cache)
+        /// <param name="enableCache"></param>
+        internal ApplicationContext(bool enableCache)
        {
-            ApplicationCache = cache;
+            //create a new application cache from the HttpRuntime.Cache
+            ApplicationCache = HttpRuntime.Cache == null
+                ? new CacheHelper(new System.Web.Caching.Cache(), enableCache)
+                : new CacheHelper(HttpRuntime.Cache, enableCache);
        }

 		/// <summary>
@@ -65,7 +82,7 @@ namespace Umbraco.Core
        // note - the original umbraco module checks on content.Instance in umbraco.dll
        //   now, the boot task that setup the content store ensures that it is ready
        bool _isReady = false;
-		readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
+		readonly System.Threading.ManualResetEventSlim _isReadyEvent = new System.Threading.ManualResetEventSlim(false);
 		private DatabaseContext _databaseContext;
 		private ServiceContext _services;

@@ -95,18 +112,18 @@ namespace Umbraco.Core
        //   the system is configured if they match
        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
        //
-        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
+        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it...
        //
        public bool IsConfigured
        {
-            // fixme - we should not do this - ok for now
+            // fixme - let's do this for the time being
            get
            {
            	return Configured;
            }
        }

-	    /// <summary>
+        /// <summary>
        /// The original/first url that the web application executes
        /// </summary>
        /// <remarks>
@@ -2,165 +2,65 @@ using System;

 namespace Umbraco.Core
 {
-    /// <summary>
-    /// Provides ways to create attempts.
-    /// </summary>
-    public static class Attempt
-    {
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed<T>(T result)
-        {
-            return Attempt<T>.Succeed(result);
-        }
+	/// <summary>
+	/// Represents the result of an operation attempt
+	/// </summary>
+	/// <typeparam name="T"></typeparam>
+	/// <remarks></remarks>
+	[Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _error;

-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail<T>(T result)
-        {
-            return Attempt<T>.Fail(result);
-        }
+		/// <summary>
+		/// Gets a value indicating whether this <see cref="Attempt{T}"/> represents a successful operation.
+		/// </summary>
+		/// <remarks></remarks>
+		public bool Success
+		{
+			get { return _success; }
+		}

-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail<T>(T result, Exception exception)
-        {
-            return Attempt<T>.Fail(result, exception);
-        }
+		/// <summary>
+		/// Gets the error associated with an unsuccessful attempt.
+		/// </summary>
+		/// <value>The error.</value>
+		public Exception Error { get { return _error; } }

-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="success">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> If<T>(bool success, T result)
-        {
-            return Attempt<T>.SucceedIf(success, result);
-        }
+		/// <summary>
+		/// Gets the parse result.
+		/// </summary>
+		/// <remarks></remarks>
+		public T Result
+		{
+			get { return _result; }
+		}

+		/// <summary>
+		/// Represents an unsuccessful parse operation
+		/// </summary>
+		public static readonly Attempt<T> False = new Attempt<T>(false, default(T));

-        /// <summary>
-        /// Executes an attempt function, with callbacks.
-        /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="attempt">The attempt returned by the attempt function.</param>
-        /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
-        /// <param name="onFail">An action to execute in case the attempt fails.</param>
-        /// <returns>The outcome of the attempt.</returns>
-        /// <remarks>Runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
-        /// whether the attempt function reports a success or a failure.</remarks>
-        public static Outcome Try<T>(Attempt<T> attempt, Action<T> onSuccess, Action<Exception> onFail = null)
-        {
-            if (attempt.Success)
-            {
-                onSuccess(attempt.Result);
-                return Outcome.Success;
-            }
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Attempt{T}"/> struct.
+		/// </summary>
+		/// <param name="success">If set to <c>true</c> this tuple represents a successful parse result.</param>
+		/// <param name="result">The parse result.</param>
+		/// <remarks></remarks>
+		public Attempt(bool success, T result)
+		{
+			_success = success;
+			_result = result;
+			_error = null;
+		}

-            if (onFail != null)
-            {
-                onFail(attempt.Exception);
-            }
-
-            return Outcome.Failure;
-        }
-
-        /// <summary>
-        /// Represents the outcome of an attempt.
-        /// </summary>
-        /// <remarks>Can be a success or a failure, and allows for attempts chaining.</remarks>
-        public struct Outcome
-        {
-            private readonly bool _success;
-
-            /// <summary>
-            /// Gets an outcome representing a success.
-            /// </summary>
-            public static readonly Outcome Success = new Outcome(true);
-
-            /// <summary>
-            /// Gets an outcome representing a failure.
-            /// </summary>
-            public static readonly Outcome Failure = new Outcome(false);
-
-            private Outcome(bool success)
-            {
-                _success = success;
-            }
-
-            /// <summary>
-            /// Executes another attempt function, if the previous one failed, with callbacks.
-            /// </summary>
-            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
-            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
-            /// <param name="onFail">An action to execute in case the attempt fails.</param>
-            /// <returns>If it executes, returns the outcome of the attempt, else returns a success outcome.</returns>
-            /// <remarks>
-            /// <para>Executes only if the previous attempt failed, else does not execute and return a success outcome.</para>
-            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
-            /// whether the attempt function reports a success or a failure.</para>
-            /// </remarks>
-            public Outcome OnFailure<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
-            {
-                return _success
-                    ? Success
-                    : ExecuteNextFunction(nextFunction, onSuccess, onFail);
-            }
-
-            /// <summary>
-            /// Executes another attempt function, if the previous one succeeded, with callbacks.
-            /// </summary>
-            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
-            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
-            /// <param name="onFail">An action to execute in case the attempt fails.</param>
-            /// <returns>If it executes, returns the outcome of the attempt, else returns a failed outcome.</returns>
-            /// <remarks>
-            /// <para>Executes only if the previous attempt succeeded, else does not execute and return a success outcome.</para>
-            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
-            /// whether the attempt function reports a success or a failure.</para>
-            /// </remarks>
-            public Outcome OnSuccess<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
-            {
-                return _success
-                    ? ExecuteNextFunction(nextFunction, onSuccess, onFail) 
-                    : Failure;
-            }
-
-            private static Outcome ExecuteNextFunction<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
-            {
-                var attempt = nextFunction();
-
-                if (attempt.Success)
-                {
-                    onSuccess(attempt.Result);
-                    return Success;
-                }
-
-                if (onFail != null)
-                {
-                    onFail(attempt.Exception);
-                }
-
-                return Failure;
-            }
-        }
-
-    }
+		public Attempt(Exception error)
+		{
+			_success = false;
+			_result = default(T);
+			_error = error;
+		}
+	}
 }
@@ -1,164 +0,0 @@
-using System;
-using Umbraco.Core.Dynamics;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the result of an operation attempt.
-    /// </summary>
-    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-    [Serializable]
-	public struct Attempt<T>
-	{
-		private readonly bool _success;
-		private readonly T _result;
-		private readonly Exception _exception;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
-        /// </summary>
-        public bool Success
-		{
-			get { return _success; }
-		}
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        public Exception Exception { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
-        public Exception Error { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the attempt result.
-        /// </summary>
-        public T Result
-		{
-			get { return _result; }
-		}
-
-        // optimize, use a singleton failed attempt
-		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
-
-        /// <summary>
-        /// Represents an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
-        public static readonly Attempt<T> False = Failed; 
-
-        // private - use Succeed() or Fail() methods to create attempts
-        private Attempt(bool success, T result, Exception exception)
-        {
-            _success = success;
-            _result = result;
-            _exception = exception;
-        }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
-        /// </summary>
-        /// <param name="success">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(bool success, T result)
-            : this(success, result, null)
-        { }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(Exception exception)
-            : this(false, default(T), exception)
-        { }
-
-        /// <summary>
-        /// Creates a successful attempt.
-        /// </summary>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed()
-        {
-            return new Attempt<T>(true, default(T), null);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed(T result)
-        {
-            return new Attempt<T>(true, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail()
-        {
-            return Failed;
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(Exception exception)
-        {
-            return new Attempt<T>(false, default(T), exception);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result)
-        {
-            return new Attempt<T>(false, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result, Exception exception)
-        {
-            return new Attempt<T>(false, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition)
-        {
-            return condition ? new Attempt<T>(true, default(T), null) : Failed;
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition, T result)
-        {
-            return new Attempt<T>(condition, result, null);
-        }
-    }
-}
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a basic cache provider
+    /// </summary>
+    /// <remarks>
+    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
+    /// </remarks>
+    internal abstract class CacheProviderBase
+    {
+        public abstract void ClearAllCache();
+        public abstract void ClearCacheItem(string key);
+        public abstract void ClearCacheObjectTypes(string typeName);
+        public abstract void ClearCacheObjectTypes<T>();
+        public abstract void ClearCacheByKeySearch(string keyStartsWith);
+        public abstract void ClearCacheByKeyExpression(string regexString);
+        public abstract IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith);
+        public abstract T GetCacheItem<T>(string cacheKey);
+        public abstract T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem);
+    }
+}
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Extensions for strongly typed access
-    /// </summary>
-    internal static class CacheProviderExtensions
-    {
-        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
-            string cacheKey,
-            Func<T> getCacheItem,
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null)
-        {
-            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
-            return result == null ? default(T) : result.TryConvertTo<T>().Result;
-        }
-
-        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
-            string cacheKey,
-            Func<T> getCacheItem,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null)
-        {
-            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
-        }
-
-        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
-        {
-            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
-            return result.Select(x => x.TryConvertTo<T>().Result);
-        }
-
-        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
-        {
-            var result = provider.GetCacheItem(cacheKey);
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
-        }
-
-        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
-        {
-            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
-        }
-    }
-}
@@ -1,198 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-
-namespace Umbraco.Core.Cache
-{
-    internal abstract class DictionaryCacheProdiverBase : ICacheProvider
-    {
-        protected static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-        protected abstract DictionaryCacheWrapper DictionaryCache { get; }
-
-        /// <summary>
-        /// Clears everything in umbraco's runtime cache
-        /// </summary>
-        /// <remarks>
-        /// Does not clear other stuff the user has put in httpruntime.cache!
-        /// </remarks>
-        public virtual void ClearAllCache()
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = DictionaryCache.Cast<object>()
-                                                  .Select(item => new DictionaryItemWrapper(item))
-                                                  .Where(c => c.Key is string && ((string)c.Key).StartsWith(CacheItemPrefix) && DictionaryCache[c.Key.ToString()] != null)
-                                                  .Select(c => c.Key)
-                                                  .ToList();
-
-                foreach (var k in keysToRemove)
-                {
-                    DictionaryCache.Remove(k);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Clears the item in umbraco's runtime cache with the given key 
-        /// </summary>
-        /// <param name="key">Key</param>
-        public virtual void ClearCacheItem(string key)
-        {
-            using (new WriteLock(Locker))
-            {
-                if (DictionaryCache[GetCacheKey(key)] == null) return;
-                DictionaryCache.Remove(GetCacheKey(key)); ;
-            }
-        }
-
-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type name as the
-        /// input parameter. (using [object].GetType())
-        /// </summary>
-        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
-        public virtual void ClearCacheObjectTypes(string typeName)
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = DictionaryCache
-                    .Cast<object>()
-                    .Select(item => new DictionaryItemWrapper(item))
-                    .Where(c =>
-                    {
-                        var k = c.Key.ToString();
-                        var v = DictionaryCache[k];
-                        return v != null && v.GetType().ToString().InvariantEquals(typeName);
-                    })
-                    .Select(c => c.Key)
-                    .ToList();
-
-                foreach (var k in keysToRemove)
-                    DictionaryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            using (new WriteLock(Locker))
-            {
-                var typeOfT = typeof(T);
-                var keysToRemove = DictionaryCache
-                    .Cast<object>()
-                    .Select(item => new DictionaryItemWrapper(item))
-                    .Where(c =>
-                    {
-                        var k = c.Key.ToString();
-                        var v = DictionaryCache[k];
-                        return v != null && v.GetType() == typeOfT;
-                    })
-                    .Select(c => c.Key)
-                    .ToList();
-
-                foreach (var k in keysToRemove)
-                    DictionaryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            using (new WriteLock(Locker))
-            {
-                var typeOfT = typeof(T);
-                var keysToRemove = DictionaryCache
-                    .Cast<object>()
-                    .Select(item => new DictionaryItemWrapper(item))
-                    .Where(c =>
-                    {
-                        var k = c.Key.ToString();
-                        var v = DictionaryCache[k];
-                        return v != null && v.GetType() == typeOfT && predicate(k, (T)v);
-                    })
-                    .Select(c => c.Key)
-                    .ToList();
-
-                foreach (var k in keysToRemove)
-                    DictionaryCache.Remove(k);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            var keysToRemove = DictionaryCache.Cast<object>()
-                                              .Select(item => new DictionaryItemWrapper(item))
-                                              .Where(c => c.Key is string && ((string)c.Key).InvariantStartsWith(string.Format("{0}-{1}", CacheItemPrefix, keyStartsWith)))
-                                              .Select(c => c.Key)
-                                              .ToList();
-
-            foreach (var k in keysToRemove)
-            {
-                DictionaryCache.Remove(k);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            var keysToRemove = new List<object>();
-            foreach (var item in DictionaryCache)
-            {
-                var c = new DictionaryItemWrapper(item);
-                var s = c.Key as string;
-                if (s != null)
-                {
-                    var withoutPrefix = s.TrimStart(string.Format("{0}-", CacheItemPrefix));
-                    if (Regex.IsMatch(withoutPrefix, regexString))
-                    {
-                        keysToRemove.Add(c.Key);
-                    }
-                }
-            }
-
-            foreach (var k in keysToRemove)
-            {
-                DictionaryCache.Remove(k);
-            }
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            return (from object item in DictionaryCache
-                    select new DictionaryItemWrapper(item)
-                    into c
-                    where c.Key is string && ((string) c.Key).InvariantStartsWith(string.Format("{0}-{1}", CacheItemPrefix, keyStartsWith))
-                    select c.Value).ToList();
-        }
-
-        /// <summary>
-        /// Returns a cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            var result = DictionaryCache.Get(GetCacheKey(cacheKey));
-            return result;
-        }
-
-        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);        
-
-        /// <summary>
-        /// We prefix all cache keys with this so that we know which ones this class has created when 
-        /// using the HttpRuntime cache so that when we clear it we don't clear other entries we didn't create.
-        /// </summary>
-        protected const string CacheItemPrefix = "umbrtmche";
-
-        protected string GetCacheKey(string key)
-        {
-            return string.Format("{0}-{1}", CacheItemPrefix, key);
-        }
-    }
-}
@@ -1,45 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Umbraco.Core.Cache
-{
-    internal class DictionaryCacheWrapper : IEnumerable
-    {
-        private readonly IEnumerable _inner;
-        private readonly Func<object, object> _get;
-        private readonly Action<object> _remove;
-
-        public DictionaryCacheWrapper(
-            IEnumerable inner,
-            Func<object, object> get,
-            Action<object> remove)
-        {
-            _inner = inner;
-            _get = get;
-            _remove = remove;
-        }
-
-        public object this[object key]
-        {
-            get
-            {
-                return Get(key);
-            }            
-        }
-
-        public object Get(object key)
-        {
-            return _get(key);
-        }
-
-        public void Remove(object key)
-        {
-            _remove(key);
-        }
-
-        public IEnumerator GetEnumerator()
-        {
-            return _inner.GetEnumerator();
-        }
-    }
-}
@@ -1,14 +0,0 @@
-namespace Umbraco.Core.Cache
-{
-    internal class DictionaryItemWrapper
-    {
-        public DictionaryItemWrapper(dynamic item)
-        {
-            Key = item.Key;
-            Value = item.Value;
-        }
-        
-        public object Key { get; private set; }
-        public object Value { get; private set; }
-    }
-}
@@ -1,47 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Web;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache provider that caches items in the HttpContext.Items
-    /// </summary>
-    internal class HttpRequestCacheProvider : DictionaryCacheProdiverBase
-    {
-        private readonly Func<HttpContextBase> _context;
-
-        public HttpRequestCacheProvider(HttpContext context)
-        {
-            _context = () => new HttpContextWrapper(context);
-        }
-
-        public HttpRequestCacheProvider(Func<HttpContextBase> context)
-        {
-            _context = context;
-        }
-
-        protected override DictionaryCacheWrapper DictionaryCache
-        {
-            get
-            {
-                var ctx = _context();
-                return new DictionaryCacheWrapper(
-                    ctx.Items,
-                    o => ctx.Items[o],
-                    o => ctx.Items.Remove(o));
-            }
-        }
-
-        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            var ctx = _context();
-            var ck = GetCacheKey(cacheKey);
-            return ctx.Items[ck] ?? (ctx.Items[ck] = getCacheItem());
-        }
-
-    }
-}
@@ -1,37 +1,62 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Web;
+using System.Text.RegularExpressions;
 using System.Web.Caching;
 using Umbraco.Core.Logging;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
    /// </summary>
-    internal class HttpRuntimeCacheProvider : DictionaryCacheProdiverBase, IRuntimeCacheProvider
+    internal class HttpRuntimeCacheProvider : RuntimeCacheProviderBase
    {
        private readonly System.Web.Caching.Cache _cache;
-        private readonly DictionaryCacheWrapper _wrapper;
-        
+        private static readonly object Locker = new object();
+
        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
        {
            _cache = cache;
-            _wrapper = new DictionaryCacheWrapper(_cache, s => _cache.Get(s.ToString()), o => _cache.Remove(o.ToString()));
-        }
-
-        protected override DictionaryCacheWrapper DictionaryCache
-        {
-            get { return _wrapper; }
        }

        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type specified that satisfy the predicate
+        /// Clears everything in umbraco's runtime cache, which means that not only
+        /// umbraco content is removed, but also other cache items from pages running in
+        /// the same application / website. Use with care :-)
        /// </summary>
-        public override void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        public override void ClearAllCache()
+        {
+            var cacheEnumerator = _cache.GetEnumerator();
+            while (cacheEnumerator.MoveNext())
+            {
+                _cache.Remove(cacheEnumerator.Key.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache with the given key 
+        /// </summary>
+        /// <param name="key">Key</param>
+        public override void ClearCacheItem(string key)
+        {
+            // NH 10 jan 2012
+            // Patch by the always wonderful Stéphane Gay to avoid cache null refs
+            lock (Locker)
+            {
+                if (_cache[key] == null) return;
+                _cache.Remove(key); ;
+            }
+        }
+
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        public override void ClearCacheObjectTypes(string typeName)
        {
            try
            {
@@ -39,10 +64,8 @@ namespace Umbraco.Core.Cache
                {
                    foreach (DictionaryEntry c in _cache)
                    {
-                        var key = c.Key.ToString();
-                        if (_cache[key] != null
-                            && _cache[key] is T
-                            && predicate(key, (T)_cache[key]))
+                        if (_cache[c.Key.ToString()] != null
+                            && _cache[c.Key.ToString()].GetType().ToString().InvariantEquals(typeName))
                        {
                            _cache.Remove(c.Key.ToString());
                        }
@@ -55,94 +78,279 @@ namespace Umbraco.Core.Cache
            }
        }

+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type specified
+        /// </summary>
+        public override void ClearCacheObjectTypes<T>()
+        {
+            try
+            {
+                lock (Locker)
+                {
+                    foreach (DictionaryEntry c in _cache)
+                    {
+                        if (_cache[c.Key.ToString()] != null
+                            && _cache[c.Key.ToString()].GetType() == typeof(T))
+                        {
+                            _cache.Remove(c.Key.ToString());
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error<CacheHelper>("Cache clearing error", e);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        public override void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            foreach (DictionaryEntry c in _cache)
+            {
+                if (c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith))
+                {
+                    ClearCacheItem((string)c.Key);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        public override void ClearCacheByKeyExpression(string regexString)
+        {
+            foreach (DictionaryEntry c in _cache)
+            {
+                if (c.Key is string && Regex.IsMatch(((string)c.Key), regexString))
+                {
+                    ClearCacheItem((string)c.Key);
+                }
+            }
+        }
+
+        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            return (from DictionaryEntry c in _cache
+                    where c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith)
+                    select c.Value.TryConvertTo<T>()
+                    into attempt
+                    where attempt.Success
+                    select attempt.Result).ToList();
+        }
+
+        /// <summary>
+        /// Returns a cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey)
+        {
+            var result = _cache.Get(cacheKey);
+            if (result == null)
+            {
+                return default(TT);
+            }
+            return result.TryConvertTo<TT>().Result;
+        }
+
        /// <summary>
        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
        /// </summary>
+        /// <typeparam name="TT"></typeparam>
        /// <param name="cacheKey"></param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        public override TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
        {
-            return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
+            return GetCacheItem(cacheKey, CacheItemPriority.Normal, null, null, null, getCacheItem, Locker);
        }

        /// <summary>
-        /// This overload is here for legacy purposes
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
        /// </summary>
+        /// <typeparam name="TT"></typeparam>
        /// <param name="cacheKey"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
-        /// <param name="timeout"></param>
-        /// <param name="isSliding"></param>
-        /// <param name="priority"></param>
-        /// <param name="removedCallback"></param>
-        /// <param name="dependency"></param>
        /// <returns></returns>
-        internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            TimeSpan? timeout, Func<TT> getCacheItem)
        {
-            cacheKey = GetCacheKey(cacheKey);
+            return GetCacheItem(cacheKey, null, timeout, getCacheItem);
+        }

-            using (var lck = new UpgradeableReadLock(Locker))
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
+                                            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
+                                            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, priority, refreshAction, null, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            CacheItemPriority priority,
+                                            CacheItemRemovedCallback refreshAction,
+                                            CacheDependency cacheDependency,
+                                            TimeSpan? timeout,
+                                            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem, Locker);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="syncLock"></param>
+        /// <returns></returns>
+        private TT GetCacheItem<TT>(string cacheKey,
+                                     CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
+                                     CacheDependency cacheDependency, TimeSpan? timeout, Func<TT> getCacheItem, object syncLock)
+        {
+            var result = _cache.Get(cacheKey);
+            if (result == null)
            {
-                var result = DictionaryCache.Get(cacheKey);
-                if (result == null)
+                lock (syncLock)
                {
-                    lck.UpgradeToWriteLock();
-
-                    result = getCacheItem();
-                    if (result != null)
-                    {                        
-                        var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-                        var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
-
-                        _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+                    result = _cache.Get(cacheKey);
+                    if (result == null)
+                    {
+                        result = getCacheItem();
+                        if (result != null)
+                        {
+                            //we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
+                            _cache.Insert(cacheKey, result, cacheDependency,
+                                          timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
+                                          TimeSpan.Zero, priority, refreshAction);
+                        }
                    }
-
                }
-                return result;
            }
-        }
-
-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+            return result.TryConvertTo<TT>().Result;
        }

        /// <summary>
-        /// This overload is here for legacy purposes
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
        /// </summary>
+        /// <typeparam name="T"></typeparam>
        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <param name="timeout"></param>
-        /// <param name="isSliding"></param>
        /// <param name="priority"></param>
-        /// <param name="removedCallback"></param>
-        /// <param name="dependency"></param>
-        internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                Func<T> getCacheItem)
        {
-            var result = getCacheItem();
-            if (result == null) return;
-
-            cacheKey = GetCacheKey(cacheKey);           
-
-            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
-
-            _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+            InsertCacheItem(cacheKey, priority, null, null, null, getCacheItem);
        }

-        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                TimeSpan? timeout,
+                                                Func<T> getCacheItem)
        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
+            InsertCacheItem(cacheKey, priority, null, null, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                CacheDependency cacheDependency,
+                                                TimeSpan? timeout,
+                                                Func<T> getCacheItem)
+        {
+            InsertCacheItem(cacheKey, priority, null, cacheDependency, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                CacheItemRemovedCallback refreshAction,
+                                                CacheDependency cacheDependency,
+                                                TimeSpan? timeout,
+                                                Func<T> getCacheItem)
+        {
+            object result = getCacheItem();
+            if (result != null)
            {
-                dependency = new CacheDependency(dependentFiles);
+                //we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
+                _cache.Insert(cacheKey, result, cacheDependency,
+                              timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
+                              TimeSpan.Zero, priority, refreshAction);
            }
-            InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
        }
+
    }
 }
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a basic cache provider
-    /// </summary>
-    public interface ICacheProvider
-    {
-        void ClearAllCache();
-        void ClearCacheItem(string key);
-        void ClearCacheObjectTypes(string typeName);
-        void ClearCacheObjectTypes<T>();
-        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
-        void ClearCacheByKeySearch(string keyStartsWith);
-        void ClearCacheByKeyExpression(string regexString);
-        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
-        object GetCacheItem(string cacheKey);
-        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
-    }
-}
@@ -1,35 +0,0 @@
-using System;
-using System.Runtime.Caching;
-using System.Text;
-using System.Web.Caching;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a runtime cache provider
-    /// </summary>
-    /// <remarks>
-    /// </remarks>
-    public interface IRuntimeCacheProvider : ICacheProvider
-    {
-        object GetCacheItem(
-            string cacheKey, 
-            Func<object> getCacheItem, 
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-        void InsertCacheItem(
-            string cacheKey,
-            Func<object> getCacheItem,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-    }
-}
@@ -5,62 +5,81 @@ using System.Web.Caching;

 namespace Umbraco.Core.Cache
 {
-    internal class NullCacheProvider : IRuntimeCacheProvider
+    internal class NullCacheProvider : RuntimeCacheProviderBase
    {
-        public virtual void ClearAllCache()
+        public override void ClearAllCache()
        {
        }

-        public virtual void ClearCacheItem(string key)
+        public override void ClearCacheItem(string key)
        {
        }

-        public virtual void ClearCacheObjectTypes(string typeName)
+        public override void ClearCacheObjectTypes(string typeName)
        {
        }

-        public virtual void ClearCacheObjectTypes<T>()
+        public override void ClearCacheObjectTypes<T>()
        {
        }

-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        public override void ClearCacheByKeySearch(string keyStartsWith)
        {
        }

-
-
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        public override void ClearCacheByKeyExpression(string regexString)
        {
        }

-        public virtual void ClearCacheByKeyExpression(string regexString)
+        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
        {
+            return Enumerable.Empty<T>();
        }

-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        public override T GetCacheItem<T>(string cacheKey)
        {
-            return Enumerable.Empty<object>();
+            return default(T);
        }

-        public virtual object GetCacheItem(string cacheKey)
-        {
-            return default(object);
-        }
-
-        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
        {
            return getCacheItem();
        }

-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public override T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem)
        {
            return getCacheItem();
        }

-        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public override T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem)
+        {
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
        {
-            
        }
    }
 }
@@ -1,213 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.Caching;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Web.Caching;
-using Umbraco.Core.Logging;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
-    /// </summary>
-    internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
-    {
-        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-        internal ObjectCache MemoryCache;
-
-        public ObjectCacheRuntimeCacheProvider()
-        {
-            MemoryCache = new MemoryCache("in-memory");
-        }
-
-        public virtual void ClearAllCache()
-        {
-            using (new WriteLock(Locker))
-            {
-                MemoryCache.DisposeIfDisposable();
-                MemoryCache = new MemoryCache("in-memory");
-            }
-        }
-
-        public virtual void ClearCacheItem(string key)
-        {
-            using (new WriteLock(Locker))
-            {
-                if (MemoryCache[key] == null) return;
-                MemoryCache.Remove(key);
-            }            
-        }
-
-        public virtual void ClearCacheObjectTypes(string typeName)
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = MemoryCache
-                    .Where(c => c.Value != null && c.Value.GetType().ToString().InvariantEquals(typeName))
-                    .Select(c => c.Key)
-                    .ToArray();
-                foreach (var k in keysToRemove)
-                    MemoryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            using (new WriteLock(Locker))
-            {
-                var typeOfT = typeof (T);
-                var keysToRemove = MemoryCache
-                    .Where(c => c.Value != null && c.Value.GetType() == typeOfT)
-                    .Select(c => c.Key)
-                    .ToArray();
-                foreach (var k in keysToRemove)
-                    MemoryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            using (new WriteLock(Locker))
-            {
-                var typeOfT = typeof(T);
-                var keysToRemove = MemoryCache
-                    .Where(c => c.Value != null && c.Value.GetType() == typeOfT && predicate(c.Key, (T)c.Value))
-                    .Select(c => c.Key)
-                    .ToArray();
-                foreach (var k in keysToRemove)
-                    MemoryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = (from c in MemoryCache where c.Key.InvariantStartsWith(keyStartsWith) select c.Key).ToList();
-                foreach (var k in keysToRemove)
-                {
-                    MemoryCache.Remove(k);
-                }
-            }            
-        }
-
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = (from c in MemoryCache where Regex.IsMatch(c.Key, regexString) select c.Key).ToList();
-                foreach (var k in keysToRemove)
-                {
-                    MemoryCache.Remove(k);
-                }
-            }     
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            return (from c in MemoryCache
-                    where c.Key.InvariantStartsWith(keyStartsWith)
-                    select c.Value).ToList();
-        }
-
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            var result = MemoryCache.Get(cacheKey);
-            return result;
-        }
-
-        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, getCacheItem, null);
-        }
-
-        public object GetCacheItem(
-            string cacheKey, 
-            Func<object> getCacheItem, 
-            TimeSpan? timeout, 
-            bool isSliding = false, 
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null, 
-            string[] dependentFiles = null)
-        {
-            using (var lck = new UpgradeableReadLock(Locker))
-            {
-                var result = MemoryCache.Get(cacheKey);
-                if (result == null)
-                {
-                    lck.UpgradeToWriteLock();
-
-                    result = getCacheItem();
-                    if (result != null)
-                    {
-                        var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-                        MemoryCache.Set(cacheKey, result, policy);
-                    }
-                }
-                return result;
-            }
-        }
-
-        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            object result = getCacheItem();
-            if (result != null)
-            {
-                var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-                MemoryCache.Set(cacheKey, result, policy);
-            }
-        }
-
-        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            var absolute = isSliding ? ObjectCache.InfiniteAbsoluteExpiration : (timeout == null ? ObjectCache.InfiniteAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-            var sliding = isSliding == false ? ObjectCache.NoSlidingExpiration : (timeout ?? ObjectCache.NoSlidingExpiration);
-
-            var policy = new CacheItemPolicy
-            {
-                AbsoluteExpiration = absolute,
-                SlidingExpiration = sliding
-            };
-
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
-            }
-            
-            if (removedCallback != null)
-            {
-                policy.RemovedCallback = arguments =>
-                {
-                    //convert the reason
-                    var reason = CacheItemRemovedReason.Removed;
-                    switch (arguments.RemovedReason)
-                    {
-                        case CacheEntryRemovedReason.Removed:
-                            reason = CacheItemRemovedReason.Removed;
-                            break;
-                        case CacheEntryRemovedReason.Expired:
-                            reason = CacheItemRemovedReason.Expired;
-                            break;
-                        case CacheEntryRemovedReason.Evicted:
-                            reason = CacheItemRemovedReason.Underused;
-                            break;
-                        case CacheEntryRemovedReason.ChangeMonitorChanged:
-                            reason = CacheItemRemovedReason.Expired;
-                            break;
-                        case CacheEntryRemovedReason.CacheSpecificEviction:
-                            reason = CacheItemRemovedReason.Underused;
-                            break;
-                    }
-                    //call the callback
-                    removedCallback(arguments.CacheItem.Key, arguments.CacheItem.Value, reason);
-                };
-            }
-            return policy;
-        }
-        
-    }
-}
@@ -0,0 +1,24 @@
+using System;
+using System.Text;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a runtime cache provider
+    /// </summary>
+    /// <remarks>
+    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, REQUEST CACHE, ETC...
+    /// </remarks>
+    internal abstract class RuntimeCacheProviderBase : CacheProviderBase
+    {
+        public abstract T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
+    }
+}
@@ -10,64 +10,92 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// A cache provider that statically caches everything in an in memory dictionary
    /// </summary>
-    internal class StaticCacheProvider : ICacheProvider
+    internal class StaticCacheProvider : CacheProviderBase
    {
-        internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
+        private readonly ConcurrentDictionary<string, object> _staticCache = new ConcurrentDictionary<string, object>();

-        public virtual void ClearAllCache()
+        public override void ClearAllCache()
        {
-            StaticCache.Clear();
+            _staticCache.Clear();
        }

-        public virtual void ClearCacheItem(string key)
+        public override void ClearCacheItem(string key)
        {
            object val;
-            StaticCache.TryRemove(key, out val);
+            _staticCache.TryRemove(key, out val);
        }

-        public virtual void ClearCacheObjectTypes(string typeName)
+        public override void ClearCacheObjectTypes(string typeName)
        {
-            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
+            foreach (var key in _staticCache.Keys)
+            {
+                if (_staticCache[key] != null
+                    && _staticCache[key].GetType().ToString().InvariantEquals(typeName))
+                {
+                    object val;
+                    _staticCache.TryRemove(key, out val);
+                }
+            }
        }

-        public virtual void ClearCacheObjectTypes<T>()
+        public override void ClearCacheObjectTypes<T>()
        {
-            var typeOfT = typeof(T);
-            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
+            foreach (var key in _staticCache.Keys)
+            {
+                if (_staticCache[key] != null
+                    && _staticCache[key].GetType() == typeof(T))
+                {
+                    object val;
+                    _staticCache.TryRemove(key, out val);
+                }
+            }
        }

-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        public override void ClearCacheByKeySearch(string keyStartsWith)
        {
-            var typeOfT = typeof(T);
-            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
+            foreach (var key in _staticCache.Keys)
+            {
+                if (key.InvariantStartsWith(keyStartsWith))
+                {
+                    ClearCacheItem(key);
+                }
+            }
        }

-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        public override void ClearCacheByKeyExpression(string regexString)
        {
-            StaticCache.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
+            foreach (var key in _staticCache.Keys)
+            {
+                if (Regex.IsMatch(key, regexString))
+                {
+                    ClearCacheItem(key);
+                }
+            }
        }

-        public virtual void ClearCacheByKeyExpression(string regexString)
+        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
        {
-            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString)); 
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            return (from KeyValuePair<string, object> c in StaticCache
+            return (from KeyValuePair<string, object> c in _staticCache
                    where c.Key.InvariantStartsWith(keyStartsWith)
-                    select c.Value).ToList();
+                    select c.Value.TryConvertTo<T>()
+                    into attempt
+                    where attempt.Success
+                    select attempt.Result).ToList();
        }

-        public virtual object GetCacheItem(string cacheKey)
+        public override T GetCacheItem<T>(string cacheKey)
        {
-            var result = StaticCache[cacheKey];
-            return result;
+            var result = _staticCache[cacheKey];
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
        }

-        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
        {
-            return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
+            return (T)_staticCache.GetOrAdd(cacheKey, getCacheItem);
        }
        
    }
@@ -18,132 +18,189 @@ namespace Umbraco.Core
    public class CacheHelper
 	{
 	    private readonly bool _enableCache;
-	    private readonly ICacheProvider _requestCache;
-        private readonly ICacheProvider _nullRequestCache = new NullCacheProvider();
-        private readonly ICacheProvider _staticCache;
-        private readonly ICacheProvider _nullStaticCache = new NullCacheProvider();
-        private readonly IRuntimeCacheProvider _httpCache;
-        private readonly IRuntimeCacheProvider _nullHttpCache = new NullCacheProvider();
+        private readonly CacheProviderBase _staticCache;
+        private readonly CacheProviderBase _nullStaticCache = new NullCacheProvider();
+        private readonly RuntimeCacheProviderBase _httpCache;
+        private readonly RuntimeCacheProviderBase _nullHttpCache = new NullCacheProvider();

-        /// <summary>
-        /// Creates a cache helper with disabled caches
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Good for unit testing
-        /// </remarks>
-        internal static CacheHelper CreateDisabledCacheHelper()
+		public CacheHelper(System.Web.Caching.Cache cache)
+            : this(cache, true)
+		{
+		}
+
+	    internal CacheHelper(System.Web.Caching.Cache cache, bool enableCache)
+            : this(new HttpRuntimeCacheProvider(cache), enableCache)
+	    {            
+	    }
+
+        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, bool enableCache)
+            : this(httpCacheProvider, new StaticCacheProvider(), enableCache)
        {
-            return new CacheHelper(null, null, null, false);
        }

-	    /// <summary>
-	    /// Initializes a new instance for use in the web
-	    /// </summary>
-	    public CacheHelper()
-	        : this(
-	            new HttpRuntimeCacheProvider(HttpRuntime.Cache),
-	            new StaticCacheProvider(),
-	            new HttpRequestCacheProvider(() => new HttpContextWrapper(HttpContext.Current)))
-	    {
-	    }
-
-	    /// <summary>
-	    /// Initializes a new instance for use in the web
-	    /// </summary>
-	    /// <param name="cache"></param>
-	    public CacheHelper(System.Web.Caching.Cache cache)
-	        : this(
-	            new HttpRuntimeCacheProvider(cache),
-	            new StaticCacheProvider(),
-	            new HttpRequestCacheProvider(() => new HttpContextWrapper(HttpContext.Current)))
-	    {
-	    }
-
-	    /// <summary>
-        /// Initializes a new instance based on the provided providers
-        /// </summary>
-        /// <param name="httpCacheProvider"></param>
-        /// <param name="staticCacheProvider"></param>
-        /// <param name="requestCacheProvider"></param>
-        public CacheHelper(
-            IRuntimeCacheProvider httpCacheProvider, 
-            ICacheProvider staticCacheProvider, 
-            ICacheProvider requestCacheProvider)
-            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, true)
-        {            
-        }
-
-	    internal void ClearStaticCacheObjectTypes<T>(Func<string, T, bool> predicate)
-	    {
-	        if (_enableCache)
-                _staticCache.ClearCacheObjectTypes(predicate);
-            else
-                _nullStaticCache.ClearCacheObjectTypes(predicate);
-	    }
-
-        /// <summary>
-        /// Private ctor used for creating a disabled cache helper
-        /// </summary>
-        /// <param name="httpCacheProvider"></param>
-        /// <param name="staticCacheProvider"></param>
-        /// <param name="requestCacheProvider"></param>
-        /// <param name="enableCache"></param>
-        private CacheHelper(
-            IRuntimeCacheProvider httpCacheProvider,
-            ICacheProvider staticCacheProvider,
-            ICacheProvider requestCacheProvider, 
-            bool enableCache)
+        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, CacheProviderBase staticCacheProvider, bool enableCache)
        {
-            if (enableCache)
-            {
-                _httpCache = httpCacheProvider;
-                _staticCache = staticCacheProvider;
-                _requestCache = requestCacheProvider;
-            }
-            else
-            {
-                _httpCache = null;
-                _staticCache = null;
-                _requestCache = null;
-            }
-
+            _httpCache = httpCacheProvider;
+            _staticCache = staticCacheProvider;
            _enableCache = enableCache;
        }

+        #region Static cache
+
        /// <summary>
-        /// Returns the current Request cache
+        /// Clears the item in umbraco's static cache
        /// </summary>
-        public ICacheProvider RequestCache
+        internal void ClearAllStaticCache()
        {
-            get { return _enableCache ? _requestCache : _nullRequestCache; }
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearAllCache();
+            }
+            else
+            {
+                _staticCache.ClearAllCache();
+            }
        }

        /// <summary>
-        /// Returns the current Runtime cache
+        /// Clears the item in umbraco's static cache with the given key 
        /// </summary>
-        public ICacheProvider StaticCache
+        /// <param name="key">Key</param>
+        internal void ClearStaticCacheItem(string key)
        {
-            get { return _enableCache ? _staticCache : _nullStaticCache; }
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheItem(key);
+            }
+            else
+            {
+                _staticCache.ClearCacheItem(key);
+            }
        }

        /// <summary>
-        /// Returns the current Runtime cache
+        /// Clears all objects in the static cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
        /// </summary>
-	    public IRuntimeCacheProvider RuntimeCache
-	    {
-	        get { return _enableCache ? _httpCache : _nullHttpCache; }
-	    }
-        
-	    #region Legacy Runtime/Http Cache accessors
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        internal void ClearStaticCacheObjectTypes(string typeName)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheObjectTypes(typeName);
+            }
+            else
+            {
+                _staticCache.ClearCacheObjectTypes(typeName);
+            }
+        }

+        /// <summary>
+        /// Clears all objects in the static cache with the System.Type specified
+        /// </summary>
+        internal void ClearStaticCacheObjectTypes<T>()
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheObjectTypes<T>();
+            }
+            else
+            {
+                _staticCache.ClearCacheObjectTypes<T>();
+            }
+        }
+
+        /// <summary>
+        /// Clears all static cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        internal void ClearStaticCacheByKeySearch(string keyStartsWith)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheByKeySearch(keyStartsWith);
+            }
+            else
+            {
+                _staticCache.ClearCacheByKeySearch(keyStartsWith);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        internal void ClearStaticCacheByKeyExpression(string regexString)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheByKeyExpression(regexString);
+            }
+            else
+            {
+                _staticCache.ClearCacheByKeyExpression(regexString);
+            }
+        }
+
+        internal IEnumerable<T> GetStaticCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            if (!_enableCache)
+            {
+                return _nullStaticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+            }
+            else
+            {
+                return _staticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+            }
+        }
+
+        /// <summary>
+        /// Returns a static cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        internal TT GetStaticCacheItem<TT>(string cacheKey)
+        {
+            if (!_enableCache)
+            {
+                return _nullStaticCache.GetCacheItem<TT>(cacheKey);
+            }
+            else
+            {
+                return _staticCache.GetCacheItem<TT>(cacheKey);
+            }
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the static cache with all of the default parameters
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        internal TT GetStaticCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                return _nullStaticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+            }
+            else
+            {
+                return _staticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+            }
+        }
+
+        #endregion
+
+
+	    #region Runtime/Http Cache
        /// <summary>
        /// Clears the item in umbraco's runtime cache
        /// </summary>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearAllCache()
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                _nullHttpCache.ClearAllCache();
            }
@@ -157,10 +214,9 @@ namespace Umbraco.Core
        /// Clears the item in umbraco's runtime cache with the given key 
        /// </summary>
        /// <param name="key">Key</param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheItem(string key)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                _nullHttpCache.ClearCacheItem(key);
            }
@@ -176,10 +232,9 @@ namespace Umbraco.Core
        /// input parameter. (using [object].GetType())
        /// </summary>
        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheObjectTypes(string typeName)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                _nullHttpCache.ClearCacheObjectTypes(typeName);
            }
@@ -192,10 +247,9 @@ namespace Umbraco.Core
        /// <summary>
        /// Clears all objects in the System.Web.Cache with the System.Type specified
        /// </summary>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheObjectTypes<T>()
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                _nullHttpCache.ClearCacheObjectTypes<T>();
            }
@@ -209,10 +263,9 @@ namespace Umbraco.Core
        /// Clears all cache items that starts with the key passed.
        /// </summary>
        /// <param name="keyStartsWith">The start of the key</param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheByKeySearch(string keyStartsWith)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                _nullHttpCache.ClearCacheByKeySearch(keyStartsWith);
            }
@@ -226,10 +279,9 @@ namespace Umbraco.Core
        /// Clears all cache items that have a key that matches the regular expression
        /// </summary>
        /// <param name="regexString"></param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheByKeyExpression(string regexString)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                _nullHttpCache.ClearCacheByKeyExpression(regexString);
            }
@@ -239,10 +291,9 @@ namespace Umbraco.Core
            }
        }

-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                return _nullHttpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
            }
@@ -258,10 +309,9 @@ namespace Umbraco.Core
        /// <typeparam name="TT"></typeparam>
        /// <param name="cacheKey"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                return _nullHttpCache.GetCacheItem<TT>(cacheKey);
            }
@@ -278,10 +328,9 @@ namespace Umbraco.Core
        /// <param name="cacheKey"></param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
            }
@@ -299,17 +348,16 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey,
            TimeSpan timeout, Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
+                return _httpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
            }
        }

@@ -322,18 +370,17 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
+                return _httpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
            }
        }

@@ -347,18 +394,17 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
+                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
            }
        }

@@ -373,7 +419,6 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority,
            CacheItemRemovedCallback refreshAction,
@@ -381,19 +426,13 @@ namespace Umbraco.Core
            TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
            }
            else
            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
-                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
            }
        }

@@ -406,7 +445,6 @@ namespace Umbraco.Core
        /// <param name="cacheDependency"></param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority,
            CacheDependency cacheDependency,
@@ -414,17 +452,11 @@ namespace Umbraco.Core
        {
            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, null, false, priority, null, null);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
            }
            else
            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
-                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                return _httpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
            }
        }

@@ -439,13 +471,13 @@ namespace Umbraco.Core
                                       CacheItemPriority priority,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
            }
            else
            {
-                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
            }
        }

@@ -462,13 +494,13 @@ namespace Umbraco.Core
                                       TimeSpan timeout,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
            }
            else
            {
-                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
            }
        }

@@ -481,25 +513,19 @@ namespace Umbraco.Core
        /// <param name="cacheDependency"></param>
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public void InsertCacheItem<T>(string cacheKey,
                                       CacheItemPriority priority,
                                       CacheDependency cacheDependency,
                                       TimeSpan timeout,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority, dependentFiles:null);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
            }
            else
            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
            }
        }

@@ -513,7 +539,6 @@ namespace Umbraco.Core
        /// <param name="cacheDependency"></param>
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public void InsertCacheItem<T>(string cacheKey,
                                       CacheItemPriority priority,
                                       CacheItemRemovedCallback refreshAction,
@@ -521,18 +546,13 @@ namespace Umbraco.Core
                                       TimeSpan? timeout,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
+            if (!_enableCache)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
            }
            else
            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
            }
        } 
        #endregion
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IBaseRestSection
-    {
-        IExtensionsCollection Items { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether base rest extensions are enabled.
-        /// </summary>
-        bool Enabled { get; }
-    }
-}
@@ -1,11 +0,0 @@
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IExtension
-    {
-        string Alias { get; }
-
-        string Type { get; }
-
-        IMethodSection this[string index] { get; }
-    }
-}
@@ -1,17 +0,0 @@
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IMethodSection
-    {
-        string Name { get; }
-
-        bool AllowAll { get; }
-
-        string AllowGroup { get; }
-
-        string AllowType { get; }
-
-        string AllowMember { get; }
-
-        bool ReturnXml { get; }
-    }
-}
@@ -1,70 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Defines a configuration section that contains inner text that is comma delimited
-    /// </summary>
-    internal class CommaDelimitedConfigurationElement : InnerTextConfigurationElement<CommaDelimitedStringCollection>, IEnumerable<string>
-    {
-        public override CommaDelimitedStringCollection Value
-        {
-            get 
-            { 
-                var converter = new CommaDelimitedStringCollectionConverter();
-                return (CommaDelimitedStringCollection) converter.ConvertFrom(RawValue);
-            }
-        }
-
-        IEnumerator<string> IEnumerable<string>.GetEnumerator()
-        {
-            return new InnerEnumerator(Value.GetEnumerator());
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return new InnerEnumerator(Value.GetEnumerator());
-        }
-
-        /// <summary>
-        /// A wrapper for StringEnumerator since it doesn't explicitly implement IEnumerable
-        /// </summary>
-        private class InnerEnumerator : IEnumerator<string>
-        {
-            private readonly StringEnumerator _stringEnumerator;
-
-            public InnerEnumerator(StringEnumerator stringEnumerator)
-            {
-                _stringEnumerator = stringEnumerator;
-            }
-
-            public bool MoveNext()
-            {
-                return _stringEnumerator.MoveNext();
-            }
-
-            public void Reset()
-            {
-                _stringEnumerator.Reset();
-            }
-
-            string IEnumerator<string>.Current
-            {
-                get { return _stringEnumerator.Current; }
-            }
-
-            public object Current
-            {
-                get { return _stringEnumerator.Current; }
-            }
-
-            public void Dispose()
-            {
-                UmbracoSettings.ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
-            }
-        }
-    }
-}
@@ -8,6 +8,7 @@ namespace Umbraco.Core.Configuration
 {
    public class FileSystemProvidersSection : ConfigurationSection
    {
+        private const string PROVIDERS_KEY = "providers";

        [ConfigurationProperty("", IsDefaultCollection = true, IsRequired = true)]
        public FileSystemProviderElementCollection Providers
@@ -4,7 +4,6 @@ using System.Configuration;
 using System.Linq;
 using System.Web;
 using System.Web.Configuration;
-using System.Web.Hosting;
 using System.Web.Routing;
 using System.Xml;
 using System.Xml.Linq;
@@ -116,16 +115,13 @@ namespace Umbraco.Core.Configuration
        /// Gets the name of the content XML file.
        /// </summary>
        /// <value>The content XML.</value>
-        /// <remarks>
-        /// Defaults to ~/App_Data/umbraco.config
-        /// </remarks>
        public static string ContentXmlFile
        {
            get
            {
                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXML")
                    ? ConfigurationManager.AppSettings["umbracoContentXML"]
-                    : "~/App_Data/umbraco.config";
+                    : string.Empty;
            }
        }

@@ -139,7 +135,7 @@ namespace Umbraco.Core.Configuration
            {
                return ConfigurationManager.AppSettings.ContainsKey("umbracoStorageDirectory")
                    ? ConfigurationManager.AppSettings["umbracoStorageDirectory"]
-                    : "~/App_Data";
+                    : string.Empty;
            }
        }

@@ -201,7 +197,7 @@ namespace Umbraco.Core.Configuration
        /// Gets the database connection string
        /// </summary>
        /// <value>The database connection string.</value>
-        [Obsolete("Use System.Configuration.ConfigurationManager.ConnectionStrings[\"umbracoDbDSN\"] instead")]
+        [Obsolete("Use System.ConfigurationManager.ConnectionStrings to get the connection with the key Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName instead")]
        public static string DbDsn
        {
            get
@@ -213,7 +209,7 @@ namespace Umbraco.Core.Configuration
                {
                    connectionString = settings.ConnectionString;

-                    // The SqlCe connectionString is formatted slightly differently, so we need to update it
+                    // The SqlCe connectionString is formatted slightly differently, so we need to updat it
                    if (settings.ProviderName.Contains("SqlServerCe"))
                        connectionString = string.Format("datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;{0}", connectionString);
                }
@@ -335,13 +331,7 @@ namespace Umbraco.Core.Configuration
            {
                try
                {
-                    if (HttpContext.Current != null)
-                    {
-                        return HttpContext.Current.IsDebuggingEnabled;
-                    }
-                    //go and get it from config directly
-                    var section = ConfigurationManager.GetSection("system.web/compilation") as CompilationSection;
-                    return section != null && section.Debug;
+                    return bool.Parse(ConfigurationManager.AppSettings["umbracoDebugMode"]);
                }
                catch
                {
@@ -440,24 +430,13 @@ namespace Umbraco.Core.Configuration
        /// Returns a string value to determine if umbraco should disbable xslt extensions
        /// </summary>
        /// <value><c>"true"</c> if version xslt extensions are disabled, otherwise, <c>"false"</c></value>
-        [Obsolete("This is no longer used and will be removed from the codebase in future releases")]
        public static string DisableXsltExtensions
        {
            get
            {
                return ConfigurationManager.AppSettings.ContainsKey("umbracoDisableXsltExtensions")
                    ? ConfigurationManager.AppSettings["umbracoDisableXsltExtensions"]
-                    : "false";
-            }
-        }
-
-        internal static bool ContentCacheXmlStoredInCodeGen
-        {
-            get
-            {
-                //defaults to false
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp") 
-                    && bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]); //default to false
+                    : string.Empty;
            }
        }

@@ -465,10 +444,14 @@ namespace Umbraco.Core.Configuration
        /// Returns a string value to determine if umbraco should use Xhtml editing mode in the wysiwyg editor
        /// </summary>
        /// <value><c>"true"</c> if Xhtml mode is enable, otherwise, <c>"false"</c></value>
-        [Obsolete("This is no longer used and will be removed from the codebase in future releases")]
        public static string EditXhtmlMode
        {
-            get { return "true"; }
+            get
+            {
+                return ConfigurationManager.AppSettings.ContainsKey("umbracoEditXhtmlMode")
+                    ? ConfigurationManager.AppSettings["umbracoEditXhtmlMode"]
+                    : string.Empty;
+            }
        }

        /// <summary>
@@ -493,10 +476,9 @@ namespace Umbraco.Core.Configuration
        {
            get
            {
-                //the default will be 'profiler'
                return ConfigurationManager.AppSettings.ContainsKey("umbracoProfileUrl")
                    ? ConfigurationManager.AppSettings["umbracoProfileUrl"]
-                    : "profiler";
+                    : string.Empty;
            }
        }

@@ -597,11 +579,21 @@ namespace Umbraco.Core.Configuration
            return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1;
        }

+        public static bool RequestIsLiveEditRedirector(HttpContext context)
+        {
+            return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1;
+        }
+
        public static bool RequestIsInUmbracoApplication(HttpContextBase context)
        {
            return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1;
        }

+        public static bool RequestIsLiveEditRedirector(HttpContextBase context)
+        {
+            return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1;
+        }
+
        /// <summary>
        /// Gets a value indicating whether umbraco should force a secure (https) connection to the backoffice.
        /// </summary>
@@ -1,69 +0,0 @@
-using System;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A full config section is required for any full element and we have some elements that are defined like this:
-    /// {element}MyValue{/element} instead of as attribute values.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
-    {
-        public InnerTextConfigurationElement()
-        {
-        }
-
-        public InnerTextConfigurationElement(XElement rawXml) : base(rawXml)
-        {
-        }
-
-        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
-        {
-            base.DeserializeElement(reader, serializeCollectionKey);
-            //now validate and set the raw value
-            if (RawXml.HasElements)
-                throw new InvalidOperationException("An InnerTextConfigurationElement cannot contain any child elements, only attributes and a value");
-            RawValue = RawXml.Value;
-            
-            //RawValue = reader.ReadElementContentAsString();
-        }
-
-        public virtual T Value
-        {
-            get
-            {
-                var converted = UmbracoSettings.ObjectExtensions.TryConvertTo<T>(RawValue);
-                if (converted.Success == false)
-                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
-                return converted.Result;
-            }
-        }
-
-        /// <summary>
-        /// Exposes the raw string value
-        /// </summary>
-        internal string RawValue { get; set; }
-
-        /// <summary>
-        /// Implicit operator so we don't need to use the 'Value' property explicitly
-        /// </summary>
-        /// <param name="m"></param>
-        /// <returns></returns>
-        public static implicit operator T(InnerTextConfigurationElement<T> m)
-        {
-            return m.Value;
-        }
-
-        /// <summary>
-        /// Return the string value of Value
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.Format("{0}", Value);
-        }
-
-    }
-}
@@ -1,43 +0,0 @@
-using System.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Used for specifying default values for comma delimited config
-    /// </summary>
-    internal class OptionalCommaDelimitedConfigurationElement : CommaDelimitedConfigurationElement
-    {
-        private readonly CommaDelimitedConfigurationElement _wrapped;
-        private readonly string[] _defaultValue;
-
-        public OptionalCommaDelimitedConfigurationElement()
-        {            
-        }
-
-        public OptionalCommaDelimitedConfigurationElement(CommaDelimitedConfigurationElement wrapped, string[] defaultValue)
-        {
-            _wrapped = wrapped;
-            _defaultValue = defaultValue;
-        }
-
-        public override CommaDelimitedStringCollection Value
-        {
-            get
-            {
-                if (_wrapped == null)
-                {
-                    return base.Value;
-                }
-
-                if (string.IsNullOrEmpty(_wrapped.RawValue))
-                {
-                    var val = new CommaDelimitedStringCollection();
-                    val.AddRange(_defaultValue);
-                    return val;
-                }
-                return _wrapped.Value;
-            }
-        }
-    }
-}
@@ -1,23 +0,0 @@
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// This is used to supply optional/default values when using InnerTextConfigurationElement
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class OptionalInnerTextConfigurationElement<T> : InnerTextConfigurationElement<T>
-    {
-        private readonly InnerTextConfigurationElement<T> _wrapped;
-        private readonly T _defaultValue;
-
-        public OptionalInnerTextConfigurationElement(InnerTextConfigurationElement<T> wrapped, T defaultValue)
-        {
-            _wrapped = wrapped;
-            _defaultValue = defaultValue;
-        }
-
-        public override T Value
-        {
-            get { return string.IsNullOrEmpty(_wrapped.RawValue) ? _defaultValue : _wrapped.Value; }
-        }
-    }
-}
@@ -1,30 +0,0 @@
-using System.Configuration;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A configuration section that simply exposes the entire raw xml of the section itself which inheritors can use
-    /// to do with as they please.
-    /// </summary>
-    internal abstract class RawXmlConfigurationElement : ConfigurationElement
-    {
-        protected RawXmlConfigurationElement()
-        {
-            
-        }
-
-        protected RawXmlConfigurationElement(XElement rawXml)
-        {
-            RawXml = rawXml;
-        }
-
-        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
-        {
-            RawXml = (XElement)XNode.ReadFrom(reader);
-        }
-
-        protected XElement RawXml { get; private set; }
-    }
-}
@@ -10,7 +10,6 @@ namespace Umbraco.Core.Configuration

    internal class RazorDataTypeModelStaticMappingItem
    {
-        [Obsolete("This is not used whatsoever")]
 		public string Raw { get; set; }
        //if all of the set (non null) properties match the property data currently being evaluated
 		public string PropertyTypeAlias { get; set; }
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Threading;
-using Umbraco.Core.Configuration.BaseRest;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// The gateway to all umbraco configuration
-    /// </summary>
-    public class UmbracoConfig
-    {
-        #region Singleton
-
-        private static readonly Lazy<UmbracoConfig> Lazy = new Lazy<UmbracoConfig>(() => new UmbracoConfig());
-
-        public static UmbracoConfig For
-        {
-            get { return Lazy.Value; }            
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Default constructor 
-        /// </summary>
-        private UmbracoConfig()
-        {
-            if (UmbracoSettings() == null)
-            {
-                var umbracoSettings = ConfigurationManager.GetSection("umbracoConfiguration/settings") as IUmbracoSettingsSection;
-                if (umbracoSettings == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IUmbracoSettingsSection) + " from config file!");
-                }
-                SetUmbracoSettings(umbracoSettings);
-            }
-
-            if (BaseRestExtensions() == null)
-            {
-                var baseRestExtensions = ConfigurationManager.GetSection("umbracoConfiguration/BaseRestExtensions") as IBaseRestSection;
-                if (baseRestExtensions == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IBaseRestSection) + " from config file!");
-                }
-                SetBaseRestExtensions(baseRestExtensions);
-            }
-        }
-
-        /// <summary>
-        /// Constructor - can be used for testing
-        /// </summary>
-        /// <param name="umbracoSettings"></param>
-        /// <param name="baseRestSettings"></param>
-        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings)
-        {
-            SetUmbracoSettings(umbracoSettings);
-            SetBaseRestExtensions(baseRestSettings);
-        }
-
-        private IUmbracoSettingsSection _umbracoSettings;
-
-        //ONLY for unit testing
-        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
-        {
-            _umbracoSettings = value;
-        }
-
-        /// <summary>
-        /// Gets the IUmbracoSettings
-        /// </summary>
-        public IUmbracoSettingsSection UmbracoSettings()
-        {
-            return _umbracoSettings;
-        }
-
-        private IBaseRestSection _baseRestExtensions;
-
-        //ONLY for unit testing
-        public void SetBaseRestExtensions(IBaseRestSection value)
-        {
-            _baseRestExtensions = value;
-        }
-
-        /// <summary>
-        /// Gets the IBaseRestSection
-        /// </summary>
-        public IBaseRestSection BaseRestExtensions()
-        {
-            return _baseRestExtensions;
-        }
-
-        //TODO: Add other configurations here !
-    }
-}
@@ -2,13 +2,8 @@

 namespace Umbraco.Core.Configuration
 {
-    /// <summary>
-    /// Represents an Umbraco configuration section which can be used to pass to UmbracoConfiguration.For{T}
-    /// </summary>
-    public interface IUmbracoConfigurationSection
-    {
-        
-    }
+    // note - still must work on how to support read-only and ResetSection for collections
+    // note - still must work on how to spread config over files (aka DeepConfig in v5)

    /// <summary>
    /// Represents an Umbraco section within the configuration file.
@@ -21,12 +16,18 @@ namespace Umbraco.Core.Configuration
    /// <para>The <c>UmbracoSettings.For{T}</c> method will return a section, either one that
    /// is in the configuration file, or a section that was created with default values.</para>
    /// </remarks>
-    public abstract class UmbracoConfigurationSection : ConfigurationSection, IUmbracoConfigurationSection
+    public abstract class UmbracoConfigurationSection : ConfigurationSection
    {
        /// <summary>
        /// Gets a value indicating whether the section actually is in the configuration file.
        /// </summary>
        protected bool IsPresent { get { return ElementInformation.IsPresent; } }

+        /// <summary>
+        /// Resets settings that were set programmatically, to their initial values.
+        /// </summary>
+        /// <remarks>>To be used in unit tests.</remarks>
+        internal protected virtual void ResetSection()
+        { }
    }
 }
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class AppCodeFileExtensionsCollection : ConfigurationElementCollection, IEnumerable<IFileExtension>
-    {
-        internal void Add(FileExtensionElement element)
-        {
-            base.BaseAdd(element);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new FileExtensionElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((FileExtensionElement)element).Value;
-        }
-
-        IEnumerator<IFileExtension> IEnumerable<IFileExtension>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IFileExtension;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class AppCodeFileExtensionsElement : ConfigurationElement
-    {
-        [ConfigurationCollection(typeof(AppCodeFileExtensionsCollection), AddItemName = "ext")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        internal AppCodeFileExtensionsCollection AppCodeFileExtensionsCollection
-        {
-            get { return (AppCodeFileExtensionsCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-    }
-}
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class CharCollection : ConfigurationElementCollection, IEnumerable<IChar>
-    {
-        internal void Add(CharElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new CharElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((CharElement)element).Char;
-        }
-
-        IEnumerator<IChar> IEnumerable<IChar>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IChar;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
@@ -1,32 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class CharElement : InnerTextConfigurationElement<string>, IChar
-    {
-        private string _char;
-        private string _replacement;
-
-        internal string Char
-        {
-            get { return _char ?? (_char = (string)RawXml.Attribute("org")); }
-            set { _char = value; }
-        }
-
-        internal string Replacement
-        {
-            get { return _replacement ?? (_replacement = Value); }
-            set { _replacement = value; }
-        }
-
-        string IChar.Char
-        {
-            get { return Char; }
-            
-        }
-
-        string IChar.Replacement
-        {
-            get { return Replacement; }
-            
-        }
-    }
-}
@@ -1,421 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    [ConfigurationKey("umbracoConfiguration/settings/content")]
-    internal class ContentElement : ConfigurationElement, IContentSection
-    {
-        [ConfigurationProperty("imaging")]
-        internal ContentImagingElement Imaging
-        {
-            get { return (ContentImagingElement)this["imaging"]; }
-        }
-
-        [ConfigurationProperty("scripteditor")]
-        internal ContentScriptEditorElement ScriptEditor
-        {
-            get { return (ContentScriptEditorElement)this["scripteditor"]; }
-        }
-
-        [ConfigurationProperty("ResolveUrlsFromTextString")]
-        internal InnerTextConfigurationElement<bool> ResolveUrlsFromTextString
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                       (InnerTextConfigurationElement<bool>)this["ResolveUrlsFromTextString"],
-                        //set the default
-                       true);
-            }
-        }
-
-        [ConfigurationProperty("UploadAllowDirectories")]
-        internal InnerTextConfigurationElement<bool> UploadAllowDirectories
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                       (InnerTextConfigurationElement<bool>)this["UploadAllowDirectories"],
-                    //set the default
-                       true);
-            }
-        }
-
-        public IEnumerable<IContentErrorPage> Error404Collection
-        {
-            get { return Errors.Error404Collection; }
-        }
-
-        [ConfigurationProperty("errors", IsRequired = true)]
-        internal ContentErrorsElement Errors
-        {
-            get { return (ContentErrorsElement) base["errors"]; }
-        }
-
-        [ConfigurationProperty("notifications", IsRequired = true)]
-        internal NotificationsElement Notifications
-        {
-            get { return (NotificationsElement)base["notifications"]; }
-        }
-
-        [ConfigurationProperty("ensureUniqueNaming")]
-        internal InnerTextConfigurationElement<bool> EnsureUniqueNaming
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                      (InnerTextConfigurationElement<bool>)this["ensureUniqueNaming"],
-                    //set the default
-                      true);
-            }
-        }
-
-        [ConfigurationProperty("TidyEditorContent")]
-        internal InnerTextConfigurationElement<bool> TidyEditorContent
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                      (InnerTextConfigurationElement<bool>)this["TidyEditorContent"],
-                    //set the default
-                      false);
-            }
-        }
-
-        [ConfigurationProperty("TidyCharEncoding")]
-        internal InnerTextConfigurationElement<string> TidyCharEncoding
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                          (InnerTextConfigurationElement<string>)this["TidyCharEncoding"],
-                            //set the default
-                          "UTF8");
-            }
-        }
-
-        [ConfigurationProperty("XmlCacheEnabled")]
-        internal InnerTextConfigurationElement<bool> XmlCacheEnabled
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                          (InnerTextConfigurationElement<bool>)this["XmlCacheEnabled"],
-                    //set the default
-                          true);
-            }
-        }
-
-        [ConfigurationProperty("ContinouslyUpdateXmlDiskCache")]
-        internal InnerTextConfigurationElement<bool> ContinouslyUpdateXmlDiskCache
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                          (InnerTextConfigurationElement<bool>)this["ContinouslyUpdateXmlDiskCache"],
-                    //set the default
-                          true);                
-            }
-        }
-
-        [ConfigurationProperty("XmlContentCheckForDiskChanges")]
-        internal InnerTextConfigurationElement<bool> XmlContentCheckForDiskChanges
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                          (InnerTextConfigurationElement<bool>)this["XmlContentCheckForDiskChanges"],
-                    //set the default
-                          false); 
-            }
-        }
-
-        [ConfigurationProperty("EnableSplashWhileLoading")]
-        internal InnerTextConfigurationElement<bool> EnableSplashWhileLoading
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                          (InnerTextConfigurationElement<bool>)this["EnableSplashWhileLoading"],
-                    //set the default
-                          false); 
-            }
-        }
-
-        [ConfigurationProperty("PropertyContextHelpOption")]
-        internal InnerTextConfigurationElement<string> PropertyContextHelpOption
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                          (InnerTextConfigurationElement<string>)this["PropertyContextHelpOption"],
-                    //set the default
-                          "text"); 
-            }
-        }
-
-        [ConfigurationProperty("UseLegacyXmlSchema")]
-        internal InnerTextConfigurationElement<bool> UseLegacyXmlSchema
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                          (InnerTextConfigurationElement<bool>)this["UseLegacyXmlSchema"],
-                    //set the default
-                          false); 
-            }
-        }
-        
-        [ConfigurationProperty("ForceSafeAliases")]
-        internal InnerTextConfigurationElement<bool> ForceSafeAliases
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                          (InnerTextConfigurationElement<bool>)this["ForceSafeAliases"],
-                    //set the default
-                          true); 
-            }
-        }
-
-        [ConfigurationProperty("PreviewBadge")]
-        internal InnerTextConfigurationElement<string> PreviewBadge
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                          (InnerTextConfigurationElement<string>)this["PreviewBadge"],
-                    //set the default
-                          @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>"); 
-            }
-        }
-
-        [ConfigurationProperty("UmbracoLibraryCacheDuration")]
-        internal InnerTextConfigurationElement<int> UmbracoLibraryCacheDuration
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<int>(
-                          (InnerTextConfigurationElement<int>)this["UmbracoLibraryCacheDuration"],
-                    //set the default
-                          1800); 
-                
-            }
-        }
-
-        [ConfigurationProperty("MacroErrors")]
-        internal InnerTextConfigurationElement<MacroErrorBehaviour> MacroErrors
-        {
-            get
-            {
-
-                return new OptionalInnerTextConfigurationElement<MacroErrorBehaviour>(
-                          (InnerTextConfigurationElement<MacroErrorBehaviour>)this["MacroErrors"],
-                    //set the default
-                          MacroErrorBehaviour.Inline); 
-            }
-        }
-
-        [ConfigurationProperty("DocumentTypeIconList")]
-        internal InnerTextConfigurationElement<IconPickerBehaviour> DocumentTypeIconList
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<IconPickerBehaviour>(
-                          (InnerTextConfigurationElement<IconPickerBehaviour>)this["DocumentTypeIconList"],
-                    //set the default
-                          IconPickerBehaviour.HideFileDuplicates);
-            }
-        }
-
-        [ConfigurationProperty("disallowedUploadFiles")]
-        internal CommaDelimitedConfigurationElement DisallowedUploadFiles
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (CommaDelimitedConfigurationElement)this["disallowedUploadFiles"],
-                    //set the default
-                       new[] { "ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd" });
-
-            }
-        }
-
-        [ConfigurationProperty("cloneXmlContent")]
-        internal InnerTextConfigurationElement<bool> CloneXmlContent
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                    (InnerTextConfigurationElement<bool>)this["cloneXmlContent"],
-                    //set the default
-                    true);
-            }
-        }
-
-        [ConfigurationProperty("GlobalPreviewStorageEnabled")]
-        internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                    (InnerTextConfigurationElement<bool>)this["GlobalPreviewStorageEnabled"],
-                    //set the default
-                    false);
-            }
-        }
-
-        [ConfigurationProperty("defaultDocumentTypeProperty")]
-        internal InnerTextConfigurationElement<string> DefaultDocumentTypeProperty
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                    (InnerTextConfigurationElement<string>)this["defaultDocumentTypeProperty"],
-                    //set the default
-                    "Textstring");
-            }
-        }
-
-        string IContentSection.NotificationEmailAddress
-        {
-            get { return Notifications.NotificationEmailAddress; }
-        }
-
-        bool IContentSection.DisableHtmlEmail
-        {
-            get { return Notifications.DisableHtmlEmail; }
-        }
-
-        IEnumerable<string> IContentSection.ImageFileTypes
-        {
-            get { return Imaging.ImageFileTypes; }
-        }
-
-        IEnumerable<string> IContentSection.ImageTagAllowedAttributes
-        {
-            get { return Imaging.ImageTagAllowedAttributes; }
-        }
-
-        IEnumerable<IImagingAutoFillUploadField> IContentSection.ImageAutoFillProperties
-        {
-            get { return Imaging.ImageAutoFillProperties; }
-        }
-
-        bool IContentSection.ScriptEditorDisable
-        {
-            get { return ScriptEditor.ScriptEditorDisable; }
-        }
-
-        string IContentSection.ScriptFolderPath
-        {
-            get { return ScriptEditor.ScriptFolderPath; }
-        }
-
-        IEnumerable<string> IContentSection.ScriptFileTypes
-        {
-            get { return ScriptEditor.ScriptFileTypes; }
-        }
-
-        bool IContentSection.ResolveUrlsFromTextString
-        {
-            get { return ResolveUrlsFromTextString; }
-        }
-
-        bool IContentSection.UploadAllowDirectories
-        {
-            get { return UploadAllowDirectories; }
-        }        
-
-        bool IContentSection.EnsureUniqueNaming
-        {
-            get { return EnsureUniqueNaming; }
-        }
-
-        bool IContentSection.TidyEditorContent
-        {
-            get { return TidyEditorContent; }
-        }
-
-        string IContentSection.TidyCharEncoding
-        {
-            get { return TidyCharEncoding; }
-        }
-
-        bool IContentSection.XmlCacheEnabled
-        {
-            get { return XmlCacheEnabled; }
-        }
-
-        bool IContentSection.ContinouslyUpdateXmlDiskCache
-        {
-            get { return ContinouslyUpdateXmlDiskCache; }
-        }
-
-        bool IContentSection.XmlContentCheckForDiskChanges
-        {
-            get { return XmlContentCheckForDiskChanges; }
-        }
-
-        bool IContentSection.EnableSplashWhileLoading
-        {
-            get { return EnableSplashWhileLoading; }
-        }
-
-        string IContentSection.PropertyContextHelpOption
-        {
-            get { return PropertyContextHelpOption; }
-        }
-
-        bool IContentSection.UseLegacyXmlSchema
-        {
-            get { return UseLegacyXmlSchema; }
-        }
-
-        bool IContentSection.ForceSafeAliases
-        {
-            get { return ForceSafeAliases; }
-        }
-
-        string IContentSection.PreviewBadge
-        {
-            get { return PreviewBadge; }
-        }
-
-        int IContentSection.UmbracoLibraryCacheDuration
-        {
-            get { return UmbracoLibraryCacheDuration; }
-        }
-
-        MacroErrorBehaviour IContentSection.MacroErrorBehaviour
-        {
-            get { return MacroErrors; }
-        }
-
-        IconPickerBehaviour IContentSection.IconPickerBehaviour
-        {
-            get { return DocumentTypeIconList; }
-        }
-
-        IEnumerable<string> IContentSection.DisallowedUploadFiles
-        {
-            get { return DisallowedUploadFiles; }
-        }
-
-        bool IContentSection.CloneXmlContent
-        {
-            get { return CloneXmlContent; }
-        }
-
-        bool IContentSection.GlobalPreviewStorageEnabled
-        {
-            get { return GlobalPreviewStorageEnabled; }
-        }
-
-        string IContentSection.DefaultDocumentTypeProperty
-        {
-            get { return DefaultDocumentTypeProperty; }
-        }
-    }
-}
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentError404Collection : ConfigurationElementCollection, IEnumerable<ContentErrorPageElement>
-    {
-        internal void Add(ContentErrorPageElement element)
-        {
-            BaseAdd(element);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ContentErrorPageElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ContentErrorPageElement)element).Culture
-                + ((ContentErrorPageElement)element).Value;
-        }
-
-        IEnumerator<ContentErrorPageElement> IEnumerable<ContentErrorPageElement>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as ContentErrorPageElement;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
@@ -1,28 +0,0 @@
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentErrorPageElement : InnerTextConfigurationElement<int>, IContentErrorPage
-    {
-        public ContentErrorPageElement(XElement rawXml)
-            : base(rawXml)
-        {
-        }
-
-        public ContentErrorPageElement()
-        {
-            
-        }
-
-        public int ContentId
-        {
-            get { return Value; }
-        }
-
-        public string Culture
-        {
-            get { return (string) RawXml.Attribute("culture"); }
-            set { RawXml.Attribute("culture").Value = value; }
-        }
-    }
-}
@@ -1,44 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentErrorsElement : RawXmlConfigurationElement
-    {
-        
-        public IEnumerable<IContentErrorPage> Error404Collection
-        {
-            get
-            {
-                var result = new ContentError404Collection();
-                if (RawXml != null)
-                {
-                    var e404 = RawXml.Elements("error404").First();
-                    var ePages = e404.Elements("errorPage").ToArray();                    
-                    if (ePages.Any())
-                    {
-                        //there are multiple
-                        foreach (var e in ePages)
-                        {
-                            result.Add(new ContentErrorPageElement(e)
-                            {
-                                Culture = (string)e.Attribute("culture"),
-                                RawValue = e.Value
-                            });
-                        }
-                    }
-                    else
-                    {
-                        //there's only one defined
-                        result.Add(new ContentErrorPageElement(e404)
-                        {
-                            RawValue = e404.Value
-                        });
-                    }                    
-                }
-                return result;
-            }
-        }
-
-    }
-}
@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentImagingElement : ConfigurationElement
-    {
-        [ConfigurationProperty("imageFileTypes")]
-        internal CommaDelimitedConfigurationElement ImageFileTypes
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (CommaDelimitedConfigurationElement)this["imageFileTypes"],
-                        //set the default
-                       GetDefaultImageFileTypes());
-            }
-        }
-
-        internal static string[] GetDefaultImageFileTypes()
-        {
-            return new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
-        }
-
-        [ConfigurationProperty("allowedAttributes")]
-        internal CommaDelimitedConfigurationElement ImageTagAllowedAttributes
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (CommaDelimitedConfigurationElement)this["allowedAttributes"],
-                        //set the default
-                       new[] { "src", "alt", "border", "class", "style", "align", "id", "name", "onclick", "usemap" });
-            }
-        }
-
-        private ImagingAutoFillPropertiesCollection _defaultImageAutoFill;
-
-        [ConfigurationCollection(typeof(ImagingAutoFillPropertiesCollection), AddItemName = "uploadField")]
-        [ConfigurationProperty("autoFillImageProperties", IsDefaultCollection = true)]
-        internal ImagingAutoFillPropertiesCollection ImageAutoFillProperties
-        {
-            get
-            {
-                if (_defaultImageAutoFill != null)
-                {
-                    return _defaultImageAutoFill;
-                }
-
-                //here we need to check if this element is defined, if it is not then we'll setup the defaults
-                var prop = Properties["autoFillImageProperties"];
-                var autoFill = this[prop] as ConfigurationElement;
-                if (autoFill != null && autoFill.ElementInformation.IsPresent == false)
-                {
-                    _defaultImageAutoFill = new ImagingAutoFillPropertiesCollection
-                        {
-                            new ImagingAutoFillUploadFieldElement
-                                {
-                                    Alias = "umbracoFile"
-                                }
-                        };
-                    return _defaultImageAutoFill;
-                }
-                
-                return (ImagingAutoFillPropertiesCollection) base["autoFillImageProperties"];
-            }
-        }
-
-        internal static ImagingAutoFillPropertiesCollection GetDefaultImageAutoFillProperties()
-        {
-            return new ImagingAutoFillPropertiesCollection
-                        {
-                            new ImagingAutoFillUploadFieldElement
-                                {
-                                    Alias = "umbracoFile"
-                                }
-                        };
-        }
-
-    }
-}
@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentScriptEditorElement : ConfigurationElement
-    {
-        [ConfigurationProperty("scriptFolderPath")]
-        internal InnerTextConfigurationElement<string> ScriptFolderPath
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["scriptFolderPath"],
-                    //set the default
-                       "/scripts");
-            }
-        }
-
-        [ConfigurationProperty("scriptFileTypes")]
-        internal OptionalCommaDelimitedConfigurationElement ScriptFileTypes
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (OptionalCommaDelimitedConfigurationElement)this["scriptFileTypes"],
-                    //set the default
-                       new[] { "js", "xml" });                
-            }
-        }
-
-        [ConfigurationProperty("scriptDisableEditor")]
-        internal InnerTextConfigurationElement<bool> ScriptEditorDisable
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<bool>(
-                    (InnerTextConfigurationElement<bool>) this["scriptDisableEditor"],
-                    //set the default
-                    false);
-            }
-        }
-
-    }
-}
@@ -1,32 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    /// <summary>
-    /// Allows for converting string representations of 0 and 1 to boolean
-    /// </summary>
-    internal class CustomBooleanTypeConverter : BooleanConverter
-    {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            if (sourceType == typeof(string))
-            {
-                return true;
-            }
-            return base.CanConvertFrom(context, sourceType);
-        }
-
-        public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
-        {
-            if (value is string)
-            {
-                var str = (string)value;
-                if (str == "1") return true;
-                if (str == "0" || str == "") return false;
-            }
-
-            return base.ConvertFrom(context, culture, value);
-        }
-    }
-}
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class DeveloperElement : ConfigurationElement, IDeveloperSection
-    {
-        private AppCodeFileExtensionsElement _default;
-
-        [ConfigurationProperty("appCodeFileExtensions")]
-        internal AppCodeFileExtensionsElement AppCodeFileExtensions
-        {
-            get
-            {
-                if (_default != null)
-                {
-                    return _default;
-                }
-
-                //here we need to check if this element is defined, if it is not then we'll setup the defaults
-                var prop = Properties["appCodeFileExtensions"];
-                var autoFill = this[prop] as ConfigurationElement;
-                if (autoFill != null && autoFill.ElementInformation.IsPresent == false)
-                {
-                    var collection = new AppCodeFileExtensionsCollection
-                        {
-                            new FileExtensionElement {RawValue = "cs"},
-                            new FileExtensionElement {RawValue = "vb"}
-                        };
-                    _default = new AppCodeFileExtensionsElement
-                        {
-                            AppCodeFileExtensionsCollection = collection
-                        };
-
-                    return _default;
-                }
-
-                return (AppCodeFileExtensionsElement)base["appCodeFileExtensions"];
-            }
-        }
-
-        IEnumerable<IFileExtension> IDeveloperSection.AppCodeFileExtensions
-        {
-            get { return AppCodeFileExtensions.AppCodeFileExtensionsCollection; }
-        }
-    }
-}
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class DisabledLogTypesCollection : ConfigurationElementCollection, IEnumerable<ILogType>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new LogTypeElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((LogTypeElement)element).Value;
-        }
-
-        IEnumerator<ILogType> IEnumerable<ILogType>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as ILogType;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
@@ -1,48 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class DistributedCallElement : ConfigurationElement, IDistributedCallSection
-    {
-        [ConfigurationProperty("enable", DefaultValue = false)]
-        internal bool Enabled
-        {
-            get { return (bool)base["enable"]; }
-        }
-
-        [ConfigurationProperty("user")]
-        internal InnerTextConfigurationElement<int> UserId
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<int>(
-                       (InnerTextConfigurationElement<int>)this["user"],
-                    //set the default
-                       0);
-            }
-        }
-
-        [ConfigurationCollection(typeof(ServerCollection), AddItemName = "server")]
-        [ConfigurationProperty("servers", IsDefaultCollection = true)]
-        internal ServerCollection Servers
-        {
-            get { return (ServerCollection)base["servers"]; }
-        }
-
-        bool IDistributedCallSection.Enabled
-        {
-            get { return Enabled; }
-        }
-
-        int IDistributedCallSection.UserId
-        {
-            get { return UserId; }
-        }
-
-        IEnumerable<IServer> IDistributedCallSection.Servers
-        {
-            get { return Servers; }
-        }
-    }
-}
@@ -1,25 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ExternalLoggerElement : ConfigurationElement
-    {
-        [ConfigurationProperty("assembly")]
-        internal string Assembly
-        {
-            get { return (string)base["assembly"]; }
-        }
-
-        [ConfigurationProperty("type")]
-        internal string Type
-        {
-            get { return (string)base["type"]; }
-        }
-
-        [ConfigurationProperty("logAuditTrail")]
-        internal bool LogAuditTrail
-        {
-            get { return (bool)base["logAuditTrail"]; }
-        }
-    }
-}
@@ -1,21 +0,0 @@
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class FileExtensionElement : InnerTextConfigurationElement<string>, IFileExtension
-    {
-        public FileExtensionElement()
-        {
-        }
-
-        internal FileExtensionElement(XElement rawXml)
-            : base(rawXml)
-        {
-        }
-        
-        string IFileExtension.Extension
-        {
-            get { return Value; }
-        }
-    }
-}
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class HelpElement : ConfigurationElement, IHelpSection
-    {
-        [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")]
-        public string DefaultUrl
-        {
-            get { return (string) base["defaultUrl"]; }
-        }
-
-        [ConfigurationCollection(typeof (LinksCollection), AddItemName = "link")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public LinksCollection Links
-        {
-            get { return (LinksCollection) base[""]; }
-        }
-
-        string IHelpSection.DefaultUrl
-        {
-            get { return DefaultUrl; }
-        }
-
-        IEnumerable<ILink> IHelpSection.Links
-        {
-            get { return Links; }
-        }
-    }
-}
@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IChar
-    {
-        string Char { get; }
-        string Replacement { get; }
-    }
-}
@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentErrorPage
-    {
-        int ContentId { get; }
-        string Culture { get; set; }
-    }
-}
@@ -1,65 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentSection : IUmbracoConfigurationSection
-    {
-        string NotificationEmailAddress { get; }
-
-        bool DisableHtmlEmail { get; }
-
-        IEnumerable<string> ImageFileTypes { get; }
-
-        IEnumerable<string> ImageTagAllowedAttributes { get; }
-
-        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-
-        string ScriptFolderPath { get; }
-
-        IEnumerable<string> ScriptFileTypes { get; }
-
-        bool ScriptEditorDisable { get; }
-
-        bool ResolveUrlsFromTextString { get; }
-
-        bool UploadAllowDirectories { get; }
-
-        IEnumerable<IContentErrorPage> Error404Collection { get; }
-
-        bool EnsureUniqueNaming { get; }
-
-        bool TidyEditorContent { get; }
-
-        string TidyCharEncoding { get; }
-
-        bool XmlCacheEnabled { get; }
-
-        bool ContinouslyUpdateXmlDiskCache { get; }
-
-        bool XmlContentCheckForDiskChanges { get; }
-
-        bool EnableSplashWhileLoading { get; }
-
-        string PropertyContextHelpOption { get; }
-
-        bool UseLegacyXmlSchema { get; }
-
-        bool ForceSafeAliases { get; }
-
-        string PreviewBadge { get; }
-
-        int UmbracoLibraryCacheDuration { get; }
-
-        MacroErrorBehaviour MacroErrorBehaviour { get; }
-
-        IconPickerBehaviour IconPickerBehaviour { get; }
-
-        IEnumerable<string> DisallowedUploadFiles { get; }
-
-        bool CloneXmlContent { get; }
-
-        bool GlobalPreviewStorageEnabled { get; }
-
-        string DefaultDocumentTypeProperty { get; }
-    }
-}
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDeveloperSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
-    }
-}
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDistributedCallSection : IUmbracoConfigurationSection
-    {
-        bool Enabled { get; }
-
-        int UserId { get; }
-
-        IEnumerable<IServer> Servers { get; }
-    }
-}
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IFileExtension
-    {
-        string Extension { get; }
-    }
-}
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IHelpSection : IUmbracoConfigurationSection
-    {
-        string DefaultUrl { get; }
-
-        IEnumerable<ILink> Links { get; }
-    }
-}
@@ -1,18 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IImagingAutoFillUploadField
-    {
-        /// <summary>
-        /// Allow setting internally so we can create a default
-        /// </summary>
-        string Alias { get; }
-
-        string WidthFieldAlias { get; }
-
-        string HeightFieldAlias { get; }
-
-        string LengthFieldAlias { get; }
-
-        string ExtensionFieldAlias { get; }
-    }
-}
@@ -1,15 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILink
-    {
-        string Application { get; }
-
-        string ApplicationUrl { get; }
-
-        string Language { get; }
-
-        string UserType { get; }
-
-        string HelpUrl { get; }
-    }
-}
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILogType
-    {
-        string LogTypeAlias { get; }
-    }
-}
@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILoggingSection : IUmbracoConfigurationSection
-    {
-        bool AutoCleanLogs { get; }
-
-        bool EnableLogging { get; }
-
-        bool EnableAsyncLogging { get; }
-
-        int CleaningMiliseconds { get; }
-
-        int MaxLogAge { get; }
-
-        IEnumerable<ILogType> DisabledLogTypes { get; }
-
-        string ExternalLoggerAssembly { get; }
-
-        string ExternalLoggerType { get; }
-
-        bool ExternalLoggerEnableAuditTrail { get; }
-
-        bool ExternalLoggerIsConfigured { get; }
-    }
-}
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface INotDynamicXmlDocument
-    {
-        string Element { get; }
-    }
-}
@@ -1,9 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IProvidersSection : IUmbracoConfigurationSection
-    {        
-        string DefaultBackOfficeUserProvider { get; }
-    }
-}
@@ -1,12 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRazorStaticMapping
-    {
-        Guid DataTypeGuid { get; }
-        string NodeTypeAlias { get; }
-        string PropertyTypeAlias { get; }
-        string MappingName { get; }
-    }
-}
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-
-    public interface IRepositoriesSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IRepository> Repositories { get; }
-    }
-}
@@ -1,13 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRepository
-    {
-        string Name { get; }
-        Guid Id { get;  }
-        string RepositoryUrl { get; }
-        string WebServiceUrl { get; }
-        bool HasCustomWebServiceUrl { get; }
-    }
-}
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRequestHandlerSection : IUmbracoConfigurationSection
-    {
-        bool UseDomainPrefixes { get; }
-
-        bool AddTrailingSlash { get; }
-
-        bool RemoveDoubleDashes { get; }
-
-        IEnumerable<IChar> CharCollection { get; }
-    }
-}
@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTask
-    {
-        string Alias { get; }
-
-        bool Log { get; }
-
-        int Interval { get; }
-
-        string Url { get; }
-    }
-}
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTasksSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IScheduledTask> Tasks { get; }
-    }
-}
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScriptingSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<INotDynamicXmlDocument> NotDynamicXmlDocumentElements { get; }
-
-        IEnumerable<IRazorStaticMapping> DataTypeModelStaticMappings { get; }
-    }
-}
@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ISecuritySection : IUmbracoConfigurationSection
-    {
-        bool KeepUserLoggedIn { get; }
-
-        bool HideDisabledUsersInBackoffice { get; }
-
-        string AuthCookieName { get; }
-
-        string AuthCookieDomain { get; }
-    }
-}
@@ -1,9 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IServer
-    {
-        string ForcePortnumber { get; }
-        string ForceProtocol { get; }
-        string ServerAddress { get; }
-    }
-}
@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ITemplatesSection : IUmbracoConfigurationSection
-    {
-        bool UseAspNetMasterPages { get; }
-
-        bool EnableSkinSupport { get; }
-
-        RenderingEngine DefaultRenderingEngine { get; }
-
-        bool EnableTemplateFolders { get; }
-    }
-}
@@ -1,33 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
-    {
-        IContentSection Content { get; }
-
-        ISecuritySection Security { get; }
-
-        IRequestHandlerSection RequestHandler { get; }
-
-        ITemplatesSection Templates { get; }
-
-        IDeveloperSection Developer { get; }
-
-        IViewStateMoverModuleSection ViewStateMoverModule { get; }
-
-        ILoggingSection Logging { get; }
-
-        IScheduledTasksSection ScheduledTasks { get; }
-
-        IDistributedCallSection DistributedCall { get; }
-
-        IRepositoriesSection PackageRepositories { get; }
-
-        IProvidersSection Providers { get; }
-
-        IHelpSection Help { get; }
-
-        IWebRoutingSection WebRouting { get; }
-
-        IScriptingSection Scripting { get; }
-    }
-}
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IViewStateMoverModuleSection : IUmbracoConfigurationSection
-    {
-        bool Enable { get; }
-    }
-}
@@ -1,12 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IWebRoutingSection : IUmbracoConfigurationSection
-    {
-        bool TrySkipIisCustomErrors { get; }
-
-        bool InternalRedirectPreservesTemplate { get; }
-
-        string UrlProviderMode { get; }
-    }
-
-}
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ImagingAutoFillPropertiesCollection : ConfigurationElementCollection, IEnumerable<IImagingAutoFillUploadField>
-    {
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ImagingAutoFillUploadFieldElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ImagingAutoFillUploadFieldElement)element).Alias;
-        }
-        
-        internal void Add(ImagingAutoFillUploadFieldElement item)
-        {
-            BaseAdd(item);
-        }
-
-        IEnumerator<IImagingAutoFillUploadField> IEnumerable<IImagingAutoFillUploadField>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IImagingAutoFillUploadField;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
@@ -1,91 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ImagingAutoFillUploadFieldElement : ConfigurationElement, IImagingAutoFillUploadField
-    {
-        /// <summary>
-        /// Allow setting internally so we can create a default
-        /// </summary>
-        [ConfigurationProperty("alias", IsKey = true, IsRequired = true)]
-        public string Alias
-        {
-            get { return (string)this["alias"]; }
-            set { this["alias"] = value; }
-        }
-
-        [ConfigurationProperty("widthFieldAlias")]
-        internal InnerTextConfigurationElement<string> WidthFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["widthFieldAlias"],
-                    //set the default
-                       "umbracoWidth");
-            }
-        }
-
-        [ConfigurationProperty("heightFieldAlias")]
-        internal InnerTextConfigurationElement<string> HeightFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["heightFieldAlias"],
-                    //set the default
-                       "umbracoHeight");
-            }
-        }
-
-        [ConfigurationProperty("lengthFieldAlias")]
-        internal InnerTextConfigurationElement<string> LengthFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["lengthFieldAlias"],
-                    //set the default
-                       "umbracoBytes");
-            }
-        }
-
-        [ConfigurationProperty("extensionFieldAlias")]
-        internal InnerTextConfigurationElement<string> ExtensionFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["extensionFieldAlias"],
-                    //set the default
-                       "umbracoExtension");
-            }
-        }
-
-        string IImagingAutoFillUploadField.Alias
-        {
-            get { return Alias; }
-            
-        }
-
-        string IImagingAutoFillUploadField.WidthFieldAlias
-        {
-            get { return WidthFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.HeightFieldAlias
-        {
-            get { return HeightFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.LengthFieldAlias
-        {
-            get { return LengthFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.ExtensionFieldAlias
-        {
-            get { return ExtensionFieldAlias; }
-        }
-    }
-}
@@ -1,62 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class LinkElement : ConfigurationElement, ILink
-    {
-        [ConfigurationProperty("application")]
-        internal string Application
-        {
-            get { return (string)base["application"]; }
-        }
-
-        [ConfigurationProperty("applicationUrl")]
-        internal string ApplicationUrl
-        {
-            get { return (string)base["applicationUrl"]; }
-        }
-
-        [ConfigurationProperty("language")]
-        internal string Language
-        {
-            get { return (string)base["language"]; }
-        }
-
-        [ConfigurationProperty("userType")]
-        internal string UserType
-        {
-            get { return (string)base["userType"]; }
-        }
-
-        [ConfigurationProperty("helpUrl")]
-        internal string HelpUrl
-        {
-            get { return (string)base["helpUrl"]; }
-        }
-
-        string ILink.Application
-        {
-            get { return Application; }
-        }
-
-        string ILink.ApplicationUrl
-        {
-            get { return ApplicationUrl; }
-        }
-
-        string ILink.Language
-        {
-            get { return Language; }
-        }
-
-        string ILink.UserType
-        {
-            get { return UserType; }
-        }
-
-        string ILink.HelpUrl
-        {
-            get { return HelpUrl; }
-        }
-    }
-}
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class LinksCollection : ConfigurationElementCollection, IEnumerable<ILink>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new LinkElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((LinkElement)element).Application 
-                   + ((LinkElement)element).ApplicationUrl 
-                   + ((LinkElement)element).Language
-                   + ((LinkElement)element).UserType;
-        }
-
-        IEnumerator<ILink> IEnumerable<ILink>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as ILink;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastiaan Janssen	4935525591	Merge pull request #147 from AndyButland/u4-2958 Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor	2013-10-05 10:04:08 -07:00
Andy Butland	693778fe74	Fixed issue where member type properties would not persist after first save without reloading page	2013-10-02 21:20:05 +02:00
Sebastiaan Janssen	8eee7cae2f	Merge branch '6.1.6'	2013-09-30 16:10:14 +02:00
Sebastiaan Janssen	226e35d65a	NuSpec update: we can only accept a specific version of MySQL	2013-09-30 14:32:06 +02:00
Sebastiaan Janssen	cdda69c4cd	U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option	2013-09-30 12:39:28 +02:00
Shannon	0cff484113	fixes unit test	2013-09-30 12:12:17 +02:00
Shannon	830fde372e	Fixes EditUser.aspx	2013-09-30 11:49:31 +02:00
Shannon	35f65a2c64	re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc.	2013-09-30 10:55:38 +02:00
Shannon	e5320f0abd	Obsoletes the LoadMinimalDocument flag since it no longer serves a purpose.	2013-09-30 10:55:26 +02:00
Sebastiaan Janssen	965a7fc500	Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions	2013-09-30 10:55:13 +02:00
Sebastiaan Janssen	abbf8aeb42	U4-2709 Error after upgrading from 6.1.3 to 6.1.4	2013-09-30 10:49:33 +02:00
Sebastiaan Janssen	328ada2f38	Bump version number	2013-09-30 10:46:08 +02:00
Sebastiaan Janssen	767252cdf1	Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe	2013-09-30 10:31:45 +02:00
Sebastiaan Janssen	010d47c68b	Fixes U4-2822 Datepicker throws "Specified cast is not valid" when saving through API	2013-09-30 10:23:43 +02:00
Shandem	a353f6fb74	Merge pull request #135 from Myster/master Fix multiple words in search U4-2509	2013-09-11 19:33:47 -07:00
Murray Roke	a64efb93b3	Improved search with "and", partial match U4-2509 - added partial matching on each word. - fixed bug so 'all' words match rather than 'any' words.	2013-09-12 14:30:42 +12:00
Murray Roke	cf9f11ff45	Improved admin search splitting query U4-2509	2013-09-12 13:22:14 +12:00
Murray Roke	d7481b5ca4	Fix multiple words in search U4-2509 When multiple words are entered in the search field no results are returned. This pull req. contains the fix suggested by Tony.	2013-09-12 10:22:59 +12:00
Niels Hartvig	2fb55cb831	Enhanced permission checking on views and snippets Thanks to Richard Turnbull from NGS Secure Research who discovered a minor issue that made it possible for authenticated Umbraco Users to view files beyond their permissions	2013-09-02 14:23:27 +02:00
Sebastiaan Janssen	0e6a926a3f	Merge branch '6.1.5'	2013-09-02 12:24:26 +02:00
Sebastiaan Janssen	1e76cf67d3	Fix merge problem	2013-08-23 08:57:02 +02:00
Sebastiaan Janssen	61149f8112	Merge branch '6.1.4' Conflicts: .gitignore src/Umbraco.Web.UI/install/steps/database.ascx src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs src/umbraco.editorControls/mediapicker/mediaChooser.cs	2013-08-22 14:46:11 +02:00
Sebastiaan Janssen	b5494546c7	defaultDocumentTypeProperty is no longer case-sensitive. Added to the Release config as well so it makes it into the umbraco downloadable package.	2013-07-19 15:40:12 +02:00
Sebastiaan Janssen	7bac1ef1cd	Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949	2013-07-19 15:22:05 +02:00
Sebastiaan Janssen	da15d40b04	Merge pull request #51 from kipusoep/master Updated the download link	2013-07-19 06:18:13 -07:00
Sebastiaan Janssen	67bd303173	Merge pull request #46 from michielvoo/u4-2417 U4-2417 Could the preview thumbnail link to the full image	2013-07-19 06:02:51 -07:00
Sebastiaan Janssen	20e6843bf0	Merge pull request #32 from AndyButland/wip-u4-1285 Fix for U4-1285: Apostrophes in member groups cause exceptions	2013-07-19 05:39:38 -07:00
Sebastiaan Janssen	85c80b07f9	Merge pull request #42 from michielvoo/u4-232 Enabled support for integrated security for SQL Server to the installer.	2013-07-19 04:26:50 -07:00
Sebastiaan Janssen	557dccd88b	Merge pull request #41 from michielvoo/u4-667 U4-667	2013-07-19 04:18:29 -07:00
Sebastiaan Janssen	334f0bfd2b	Merge pull request #40 from michielvoo/u4-663 U4-663	2013-07-19 03:53:15 -07:00
AndyButland	986d37afd6	Removed debugging console.log reference	2013-07-18 21:23:05 +02:00
Stefan Kip	63ea79a4d6	Updated the download link	2013-07-11 10:03:25 +02:00
Michiel van Oosterhout	e4df176a37	U4-2417: show media picker image as link to the original image. Order of the views in the markup did not match the order of the Style enum. ImageViewer control now selects the view by matching the ViewerStyle enum to a View ID. This way the order of the views in the markup is no longer important. Also: Removed user control from Umbraco.Web project, moved designer code and added code behind class for user control to Umbraco.Web.UI Refactored code to use Umbraco.Core.IO Removed some code that was commented out	2013-07-03 17:36:28 +02:00
Michiel van Oosterhout	d926180e3a	Added special overload for creating a connection string with integrated security. Actually disable checkbox is the selected database type is not Microsoft SQL Server. Refactored saveDBConfig for readability.	2013-06-28 16:40:23 +02:00
Michiel van Oosterhout	72bb1b3583	U4-667 Added a script to make the checkbox "Render content in editor" dependent on the "Use in editor" checkbox. Also refactored the create.aspx code-behind so it's easier to see what control is loaded in the dialog when debugging.	2013-06-28 10:44:24 +02:00
Michiel van Oosterhout	240e58e061	U4-663 Do not overwrite existing files when creating a new template.	2013-06-28 10:42:51 +02:00
Michiel van Oosterhout	e980296d6d	Enabled support for integrated security for SQL Server to the installer.	2013-06-28 10:39:48 +02:00
AndyButland	d23482b7a6	Moved setting for DefaultDocumentTypeProperty from GlobalSettings to UmbracoSettings	2013-06-27 16:00:49 +02:00
AndyButland	212800f706	Added config setting for default document type property; used setting to set default new property type	2013-06-26 17:25:44 +02:00
AndyButland	d47ff4005c	Support for deleting member groups with apostrophes	2013-06-26 06:16:39 +02:00
AndyButland	dfeb1c7a0b	Support for displaying and editing member groups with apostrophes	2013-06-26 06:16:23 +02:00