Changed how model mappers work for persistence objects so we don't have to statically associate the mapper.

src/Umbraco.Core/Models/Content.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -11,6 +12,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(ContentMapper))]
     public class Content : ContentBase, IContent
     {
         private IContentType _contentType;

src/Umbraco.Core/Models/ContentType.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -11,6 +12,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(ContentTypeMapper))]
     public class ContentType : ContentTypeCompositionBase, IContentType
     {
         private int _defaultTemplate;

src/Umbraco.Core/Models/DataTypeDefinition.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -14,6 +15,7 @@ namespace Umbraco.Core.Models
     /// </remarks>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(DataTypeDefinitionMapper))]
     public class DataTypeDefinition : Entity, IDataTypeDefinition
     {
         private int _parentId;

src/Umbraco.Core/Models/DictionaryItem.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -11,6 +12,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(DictionaryMapper))]
     public class DictionaryItem : Entity, IDictionaryItem
     {
         private Guid _parentId;

src/Umbraco.Core/Models/DictionaryTranslation.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -10,6 +11,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(DictionaryTranslationMapper))]
     public class DictionaryTranslation : Entity, IDictionaryTranslation
     {
         private ILanguage _language;

src/Umbraco.Core/Models/IContent.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Diagnostics;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
     /// <summary>
     /// Defines a Content object
     /// </summary>    
+    [Mapper(typeof(ContentMapper))]
     public interface IContent : IContentBase
     {
         /// <summary>

src/Umbraco.Core/Models/IContentType.cs

@@ -1,10 +1,12 @@
 using System.Collections.Generic;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
     /// <summary>
     /// Defines a ContentType, which Content is based on
     /// </summary>
+    [Mapper(typeof(ContentTypeMapper))]
     public interface IContentType : IContentTypeComposition
     {
         /// <summary>

src/Umbraco.Core/Models/IDataTypeDefinition.cs

@@ -1,8 +1,10 @@
 using System;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
+    [Mapper(typeof(DataTypeDefinitionMapper))]
     public interface IDataTypeDefinition : IUmbracoEntity
     {
         /// <summary>

src/Umbraco.Core/Models/IDictionaryItem.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
+    [Mapper(typeof(DictionaryMapper))]
     public interface IDictionaryItem : IAggregateRoot
     {
         /// <summary>

src/Umbraco.Core/Models/IDictionaryTranslation.cs

@@ -1,8 +1,10 @@
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
+    [Mapper(typeof(DictionaryTranslationMapper))]
     public interface IDictionaryTranslation : IEntity
     {
         /// <summary>

src/Umbraco.Core/Models/ILanguage.cs

@@ -1,9 +1,11 @@
 using System.Globalization;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
+    [Mapper(typeof(LanguageMapper))]
     public interface ILanguage : IAggregateRoot
     {
         /// <summary>

src/Umbraco.Core/Models/IMedia.cs

@@ -1,5 +1,8 @@
-namespace Umbraco.Core.Models
+using Umbraco.Core.Persistence.Mappers;
+
+namespace Umbraco.Core.Models
 {
+    [Mapper(typeof(MediaMapper))]
     public interface IMedia : IContentBase
     {
         /// <summary>

src/Umbraco.Core/Models/IMediaType.cs

@@ -1,8 +1,11 @@
-namespace Umbraco.Core.Models
+using Umbraco.Core.Persistence.Mappers;
+
+namespace Umbraco.Core.Models
 {
     /// <summary>
     /// Defines a ContentType, which Media is based on
     /// </summary>
+    [Mapper(typeof(MediaTypeMapper))]
     public interface IMediaType : IContentTypeComposition
     {
          

src/Umbraco.Core/Models/Language.cs

@@ -3,6 +3,7 @@ using System.Globalization;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -11,6 +12,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(LanguageMapper))]
     public class Language : Entity, ILanguage
     {
         private string _isoCode;

src/Umbraco.Core/Models/Media.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.Serialization;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -8,6 +9,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(MediaMapper))]
     public class Media : ContentBase, IMedia
     {
         private IMediaType _contentType;

src/Umbraco.Core/Models/MediaType.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.Serialization;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -8,6 +9,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(MediaTypeMapper))]
     public class MediaType : ContentTypeCompositionBase, IMediaType
     {
         public MediaType(int parentId) : base(parentId)

src/Umbraco.Core/Models/Membership/IUser.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models.Membership
 {
@@ -6,6 +7,7 @@ namespace Umbraco.Core.Models.Membership
     /// Defines the interface for a <see cref="User"/>
     /// </summary>
     /// <remarks>Will be left internal until a proper Membership implementation is part of the roadmap</remarks>
+    [Mapper(typeof(UserMapper))]
     internal interface IUser : IMembershipUser
     {
         string Name { get; set; }

src/Umbraco.Core/Models/Membership/IUserType.cs

@@ -1,7 +1,9 @@
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models.Membership
 {
+    [Mapper(typeof(UserTypeMapper))]
     internal interface IUserType : IAggregateRoot
     {
         string Alias { get; set; }

src/Umbraco.Core/Models/Membership/User.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models.Membership
 {
@@ -15,6 +16,7 @@ namespace Umbraco.Core.Models.Membership
     /// </remarks>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(UserMapper))]
     internal class User : UserProfile, IUser
     {
         private bool _hasIdentity;

src/Umbraco.Core/Models/Membership/UserType.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models.Membership
 {
@@ -13,6 +14,7 @@ namespace Umbraco.Core.Models.Membership
     /// </remarks>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(UserTypeMapper))]
     internal class UserType : Entity, IUserType
     {
         [DataMember]

src/Umbraco.Core/Models/Property.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -10,6 +11,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(PropertyMapper))]
     public class Property : Entity
     {
         private readonly PropertyType _propertyType;

src/Umbraco.Core/Models/PropertyGroup.cs

@@ -3,6 +3,7 @@ using System.Collections.Specialized;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -11,6 +12,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(PropertyGroupMapper))]
     public class PropertyGroup : Entity, IEquatable<PropertyGroup>
     {
         private string _name;

src/Umbraco.Core/Models/PropertyType.cs

@@ -3,6 +3,7 @@ using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -11,6 +12,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(PropertyTypeMapper))]
     public class PropertyType : Entity, IEquatable<PropertyType>
     {
         //private SerializationService _service;

src/Umbraco.Core/Models/Relation.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -10,6 +11,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(RelationMapper))]
     public class Relation : Entity, IAggregateRoot
     {
         //NOTE: The datetime column from umbracoRelation is set on CreateDate on the Entity

src/Umbraco.Core/Models/RelationType.cs

@@ -2,6 +2,7 @@ using System;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -10,6 +11,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
+    [Mapper(typeof(RelationTypeMapper))]
     public class RelationType : Entity, IAggregateRoot
     {
         private string _name;

src/Umbraco.Core/Models/ServerRegistration.cs

@@ -5,7 +5,7 @@ using Umbraco.Core.Sync;
 
 namespace Umbraco.Core.Models
 {
-    
+    [Mapper(typeof(ServerRegistrationMapper))]
     internal class ServerRegistration : Entity, IServerAddress, IAggregateRoot
     {
         public ServerRegistration()