From 15a48dd921a23643cd060f64f1394971e5f25868 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 11 Mar 2016 13:54:56 +0100
Subject: [PATCH] Ensures more IoC services are there, creates new
 GetContentXml methods on IContentServices, updates the xml cache 'content'
 class to use these methods, removes more checks for legacy XML structures,
 removes old xsd schema files.

---
 .../Repositories/ContentRepository.cs         |  28 ++
 .../Interfaces/IContentRepository.cs          |  15 +
 src/Umbraco.Core/Services/ContentService.cs   |  29 ++
 src/Umbraco.Core/Services/IContentService.cs  |  16 +
 src/Umbraco.Core/Services/PackagingService.cs |  26 +-
 .../XmlPublishedCache/XmlPublishedContent.cs  |   2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  19 -
 src/Umbraco.Web/WebBootManager.cs             |   2 +
 .../umbraco.presentation/content.cs           |  14 +-
 .../umbraco/schemas/package.xsd               | 389 ------------------
 .../umbraco/schemas/package.xsx               |   3 -
 .../umbraco/schemas/umbraco.xsc               |   1 -
 .../umbraco/schemas/umbraco.xsd               |  39 --
 .../umbraco/schemas/umbraco.xss               |   1 -
 .../umbraco/schemas/umbraco.xsx               |   7 -
 src/umbraco.cms/businesslogic/CMSNode.cs      |   2 +
 16 files changed, 116 insertions(+), 477 deletions(-)
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsd
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsc
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsd
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xss
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsx

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index fbc96c803b..56f0af8490 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -794,6 +794,34 @@ namespace Umbraco.Core.Persistence.Repositories
 
         }
 
+        /// <summary>
+        /// Returns the persisted content's preview XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        public XElement GetContentXml(int contentId)
+        {
+            var sql = new Sql().Select("*").From<ContentXmlDto>(SqlSyntax).Where<ContentXmlDto>(SqlSyntax, d => d.NodeId == contentId);
+            var dto = Database.SingleOrDefault<ContentXmlDto>(sql);
+            if (dto == null) return null;
+            return XElement.Parse(dto.Xml);
+        }
+
+        /// <summary>
+        /// Returns the persisted content's preview XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        public XElement GetContentPreviewXml(int contentId, Guid version)
+        {
+            var sql = new Sql().Select("*").From<PreviewXmlDto>(SqlSyntax)
+                .Where<PreviewXmlDto>(SqlSyntax, d => d.NodeId == contentId && d.VersionId == version);
+            var dto = Database.SingleOrDefault<PreviewXmlDto>(sql);
+            if (dto == null) return null;
+            return XElement.Parse(dto.Xml);
+        }
+
         #endregion
 
         #region IRecycleBinRepository members
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
index 9d3fcbb40b..32961ccf7c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
@@ -88,5 +88,20 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
         IEnumerable<IContent> GetPagedResultsByQuery(IQuery<IContent> query, long pageIndex, int pageSize, out long totalRecords,
             string orderBy, Direction orderDirection, string filter = "");
+
+        /// <summary>
+        /// Returns the persisted content's preview XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        XElement GetContentXml(int contentId);
+
+        /// <summary>
+        /// Returns the persisted content's preview XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        XElement GetContentPreviewXml(int contentId, Guid version);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 8195fb9432..6a9d447938 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1662,6 +1662,35 @@ namespace Umbraco.Core.Services
             return true;
         }
 
+        /// <summary>
+        /// Returns the persisted content's XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        public XElement GetContentXml(int contentId)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateContentRepository(uow))
+            {
+                return repository.GetContentXml(contentId);
+            }
+        }
+
+        /// <summary>
+        /// Returns the persisted content's preview XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        public XElement GetContentPreviewXml(int contentId, Guid version)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateContentRepository(uow))
+            {
+                return repository.GetContentPreviewXml(contentId, version);
+            }
+        }
+
         /// <summary>
         /// Rebuilds all xml content in the cmsContentXml table for all documents
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index c686cf4891..fd46bf1008 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Xml.Linq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -93,6 +94,21 @@ namespace Umbraco.Core.Services
     /// </summary>
     public interface IContentService : IService
     {
+        /// <summary>
+        /// Returns the persisted content's XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        XElement GetContentXml(int contentId);
+
+        /// <summary>
+        /// Returns the persisted content's preview XML structure
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        XElement GetContentPreviewXml(int contentId, Guid version);
+
         /// <summary>
         /// Rebuilds all xml content in the cmsContentXml table for all documents
         /// </summary>
diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index 12dc794498..7d1c4891d5 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -165,11 +165,8 @@ namespace Umbraco.Core.Services
         {
             var contents = new List<IContent>();
             foreach (var root in roots)
-            {
-                bool isLegacySchema = root.Name.LocalName.ToLowerInvariant().Equals("node");
-                string contentTypeAlias = isLegacySchema
-                                              ? root.Attribute("nodeTypeAlias").Value
-                                              : root.Name.LocalName;
+            {                
+                var contentTypeAlias = root.Name.LocalName;
 
                 if (_importedContentTypes.ContainsKey(contentTypeAlias) == false)
                 {
@@ -177,26 +174,24 @@ namespace Umbraco.Core.Services
                     _importedContentTypes.Add(contentTypeAlias, contentType);
                 }
 
-                var content = CreateContentFromXml(root, _importedContentTypes[contentTypeAlias], null, parentId, isLegacySchema);
+                var content = CreateContentFromXml(root, _importedContentTypes[contentTypeAlias], null, parentId);
                 contents.Add(content);
 
                 var children = from child in root.Elements()
                                where (string)child.Attribute("isDoc") == ""
                                select child;
                 if (children.Any())
-                    contents.AddRange(CreateContentFromXml(children, content, isLegacySchema));
+                    contents.AddRange(CreateContentFromXml(children, content));
             }
             return contents;
         }
 
-        private IEnumerable<IContent> CreateContentFromXml(IEnumerable<XElement> children, IContent parent, bool isLegacySchema)
+        private IEnumerable<IContent> CreateContentFromXml(IEnumerable<XElement> children, IContent parent)
         {
             var list = new List<IContent>();
             foreach (var child in children)
             {
-                string contentTypeAlias = isLegacySchema
-                                              ? child.Attribute("nodeTypeAlias").Value
-                                              : child.Name.LocalName;
+                string contentTypeAlias = child.Name.LocalName;
 
                 if (_importedContentTypes.ContainsKey(contentTypeAlias) == false)
                 {
@@ -205,7 +200,7 @@ namespace Umbraco.Core.Services
                 }
 
                 //Create and add the child to the list
-                var content = CreateContentFromXml(child, _importedContentTypes[contentTypeAlias], parent, default(int), isLegacySchema);
+                var content = CreateContentFromXml(child, _importedContentTypes[contentTypeAlias], parent, default(int));
                 list.Add(content);
 
                 //Recursive call
@@ -215,19 +210,20 @@ namespace Umbraco.Core.Services
                                     select grand;
 
                 if (grandChildren.Any())
-                    list.AddRange(CreateContentFromXml(grandChildren, content, isLegacySchema));
+                    list.AddRange(CreateContentFromXml(grandChildren, content));
             }
 
             return list;
         }
 
-        private IContent CreateContentFromXml(XElement element, IContentType contentType, IContent parent, int parentId, bool isLegacySchema)
+        private IContent CreateContentFromXml(XElement element, IContentType contentType, IContent parent, int parentId)
         {
             var id = element.Attribute("id").Value;
             var level = element.Attribute("level").Value;
             var sortOrder = element.Attribute("sortOrder").Value;
             var nodeName = element.Attribute("nodeName").Value;
             var path = element.Attribute("path").Value;
+            //TODO: Shouldn't we be using this value???
             var template = element.Attribute("template").Value;
 
             var properties = from property in element.Elements()
@@ -248,7 +244,7 @@ namespace Umbraco.Core.Services
 
             foreach (var property in properties)
             {
-                string propertyTypeAlias = isLegacySchema ? property.Attribute("alias").Value : property.Name.LocalName;
+                string propertyTypeAlias = property.Name.LocalName;
                 if (content.HasProperty(propertyTypeAlias))
                 {
                     var propertyValue = property.Value;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
index d3b9ebee6a..220338b635 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -348,7 +348,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 		    var parent = _xmlNode == null ? null : _xmlNode.ParentNode;            
             if (parent == null) return;
 
-		    if (parent.Name == "node" || (parent.Attributes != null && parent.Attributes.GetNamedItem("isDoc") != null))
+		    if (parent.Attributes != null && parent.Attributes.GetNamedItem("isDoc") != null)
 		        _parent = (new XmlPublishedContent(parent, _isPreviewing, true)).CreateModel();
 		}
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 300fec620e..1c11870613 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1836,9 +1836,6 @@
     <Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
       <SubType>Form</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="umbraco.presentation\umbraco\settings\EditDictionaryItem.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
@@ -1892,22 +1889,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\package.xsx">
-      <DependentUpon>package.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsc">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xss">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
-    <None Include="umbraco.presentation\umbraco\schemas\umbraco.xsx">
-      <DependentUpon>umbraco.xsd</DependentUpon>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <WebReferences Include="Web References\" />
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index c9074ff12b..6c3c841f97 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -322,6 +322,8 @@ namespace Umbraco.Web
 
             container.EnablePerWebRequestScope();
 
+            //no need to declare as per request, it's lifetime is already managed as a singleton
+            container.Register<HttpContextBase>(factory => new HttpContextWrapper(HttpContext.Current));
             container.RegisterSingleton<IHttpContextAccessor, DefaultHttpContextAccessor>();
             container.RegisterSingleton<IUmbracoContextAccessor, DefaultUmbracoContextAccessor>();
             container.RegisterSingleton<IPublishedContentCache>(factory => new PublishedContentCache());
diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index a29f61c984..bffc5050e4 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -18,6 +18,8 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Profiling;
+using Umbraco.Core.Services;
+using Umbraco.Core.Strings;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Scheduling;
@@ -204,13 +206,21 @@ namespace umbraco
 
         private static XmlNode GetPreviewOrPublishedNode(Document d, XmlDocument xmlContentCopy, bool isPreview)
         {
+            var contentItem = d.ContentEntity;
+            var serializer = new EntityXmlSerializer();
+            var services = ApplicationContext.Current.Services;
+
             if (isPreview)
             {
-                return d.ToPreviewXml(xmlContentCopy);
+                var xml = services.ContentService.GetContentPreviewXml(contentItem.Id, contentItem.Version);
+                return xml.GetXmlNode(xmlContentCopy);
+                //return d.ToPreviewXml(xmlContentCopy);
             }
             else
             {
-                return d.ToXml(xmlContentCopy, false);
+                var xml = services.ContentService.GetContentXml(contentItem.Id);
+                return xml.GetXmlNode(xmlContentCopy);
+                //return d.ToXml(xmlContentCopy, false);
             }
         }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsd b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsd
deleted file mode 100644
index 95a257395a..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsd
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:element name="umbPackage">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="info">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="package">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="name" type="xs:string" />
-										<xs:element name="uniqueId" type="xs:string" />
-										<xs:element name="version">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="major" type="xs:unsignedByte" />
-													<xs:element name="minor" type="xs:unsignedByte" />
-													<xs:element name="patch" type="xs:unsignedByte" />
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-										<xs:element name="license">
-											<xs:complexType>
-												<xs:simpleContent>
-													<xs:extension base="xs:string">
-														<xs:attribute name="url" type="xs:string" use="required" />
-													</xs:extension>
-												</xs:simpleContent>
-											</xs:complexType>
-										</xs:element>
-										<xs:element name="url" type="xs:string" />
-										<xs:element name="requirements">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="major" type="xs:unsignedByte" />
-													<xs:element name="minor" type="xs:unsignedByte" />
-													<xs:element name="patch" type="xs:unsignedByte" />
-													<xs:element name="packages">
-														<xs:complexType>
-															<xs:sequence>
-																<xs:element maxOccurs="unbounded" name="package">
-																	<xs:complexType>
-																		<xs:attribute name="guid" type="xs:string" use="required" />
-																		<xs:attribute name="versionMajor" type="xs:unsignedByte" use="required" />
-																		<xs:attribute name="versionMinor" type="xs:unsignedByte" use="required" />
-																		<xs:attribute name="versionPatch" type="xs:unsignedByte" use="required" />
-																	</xs:complexType>
-																</xs:element>
-															</xs:sequence>
-														</xs:complexType>
-													</xs:element>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-										<xs:element name="upgradeBehavior" type="upgradeBehaviorType" />
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-							<xs:element name="author">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="name" type="xs:string" />
-										<xs:element name="website" type="xs:string" />
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-							<xs:element name="readme" type="xs:string" />
-							<xs:element name="documentation">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="releaseNotes" type="xs:string" />
-										<xs:element name="installation" type="xs:string" />
-										<xs:element name="gettingStarted" type="xs:string" />
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="macros">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element maxOccurs="unbounded" name="macro">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="name" type="xs:string" />
-										<xs:element name="alias" type="xs:string" />
-										<xs:element name="scriptType" />
-										<xs:element name="scriptAssembly" />
-										<xs:element name="xslt" type="xs:string" />
-										<xs:element name="useInEditor" type="xs:boolean" />
-										<xs:element name="refreshRate" type="xs:unsignedByte" />
-										<xs:element minOccurs="0" name="properties">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="property">
-														<xs:complexType>
-															<xs:attribute name="show" type="xs:boolean" use="required" />
-															<xs:attribute name="propertyType" type="xs:string" use="required" />
-															<xs:attribute name="alias" type="xs:string" use="required" />
-															<xs:attribute name="name" type="xs:string" use="required" />
-														</xs:complexType>
-													</xs:element>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="files">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element maxOccurs="unbounded" name="file">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="guid" type="xs:string" />
-										<xs:element name="orgPath" type="xs:string" />
-										<xs:element name="orgName" type="xs:string" />
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="commands" type="xs:string" />
-				<xs:element name="control" type="xs:string" />
-				<xs:element name="DocumentTypes">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element maxOccurs="unbounded" name="DocumentType">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="Info">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="Name" type="xs:string" />
-													<xs:element name="Alias" type="xs:string" />
-													<xs:element name="Icon" type="xs:string" />
-													<xs:element name="Thumbnail" type="xs:string" />
-													<xs:element name="Description" type="xs:string" />
-													<xs:element name="AllowedTemplates">
-														<xs:complexType>
-															<xs:sequence>
-																<xs:element name="Template" type="xs:string" />
-															</xs:sequence>
-														</xs:complexType>
-													</xs:element>
-													<xs:element name="DefaultTemplate" type="xs:string" />
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-										<xs:element name="Structure">
-											<xs:complexType>
-												<xs:sequence minOccurs="0">
-													<xs:element name="DocumentType" type="xs:string" />
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-										<xs:element name="Tabs">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element maxOccurs="unbounded" name="Tab">
-														<xs:complexType>
-															<xs:sequence>
-																<xs:element name="Id" type="xs:unsignedByte" />
-																<xs:element name="Caption" type="xs:string" />
-															</xs:sequence>
-														</xs:complexType>
-													</xs:element>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-										<xs:element name="GenericProperties">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element maxOccurs="unbounded" name="GenericProperty">
-														<xs:complexType>
-															<xs:sequence>
-																<xs:element name="Name" type="xs:string" />
-																<xs:element name="Alias" type="xs:string" />
-																<xs:element name="Type" type="xs:string" />
-																<xs:element name="Tab" type="xs:string" />
-																<xs:element name="Mandatory" type="xs:string" />
-																<xs:element name="Validation" />
-																<xs:element name="Description" type="xs:string" />
-															</xs:sequence>
-														</xs:complexType>
-													</xs:element>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Templates">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element maxOccurs="unbounded" name="Template">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="Name" type="xs:string" />
-										<xs:element name="Alias" type="xs:string" />
-										<xs:element name="Master" type="xs:string" />
-										<xs:element name="Design" type="xs:string" />
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Stylesheets">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element maxOccurs="unbounded" name="Stylesheet">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="Name" type="xs:string" />
-										<xs:element name="FileName" />
-										<xs:element name="Content" type="xs:string" />
-										<xs:element minOccurs="0" name="Properties">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element maxOccurs="unbounded" name="Property">
-														<xs:complexType>
-															<xs:sequence>
-																<xs:element name="Name" type="xs:string" />
-																<xs:element name="Alias" type="xs:string" />
-																<xs:element name="Value" type="xs:string" />
-															</xs:sequence>
-														</xs:complexType>
-													</xs:element>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Documents">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="DocumentSet">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="node">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element maxOccurs="unbounded" name="data">
-														<xs:complexType>
-															<xs:simpleContent>
-																<xs:extension base="xs:string">
-																	<xs:attribute name="versionID" type="xs:string" use="required" />
-																	<xs:attribute name="alias" type="xs:string" use="required" />
-																</xs:extension>
-															</xs:simpleContent>
-														</xs:complexType>
-													</xs:element>
-													<xs:element maxOccurs="unbounded" name="node">
-														<xs:complexType>
-															<xs:sequence>
-																<xs:element maxOccurs="unbounded" name="data">
-																	<xs:complexType>
-																		<xs:simpleContent>
-																			<xs:extension base="xs:string">
-																				<xs:attribute name="versionID" type="xs:string" use="required" />
-																				<xs:attribute name="alias" type="xs:string" use="required" />
-																			</xs:extension>
-																		</xs:simpleContent>
-																	</xs:complexType>
-																</xs:element>
-																<xs:element minOccurs="0" maxOccurs="unbounded" name="node">
-																	<xs:complexType>
-																		<xs:sequence>
-																			<xs:element maxOccurs="unbounded" name="data">
-																				<xs:complexType>
-																					<xs:simpleContent>
-																						<xs:extension base="xs:string">
-																							<xs:attribute name="versionID" type="xs:string" use="required" />
-																							<xs:attribute name="alias" type="xs:string" use="required" />
-																						</xs:extension>
-																					</xs:simpleContent>
-																				</xs:complexType>
-																			</xs:element>
-																		</xs:sequence>
-																		<xs:attribute name="id" type="xs:unsignedShort" use="required" />
-																		<xs:attribute name="version" type="xs:string" use="required" />
-																		<xs:attribute name="parentID" type="xs:unsignedShort" use="required" />
-																		<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-																		<xs:attribute name="writerID" type="xs:unsignedByte" use="required" />
-																		<xs:attribute name="creatorID" type="xs:unsignedByte" use="required" />
-																		<xs:attribute name="nodeType" type="xs:unsignedShort" use="required" />
-																		<xs:attribute name="template" type="xs:unsignedShort" use="required" />
-																		<xs:attribute name="sortOrder" type="xs:unsignedByte" use="required" />
-																		<xs:attribute name="createDate" type="xs:dateTime" use="required" />
-																		<xs:attribute name="updateDate" type="xs:dateTime" use="required" />
-																		<xs:attribute name="nodeName" type="xs:string" use="required" />
-																		<xs:attribute name="urlName" type="xs:string" use="required" />
-																		<xs:attribute name="writerName" type="xs:string" use="required" />
-																		<xs:attribute name="creatorName" type="xs:string" use="required" />
-																		<xs:attribute name="nodeTypeAlias" type="xs:string" use="required" />
-																		<xs:attribute name="path" type="xs:string" use="required" />
-																	</xs:complexType>
-																</xs:element>
-															</xs:sequence>
-															<xs:attribute name="id" type="xs:unsignedShort" use="required" />
-															<xs:attribute name="version" type="xs:string" use="required" />
-															<xs:attribute name="parentID" type="xs:unsignedShort" use="required" />
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-															<xs:attribute name="writerID" type="xs:unsignedByte" use="required" />
-															<xs:attribute name="creatorID" type="xs:unsignedByte" use="required" />
-															<xs:attribute name="nodeType" type="xs:unsignedShort" use="required" />
-															<xs:attribute name="template" type="xs:unsignedShort" use="required" />
-															<xs:attribute name="sortOrder" type="xs:unsignedByte" use="required" />
-															<xs:attribute name="createDate" type="xs:dateTime" use="required" />
-															<xs:attribute name="updateDate" type="xs:dateTime" use="required" />
-															<xs:attribute name="nodeName" type="xs:string" use="required" />
-															<xs:attribute name="urlName" type="xs:string" use="required" />
-															<xs:attribute name="writerName" type="xs:string" use="required" />
-															<xs:attribute name="creatorName" type="xs:string" use="required" />
-															<xs:attribute name="nodeTypeAlias" type="xs:string" use="required" />
-															<xs:attribute name="path" type="xs:string" use="required" />
-														</xs:complexType>
-													</xs:element>
-												</xs:sequence>
-												<xs:attribute name="id" type="xs:unsignedShort" use="required" />
-												<xs:attribute name="version" type="xs:string" use="required" />
-												<xs:attribute name="parentID" type="xs:byte" use="required" />
-												<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-												<xs:attribute name="writerID" type="xs:unsignedByte" use="required" />
-												<xs:attribute name="creatorID" type="xs:unsignedByte" use="required" />
-												<xs:attribute name="nodeType" type="xs:unsignedShort" use="required" />
-												<xs:attribute name="template" type="xs:unsignedShort" use="required" />
-												<xs:attribute name="sortOrder" type="xs:unsignedByte" use="required" />
-												<xs:attribute name="createDate" type="xs:dateTime" use="required" />
-												<xs:attribute name="updateDate" type="xs:dateTime" use="required" />
-												<xs:attribute name="nodeName" type="xs:string" use="required" />
-												<xs:attribute name="urlName" type="xs:string" use="required" />
-												<xs:attribute name="writerName" type="xs:string" use="required" />
-												<xs:attribute name="creatorName" type="xs:string" use="required" />
-												<xs:attribute name="nodeTypeAlias" type="xs:string" use="required" />
-												<xs:attribute name="path" type="xs:string" use="required" />
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-									<xs:attribute name="importMode" type="importModeType" use="required" />
-									<xs:attribute name="parentId" type="xs:unsignedByte"  use="optional" />
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:simpleType name = "importModeType">
-		<xs:annotation>
-			<xs:documentation>
-				Decides how umbraco should import documents
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base = "xs:string">
-			<xs:enumeration value = "root"/>
-			<xs:enumeration value = "specified"/>
-			<xs:enumeration value = "ask"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name = "upgradeBehaviorType">
-		<xs:annotation>
-			<xs:documentation>
-				Decides how umbraco should handle if the package or any items with identical aliases/guids
-							have been imported before
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base = "xs:string">
-			<xs:enumeration value = "overwrite"/>
-			<xs:enumeration value = "duplicate"/>
-			<xs:enumeration value = "abort"/>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsx b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsx
deleted file mode 100644
index ff71343be3..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/package.xsx
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
-<XSDDesignerLayout Style="LeftRight" />
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsc b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsc
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsc
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsd b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsd
deleted file mode 100644
index 9bb22b548d..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema id="umbraco" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-	<xs:element name="umbraco" msdata:IsDataSet="true" msdata:Locale="da-DK">
-		<xs:complexType>
-			<xs:choice maxOccurs="unbounded">
-				<xs:element name="node">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="data" nillable="true" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:simpleContent msdata:ColumnName="data_Text" msdata:Ordinal="2">
-										<xs:extension base="xs:string">
-											<xs:attribute name="version" type="xs:string" />
-											<xs:attribute name="alias" type="xs:string" />
-										</xs:extension>
-									</xs:simpleContent>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID" />
-						<xs:attribute name="version" type="xs:string" />
-						<xs:attribute name="parentID" type="xs:string" />
-						<xs:attribute name="level" type="xs:string" />
-						<xs:attribute name="writerID" type="xs:string" />
-						<xs:attribute name="nodeType" type="xs:string" />
-						<xs:attribute name="template" type="xs:string" />
-						<xs:attribute name="sortOrder" type="xs:string" />
-						<xs:attribute name="createDate" type="xs:string" />
-						<xs:attribute name="updateDate" type="xs:string" />
-						<xs:attribute name="nodeName" type="xs:string" />
-						<xs:attribute name="writerName" type="xs:string" />
-						<xs:attribute name="nodeTypeAlias" type="xs:string" />
-						<xs:attribute name="path" type="xs:string" />
-					</xs:complexType>
-				</xs:element>
-			</xs:choice>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xss b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xss
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xss
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsx b/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsx
deleted file mode 100644
index f09e598dcb..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/schemas/umbraco.xsx
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
-<XSDDesignerLayout layoutVersion="2" viewPortLeft="0" viewPortTop="0" zoom="100">
-    <node_XmlElement left="317" top="254" width="5292" height="2963" selected="0" zOrder="1" index="0" expanded="1">
-        <data_XmlElement left="317" top="3725" width="5292" height="2963" selected="0" zOrder="2" index="0" expanded="1" />
-    </node_XmlElement>
-</XSDDesignerLayout>
\ No newline at end of file
diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs
index 132afdbb14..d4e6028a7f 100644
--- a/src/umbraco.cms/businesslogic/CMSNode.cs
+++ b/src/umbraco.cms/businesslogic/CMSNode.cs
@@ -473,6 +473,8 @@ namespace umbraco.cms.businesslogic
         /// <returns>The CMSNode Xmlrepresentation</returns>
         public virtual XmlNode ToXml(XmlDocument xd, bool Deep)
         {
+            throw new NotSupportedException("DO NOT USE THIS METHOD, THIS NEEDS TO BE REMOVED FROM THE CODEBASE, REFACTOR ANYTHING THAT IS USING THIS IF YOU GET THIS EXCEPTION");
+
             XmlNode x = xd.CreateNode(XmlNodeType.Element, "node", "");
             XmlPopulate(xd, x, Deep);
             return x;