From 693384bdf6f8a05005cac5e9f97a2835aaaba684 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Sun, 22 Feb 2015 17:16:39 +0100
Subject: [PATCH] completes: U4-5546 Remove user 'channels', weblog api, and
 all code / db tables relevant to those

---
 src/Umbraco.Core/IO/SystemFiles.cs            |  8 ---
 .../UmbracoSettings/umbracoSettings.config    |  2 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 -
 .../config/umbracoSettings.config             |  3 --
 src/Umbraco.Web.UI/umbraco/channels/rsd.aspx  | 20 --------
 .../umbraco/channels/wlwmanifest.aspx         | 51 -------------------
 6 files changed, 86 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/umbraco/channels/rsd.aspx
 delete mode 100644 src/Umbraco.Web.UI/umbraco/channels/wlwmanifest.aspx

diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
index 766ecc5562..ef85b41ec9 100644
--- a/src/Umbraco.Core/IO/SystemFiles.cs
+++ b/src/Umbraco.Core/IO/SystemFiles.cs
@@ -36,14 +36,6 @@ namespace Umbraco.Core.IO
             }
         }
 
-        public static string MetablogConfig
-        {
-            get
-            {
-                return SystemDirectories.Config + "/metablogConfig.config";
-            }
-        }
-
         public static string DashboardConfig
         {
             get
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 95e16b2286..eada8dc8f5 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -71,8 +71,6 @@
     <!-- Show property descriptions in editing view "icon|text|none" -->
     <PropertyContextHelpOption>text</PropertyContextHelpOption>
 
-    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
-
     <cloneXmlContent>true</cloneXmlContent>
 
     <ForceSafeAliases>true</ForceSafeAliases>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 041accd9db..10da500cd5 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -895,8 +895,6 @@
     <Content Include="Umbraco\Actions\editContent.aspx" />
     <Content Include="Umbraco\Actions\preview.aspx" />
     <Content Include="Umbraco\Actions\publish.aspx" />
-    <Content Include="Umbraco\Channels\rsd.aspx" />
-    <Content Include="Umbraco\Channels\wlwmanifest.aspx" />
     <Content Include="Umbraco\Config\Lang\da.xml" />
     <Content Include="Umbraco\Config\Lang\de.xml" />
     <Content Include="Umbraco\Config\Lang\es.xml" />
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 38efadb31e..7780d0508e 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -47,9 +47,6 @@
     <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
     <ensureUniqueNaming>True</ensureUniqueNaming>
 
-    <!-- to enable new content schema, this needs to be false -->
-    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
-
     <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
     <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
     <ForceSafeAliases>true</ForceSafeAliases>
diff --git a/src/Umbraco.Web.UI/umbraco/channels/rsd.aspx b/src/Umbraco.Web.UI/umbraco/channels/rsd.aspx
deleted file mode 100644
index 98f32ff992..0000000000
--- a/src/Umbraco.Web.UI/umbraco/channels/rsd.aspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %>
-<%@ Import Namespace="Umbraco.Core.IO" %>
-<script runat="server">
-protected override void OnInit(EventArgs e)
-{
-    Response.ContentType = "text/xml";
-}
-</script>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
-  <service>
-    <engineName>umbraco</engineName>
-    <engineLink>http://umbraco.org/</engineLink>
-    <homePageLink>http://<%=Request.ServerVariables["SERVER_NAME"]%></homePageLink>
-    <apis>
-      <api name="MetaWeblog" blogID="1" preferred="true" apiLink="http://<%=Request.ServerVariables["SERVER_NAME"]%><%=IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/channels.aspx" />
-      <api name="Blogger" blogID="1" preferred="false" apiLink="http://<%=Request.ServerVariables["SERVER_NAME"]%><%=IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/channels.aspx" />
-    </apis>
-  </service>
-</rsd>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/channels/wlwmanifest.aspx b/src/Umbraco.Web.UI/umbraco/channels/wlwmanifest.aspx
deleted file mode 100644
index 9f4d7a135b..0000000000
--- a/src/Umbraco.Web.UI/umbraco/channels/wlwmanifest.aspx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %>
-<%@ Import Namespace="Umbraco.Core.IO" %>
-<%@ Import Namespace="umbraco" %>
-<script runat="server">
-protected override void OnInit(EventArgs e)
-{
-    Response.ContentType = "text/xml";
-}
-protected override void OnLoad(EventArgs e)
-{
-    var useXhtml = false;
-    if (bool.TryParse(GlobalSettings.EditXhtmlMode, out useXhtml) && !useXhtml)
-    {
-        xhtml.Text = "no";
-    }
-    else
-    {
-        xhtml.Text = "yes";
-    }
-}
-</script>
-<manifest xmlns="http://schemas.microsoft.com/wlw/manifest/weblog">
- <weblog>
- <imageUrl>http://umbraco.org/images/liveWriterIcon.png</imageUrl>
- <watermarkImageUrl>http://umbraco.org/images/liveWriterWatermark.png</watermarkImageUrl>
- <homepageLinkText>View your site/weblog</homepageLinkText>
- <adminLinkText>Edit your site/weblog</adminLinkText>
- <adminUrl>{blog-homepage-url}<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/</adminUrl>
- <postEditingUrl>{blog-homepage-url}<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/actions/editContent.aspx?id={post-id}</postEditingUrl>
-
- </weblog>
- <views>
- <default>WebLayout</default>
- </views>
- <options>
- <supportsScripts>Yes</supportsScripts>
- <supportsEmbeds>Yes</supportsEmbeds>
- <supportsHtmlTitles>Yes</supportsHtmlTitles>
- <supportsEmptyTitles>No</supportsEmptyTitles>
- <maxRecentPosts>100</maxRecentPosts>
- <supportsNewCategories>Yes</supportsNewCategories>
- <supportsExcerpt>Yes</supportsExcerpt>
- <supportsPages>No</supportsPages>
- <supportsPageParent>No</supportsPageParent>
- <supportsPageOrder>No</supportsPageOrder>
- <supportsAutoUpdate>Yes</supportsAutoUpdate>
- <supportsMultipleCategories>Yes</supportsMultipleCategories>
- <requiresXHTML><asp:Literal runat="server" id="xhtml"></asp:Literal></requiresXHTML>
- </options>
-</manifest>