From e23ed30b0cb80ce9b424ee5b669fa8d76c49236d Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 23 Nov 2012 11:45:51 -0100
Subject: [PATCH] Took out the temporary tree fixes and put another temp fix in
 (reverts to the 4.10.x code) Also removed dependency on ClientDependency.Mvc
 for now to make upgrades easier (no requirement to do assembly redirects in
 web.config)

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                  | 3 ---
 src/Umbraco.Web.UI/web.Template.config                    | 6 +-----
 .../umbraco.presentation/install/steps/theend.ascx.cs     | 2 --
 .../umbraco/Trees/TreeDefinitionCollection.cs             | 8 +++++---
 src/umbraco.businesslogic/ApplicationTreeRegistrar.cs     | 2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d0981977cf..bc06fffbb8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -97,9 +97,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\ClientDependency.1.5.1.0\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc">
-      <HintPath>..\packages\ClientDependency-Mvc.1.5.1.0\lib\ClientDependency.Core.Mvc.dll</HintPath>
-    </Reference>
     <Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\CookComputing.XmlRpcV2.dll</HintPath>
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 52fae663cf..27c815253a 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -241,11 +241,7 @@
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>      
+      </dependentAssembly>    
     </assemblyBinding>
   </runtime>
 
diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
index 9e05fc88aa..05c1e4694b 100644
--- a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
@@ -31,8 +31,6 @@ namespace umbraco.presentation.install.steps
 
             if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
                 customizeSite.Visible = false;
-
-            new ApplicationTreeRegistrar();
         }
 
         #region Web Form Designer generated code
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
index 5d816ce07f..b48c905777 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
@@ -15,6 +15,7 @@ using umbraco.interfaces;
 using umbraco.BusinessLogic.Utils;
 using umbraco.BusinessLogic;
 using umbraco.BasePages;
+using TypeFinder = umbraco.BusinessLogic.Utils.TypeFinder;
 
 namespace umbraco.cms.presentation.Trees
 {
@@ -151,11 +152,12 @@ namespace umbraco.cms.presentation.Trees
 
 				l.UpgradeToWriteLock();
 
-
-				var foundITrees = PluginManager.Current.ResolveTrees();
+                List<Type> foundITrees = TypeFinder.FindClassesOfType<ITree>();
+				//var foundITrees = PluginManager.Current.ResolveTrees();
 
 				var objTrees = ApplicationTree.getAll();
-				var appTrees = new List<ApplicationTree>();
+                List<ApplicationTree> appTrees = new List<ApplicationTree>();
+				//var appTrees = new List<ApplicationTree>();
 				appTrees.AddRange(objTrees);
 
 				var apps = Application.getAll();
diff --git a/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs b/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
index 07175dcc96..97628bbacd 100644
--- a/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
+++ b/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
@@ -31,7 +31,7 @@ namespace umbraco.BusinessLogic
         public ApplicationTreeRegistrar()
         {
 			//don't do anything if the application is not configured!
-			if (ApplicationContext.Current == null || !ApplicationContext.Current.IsConfigured)
+			if (!ApplicationContext.Current.IsConfigured)
 				return;
 
             // Load all Trees by attribute and add them to the XML config