From fb1a72600e37fcae90c444c41226b05ca968e8a8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 15 Jan 2016 12:35:58 +0100
Subject: [PATCH] Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  17 ++-
 .../Zbu/ModelsBuilder/BuildModels.ascx        | 112 ------------------
 .../Zbu/ModelsBuilder/logo32x32.png           | Bin 1654 -> 0 bytes
 src/Umbraco.Web.UI/Views/Web.config           |   2 -
 src/Umbraco.Web.UI/config/Dashboard.config    |  10 ++
 src/Umbraco.Web.UI/packages.config            |   4 +-
 src/Umbraco.Web.UI/web.Template.config        |   5 +-
 7 files changed, 26 insertions(+), 124 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/BuildModels.ascx
 delete mode 100644 src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/logo32x32.png

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7e04093b22..f6bbdb73da 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -350,12 +350,16 @@
       <Name>umbraco.providers</Name>
     </ProjectReference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UrlRewritingNet.UrlRewriter.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder, Version=2.2.0.64, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.2.2.0-beta002\lib\Umbraco.ModelsBuilder.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Zbu.ModelsBuilder, Version=2.2.0.59, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Zbu.ModelsBuilder.2.2.0-beta001\lib\Zbu.ModelsBuilder.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder.AspNet, Version=2.2.0.64, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.AspNet.2.2.0-beta002\lib\Umbraco.ModelsBuilder.AspNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UrlRewritingNet.UrlRewriter.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Zbu.ModelsBuilder.AspNet, Version=2.2.0.59, Culture=neutral, processorArchitecture=MSIL">
@@ -582,6 +586,8 @@
     <Compile Include="Umbraco\TreeInit.aspx.designer.cs">
       <DependentUpon>treeInit.aspx</DependentUpon>
     </Compile>
+    <Content Include="App_Plugin\ModelsBuilder\modelsbuilder.controller.js" />
+    <Content Include="App_Plugin\ModelsBuilder\modelsbuilder.htm" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
@@ -640,6 +646,7 @@
       </SubType>
     </Content>
     <Content Include="Umbraco\Install\Views\Web.config" />
+    <Content Include="App_Plugin\ModelsBuilder\package.manifest" />
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>
@@ -1962,8 +1969,6 @@
     <Content Include="Umbraco\PartialViewMacros\Templates\SiteMap.cshtml" />
     <Content Include="Umbraco\Views\AuthorizeUpgrade.cshtml" />
     <Content Include="Umbraco\Translation\translationTasks.dtd" />
-    <Content Include="UserControls\Zbu\ModelsBuilder\BuildModels.ascx" />
-    <Content Include="UserControls\Zbu\ModelsBuilder\logo32x32.png" />
     <Content Include="Views\Web.config">
       <SubType>Designer</SubType>
     </Content>
diff --git a/src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/BuildModels.ascx b/src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/BuildModels.ascx
deleted file mode 100644
index cdc887f02a..0000000000
--- a/src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/BuildModels.ascx
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" %>
-<%@ Import Namespace="Zbu.ModelsBuilder.Configuration" %>
-<%@ Import Namespace="Zbu.ModelsBuilder.AspNet" %>
-
-<script runat="server">
-    protected override void OnLoad(EventArgs e)
-    {
-        // <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-        // <umb:CssInclude runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient" />
-
-        phGenerate.Visible = Config.EnableAppDataModels || Config.EnableAppCodeModels || Config.EnableDllModels;
-        phGenerateWarning.Visible = Config.EnableAppCodeModels || Config.EnableDllModels;
-
-        var sb = new StringBuilder();
-        sb.Append("Config: ");
-        if (Config.EnableApi) sb.Append(" +EnableApi");
-        if (Config.EnableAppDataModels) sb.Append(" +EnableAppDataModels");
-        if (Config.EnableAppCodeModels) sb.Append(" +EnableAppCodeModels");
-        if (Config.EnableDllModels) sb.Append(" +EnableDllModels");
-        if (Config.EnableLiveModels) sb.Append(" +EnableLiveModels");
-        if (Config.EnablePublishedContentModelsFactory) sb.Append(" +EnablePublishedContentModelsFactory");
-        if (Config.FlagOutOfDateModels) sb.Append(" +FlagOutOfDateModels");
-        sb.AppendFormat("<br />Config.ModelsNameSpace: \"{0}\"", Config.ModelsNamespace);
-        sb.AppendFormat("<br />Config.StaticMixinGetters: {0}", Config.StaticMixinGetters ? "enabled" : "disabled");
-        if (Config.StaticMixinGetters)
-            sb.AppendFormat(", Config.StaticMixinGetterPattern: \"{0}\"", Config.StaticMixinGetterPattern);
-        txtReport.Text = sb.ToString();
-
-        txtGenerate.Text = "Click button to generate models.";
-        if (OutOfDateModelsStatus.IsOutOfDate)
-            txtGenerate.Text = "Models are <strong>out-of-date</strong>, click button to generate models.";
-
-        var ver = Umbraco.Core.Configuration.UmbracoVersion.Current;        
-        if (ver.Major == 6)
-            Umbraco6();
-    }
-
-    private void Umbraco6()
-    {
-        var css = new ClientDependency.Core.Controls.CssInclude();
-        css.FilePath = "propertypane/style.css";
-        css.PathNameAlias = "UmbracoClient";
-        Page.Controls.Add(css);
-    }
-</script>
-
-<script type="text/javascript">
-    jQuery(document).ready(function () {
-
-        function buildModelsOnServer(callback) {
-            // encodeURIComponent(args)...
-            $.getJSON('<%=Zbu.ModelsBuilder.AspNet.ModelsBuilderApiController.BuildModelsUrl%>', function (json) {
-		        callback(json);
-		    });
-		}
-
-		function nl2br(s) {
-		    s = s.replace(/\r/g, '');
-		    s = s.replace(/\n/g, '<br />');
-		    return s;
-		}
-
-		jQuery('#generateModels').click(function (event) {
-		    jQuery('#generateModelsPane').hide();
-		    jQuery('#generateModelsRun').show();
-
-		    buildModelsOnServer(function (json) {
-		        if (json.Success) {
-		            $('#generateModelsRunMessage').html('Success! Reloading...');
-		            window.location.reload();
-		        }
-		        else {
-		            $('#generateModelsRunMessage').html('Failed. I\'m so sorry.');
-		            $('#generateModelsRunProgress').html(nl2br(json.Message));
-		        }
-		    });
-
-		    event.preventDefault();
-		    return false;
-		});
-	});
-</script>
-
-<div class="propertypane">
-	<div>
-		<div class="propertyItem">
-			<div class="dashboardWrapper">
-				<h2>Zbu.ModelsBuilder</h2>
-				<img class="dashboardIcon" alt="Umbraco" src="/UserControls/Zbu/ModelsBuilder/logo32x32.png">
-                <div style="margin-top: 24px;">
-                    <asp:Literal runat="server" ID="txtReport" />
-                </div>
-                <asp:PlaceHolder runat="server" ID="phGenerate">
-                    <div style="margin-top: 24px;">
-				        <div id="generateModelsPane" style="min-height: 240px;">
-				            <p><asp:Literal runat="server" ID="txtGenerate"/></p>
-                            <asp:PlaceHolder runat="server" ID="phGenerateWarning">
-                                <p style="color:red;">Beware! This will restart the application.</p>
-                            </asp:PlaceHolder>
-						    <p><button id="generateModels">Generate</button></p>
-				        </div>
-				        <div style="display:none;min-height: 240px;" id="generateModelsRun">
-					        <span id="generateModelsRunMessage">Please wait...</span>
-					        <br />&nbsp;<br />
-					        <span id="generateModelsRunProgress" style="color:#999999;"/>
-				        </div>
-                    </div>
-                </asp:PlaceHolder>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/logo32x32.png b/src/Umbraco.Web.UI/UserControls/Zbu/ModelsBuilder/logo32x32.png
deleted file mode 100644
index 5d92b25b8e8d802f4ffaf09c3859826e8eb444e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1654
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
AyZ`_I

diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config
index fe293e7dfd..c189e7dd93 100644
--- a/src/Umbraco.Web.UI/Views/Web.config
+++ b/src/Umbraco.Web.UI/Views/Web.config
@@ -22,8 +22,6 @@
         <add namespace="Umbraco.Web.Mvc" />
         <add namespace="umbraco" />
         <add namespace="Examine" />
-        <add namespace="Umbraco.Web.PublishedContentModels"/>
-        
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index 212049916b..18adec4e90 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -94,4 +94,14 @@
       <control>plugins/umbracocontour/formsdashboard.ascx</control>
     </tab>
   </section>
+  <section alias="UmbracoModelsBuilder">
+    <areas>
+      <area>developer</area>
+    </areas>
+    <tab caption="Models Builder">
+      <control>
+        /App_Plugins/ModelsBuilder/modelsbuilder.htm
+      </control>
+    </tab>
+  </section>
 </dashBoard>
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 4db9170024..2f0b60e4b2 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -37,7 +37,7 @@
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder" version="2.2.0-beta002" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder.AspNet" version="2.2.0-beta002" targetFramework="net45" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
-  <package id="Zbu.ModelsBuilder" version="2.2.0-beta001" targetFramework="net45" />
-  <package id="Zbu.ModelsBuilder.AspNet" version="2.2.0-beta001" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index ecce4a8a11..9cf595a451 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -53,8 +53,9 @@
 		<add key="log4net.Config" value="config\log4net.config" />
 		<add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
 
-    <add key="Zbu.ModelsBuilder.EnableLiveModels" value="true"/>
-    <add key="Zbu.ModelsBuilder.EnableDllModels" value="false"/>
+    <add key="Umbraco.ModelsBuilder.Enable" value="true"/>
+    <add key="Umbraco.ModelsBuilder.EnableLiveModels" value="true"/>
+    <add key="Umbraco.ModelsBuilder.EnableDllModels" value="false"/>
     
 	</appSettings>
 	<connectionStrings>