Bump version number to v.1.3.1-beta

app/Umbraco/Archetype.Tests/Archetype.Tests.csproj

@@ -222,30 +222,11 @@
     <Compile Include="Models\FieldsetTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
-    <Compile Include="Serialization\Base\ArchetypeJsonConverterTestBase.cs" />
-    <Compile Include="Serialization\Base\RegressionTestBase.cs" />
-    <Compile Include="Serialization\Delinter\ArchetypeJsonDelinterTest.cs" />
-    <Compile Include="Serialization\Regression\ArchetypeJsonConverterLegacySetUpTest.cs" />
-    <Compile Include="Serialization\Regression\ArchetypeJsonConverterTest.cs" />
-    <Compile Include="Serialization\Regression\JsonTestLegacyModelSetUp.cs" />
-    <Compile Include="Serialization\Regression\SerializationTestHelper.cs" />
-    <Compile Include="Serialization\Regression\JsonTestModels.cs" />
-    <Compile Include="Serialization\Regression\JsonTestStrings.cs" />
-    <Compile Include="Serialization\UseCases\ArchetypeJsonConverterTest.cs" />
-    <Compile Include="Serialization\UseCases\Complex\ArchetypeJsonConverterTest.cs" />
-    <Compile Include="Serialization\UseCases\Complex\JsonTestModels.cs" />
-    <Compile Include="Serialization\UseCases\Complex\JsonTestStrings.cs" />
-    <Compile Include="Serialization\UseCases\Enumerable\ArchetypeJsonConverterTest.cs" />
-    <Compile Include="Serialization\UseCases\Enumerable\JsonTestModels.cs" />
-    <Compile Include="Serialization\UseCases\Enumerable\JsonTestStrings.cs" />
-    <Compile Include="Serialization\UseCases\JsonTestModels.cs" />
-    <Compile Include="Serialization\UseCases\JsonTestStrings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Data\sample-1.json" />
     <None Include="packages.config" />
-    <None Include="SupportingFiles\config\umbracoSettings.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Archetype\Archetype.Umbraco.csproj">
@@ -261,7 +242,8 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy  $(ProjectDir)SupportingFiles\config\* $(TargetDir)config /I /O /X /E /K /D /Y</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs

@@ -5,9 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Archetype.PropertyConverters;
-using Archetype.Tests.Serialization.UseCases;
 using NUnit.Framework;
-using Archetype.Tests.Serialization;
 
 namespace Archetype.Tests.Models
 {
@@ -59,25 +57,7 @@ namespace Archetype.Tests.Models
             Assert.That(fieldset.GetValue<int>("link") == 3175);
             Assert.That(fieldset.GetValue<bool>("show") == true);
             Assert.That(fieldset.GetValue<string>("blurb") == "A blurb here");
-        }
-
-        [Test]
-        public void Can_Convert_Property_Default_Value_Types() 
-		{
-            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
-
-            var fieldset = result.Fieldsets.First();
-
-            Assert.That(fieldset.GetValue<int>("noSuchInteger", 1234) == 1234);
-            Assert.That(fieldset.GetValue<bool>("noSuchBoolean", true) == true);
-            Assert.That(fieldset.GetValue<bool>("noSuchBoolean", false) == false);
-            Assert.That(fieldset.GetValue<string>("noSuchString", "noSuchString default value") == "noSuchString default value");
-
-            var contactDetails = fieldset.GetValue<ContactDetails>("noSuchContact", new ContactDetails { Address = "some street, some city", Name = "someone" });
-            Assert.That(contactDetails.Address == "some street, some city");
-            Assert.That(contactDetails.Name == "someone");
-        }
+        }  
 
         [Test]
         public void Returns_String_When_No_Type_Specified()
@@ -91,6 +71,5 @@ namespace Archetype.Tests.Models
             Assert.That(property is string);
             Assert.That(property == "3175");
         }
-
     }
 }

app/Umbraco/Archetype.Tests/Serialization/Base/ArchetypeJsonConverterTestBase.cs

@@ -1,33 +0,0 @@
-using Archetype.PropertyConverters;
-using at = Archetype.Models;
-using Newtonsoft.Json;
-
-namespace Archetype.Tests.Serialization.Base
-{
-    public abstract class ArchetypeJsonConverterTestBase
-    {
-        public at.ArchetypeModel ConvertModelToArchetype<T>(T model)
-        {
-            var converter = new ArchetypeValueConverter();
-            var json = JsonConvert.SerializeObject(model);
-            var archetype = (at.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
-            return archetype;
-        }
-
-        public string ConvertModelToArchetypeJson<T>(T model, Formatting formatting = Formatting.None)
-        {
-            return JsonConvert.SerializeObject(model, formatting);
-        }
-
-        public T ConvertArchetypeJsonToModel<T>(string json)
-        {
-            return JsonConvert.DeserializeObject<T>(json);
-        }
-
-        public T ConvertModelToArchetypeAndBack<T>(T model)
-        {
-            var json = ConvertModelToArchetypeJson(model);
-            return ConvertArchetypeJsonToModel<T>(json);
-        }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Base/RegressionTestBase.cs

@@ -1,166 +0,0 @@
-using System.Collections;
-using System.Linq;
-using System.Reflection;
-using Archetype.Serialization;
-using Moq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Services;
-
-namespace Archetype.Tests.Serialization.Base
-{
-    public abstract class RegressionTestBase : ArchetypeJsonConverterTestBase
-    {
-        protected void SimpleModel_Regression_Battery<T>(T model)
-        {
-            var archetype = ConvertModelToArchetype(model);
-            Assert.IsNotNull(archetype);
-
-            var archetypeJson = archetype.SerializeForPersistence();
-            var modelJson = ConvertModelToArchetypeJson(model, Formatting.Indented);
-
-            Assert.IsNotNullOrEmpty(modelJson);
-
-            var result = ConvertModelToArchetypeAndBack(model);
-            var resultfromArchetypeJson = ConvertArchetypeJsonToModel<T>(archetypeJson);
-
-            Assert.IsInstanceOf<T>(result);
-            Assert.IsInstanceOf<T>(resultfromArchetypeJson);
-            AssertAreEqual(model, result);
-            AssertAreEqual(model, resultfromArchetypeJson);
-        }
-
-        protected void SimpleModels_Regression_Battery<T>(T model)
-            where T : IList
-        {
-            var archetype = ConvertModelToArchetype(model);
-            Assert.IsNotNull(archetype);
-
-            var archetypeJson = archetype.SerializeForPersistence();
-            var modelJson = ConvertModelToArchetypeJson(model, Formatting.Indented);
-
-            Assert.IsNotNullOrEmpty(modelJson);
-
-            var result = ConvertModelToArchetypeAndBack(model);
-            var resultfromArchetypeJson = ConvertArchetypeJsonToModel<T>(archetypeJson);
-
-            Assert.IsInstanceOf<T>(result);
-            Assert.IsInstanceOf<T>(resultfromArchetypeJson);
-
-            Assert.AreEqual(model.Count, result.Count);
-            Assert.AreEqual(model.Count, resultfromArchetypeJson.Count);
-
-            foreach (var resultItem in result)
-            {
-                var index = result.IndexOf(resultItem);
-                AssertAreEqual(model[index], resultItem);
-            }
-
-            foreach (var resultItem in resultfromArchetypeJson)
-            {
-                var index = resultfromArchetypeJson.IndexOf(resultItem);
-                AssertAreEqual(model[index], resultItem);
-            }
-        }
-
-        protected void CompoundModel_Regression_Battery<T>(T model)
-        {
-            var archetype = ConvertModelToArchetype(model);
-            Assert.IsNotNull(archetype);
-
-            var archetypeJson = archetype.SerializeForPersistence();
-            var modelJson = ConvertModelToArchetypeJson(model, Formatting.Indented);
-
-            Assert.IsNotNullOrEmpty(modelJson);
-
-            var result = ConvertModelToArchetypeAndBack(model);
-            var resultfromArchetypeJson = ConvertArchetypeJsonToModel<T>(archetypeJson);
-
-            Assert.IsInstanceOf<T>(result);
-            AssertAreEqual(model, result);
-
-            Assert.IsInstanceOf<T>(resultfromArchetypeJson);
-            AssertAreEqual(model, resultfromArchetypeJson);
-        }
-
-        protected void NestedModel_Regression_Battery<T>(T model)
-        {
-            CompoundModel_Regression_Battery(model);
-        }
-
-        protected void ComplexModel_Regression_Battery<T>(T model)
-        {
-            CompoundModel_Regression_Battery(model);
-        }
-
-        protected void AssertAreEqual<T>(T model, T result)
-        {
-            foreach (var propInfo in model.GetSerialiazableProperties())
-            {
-                var expected = GetExpectedValue(model, propInfo);
-                var actual = GetActualValue(result, propInfo);
-                
-                if (propInfo.PropertyType.Namespace.Equals("System"))
-                {
-                    Assert.AreEqual(expected, actual);                 
-                    continue;
-                }
-
-                var list = expected as IList;
-                if (list != null)
-                {
-                    foreach (var expectedItem in list)
-                    {
-                        var index = list.IndexOf(expectedItem);
-                        AssertAreEqual(expectedItem, ((IList)actual)[index]);
-                    }
-                    continue;
-                }
-
-                AssertAreEqual(expected, actual);
-            }
-        }
-
-        protected void EnsureUmbracoContext(Mock<IDataTypeService> dataTypeService)
-        {
-            var cacheHelper = CacheHelper.CreateDisabledCacheHelper();
-            var serviceContext = new ServiceContext(
-                Mock.Of<IContentService>(),
-                Mock.Of<IMediaService>(),
-                Mock.Of<IContentTypeService>(),
-                dataTypeService.Object,
-                Mock.Of<IFileService>(),
-                Mock.Of<ILocalizationService>(),
-                Mock.Of<IPackagingService>(),
-                Mock.Of<IEntityService>(),
-                Mock.Of<IRelationService>(),
-                Mock.Of<IMemberGroupService>(),
-                Mock.Of<IMemberTypeService>(),
-                Mock.Of<IMemberService>(),
-                Mock.Of<IUserService>(),
-                Mock.Of<ISectionService>(),
-                Mock.Of<IApplicationTreeService>(),
-                Mock.Of<ITagService>(),
-                Mock.Of<INotificationService>()
-                );
-
-            ApplicationContext.EnsureContext(
-                new DatabaseContext(Mock.Of<IDatabaseFactory>()), serviceContext, cacheHelper, true);
-        }
-
-        private object GetExpectedValue<T>(T expected, PropertyInfo propInfo)
-        {
-            return propInfo.GetValue(expected, null);
-        }
-
-        private object GetActualValue<T>(T actual, PropertyInfo propInfo)
-        {
-            var actualProp = actual.GetSerialiazableProperties().SingleOrDefault(pinfo => pinfo.Name.Equals(propInfo.Name));
-            return actualProp != null
-                ? actualProp.GetValue(actual, null)
-                : null;
-        }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Delinter/ArchetypeJsonDelinterTest.cs

@@ -1,253 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Archetype.PropertyEditors;
-using Archetype.Serialization;
-using Archetype.Tests.Serialization.Base;
-using Moq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Editors;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-
-namespace Archetype.Tests.Serialization.Delinter
-{
-    [TestFixture]
-    public class ArchetypeJsonDelinterTest : RegressionTestBase
-    {
-        private const string _ESCAPED_JSON = @"{""fieldsets"":[{""properties"":[{""alias"":""slides"",""value"":""2680""}],""alias"":""slides""},{""properties"":[{""alias"":""captions"",""value"":""{\""fieldsets\"":[{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test1 test1\""}],\""alias\"":\""textstringArray\""},{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test2  test2\""}],\""alias\"":\""textstringArray\""},{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test3b   test3b\""}],\""alias\"":\""textstringArray\""}]}""}],""alias"":""captions""}]}";
-        private const string _JSON = @"{""fieldsets"":[{""properties"":[{""alias"":""slides"",""value"":""2680""}],""alias"":""slides""},{""properties"":[{""alias"":""captions"",""value"":{""fieldsets"":[{""properties"":[{""alias"":""textstring"",""value"":""test1 test1""}],""alias"":""textstringArray""},{""properties"":[{""alias"":""textstring"",""value"":""test2  test2""}],""alias"":""textstringArray""},{""properties"":[{""alias"":""textstring"",""value"":""test3b   test3b""}],""alias"":""textstringArray""}]}}],""alias"":""captions""}]}";
-        private const string _ESCAPED_JSON_DEEP_NESTED = @"{""fieldsets"":[{""properties"":[{""alias"":""pages"",""value"":""""},{""alias"":""captions"",""value"":""{\""fieldsets\"":[{\""properties\"":[{\""alias\"":\""captions\"",\""value\"":\""{\\\""fieldsets\\\"":[{\\\""properties\\\"":[{\\\""alias\\\"":\\\""textString\\\"",\\\""value\\\"":\\\""{\\\\\\\""fieldsets\\\\\\\"":[{\\\\\\\""properties\\\\\\\"":[{\\\\\\\""alias\\\\\\\"":\\\\\\\""textString\\\\\\\"",\\\\\\\""value\\\\\\\"":\\\\\\\""\\\\\\\""}],\\\\\\\""alias\\\\\\\"":\\\\\\\""textItem\\\\\\\""}]}\\\""}],\\\""alias\\\"":\\\""textList\\\""}]}\""}],\""alias\"":\""captions\""}]}""}],""alias"":""pages""}]}";
-        private const string _ESCAPED_JSON_FROM_APP = @"{
-  ""alias"": ""captions"",
-  ""value"": ""{\""fieldsets\"":[{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test1 test1\""}],\""alias\"":\""textstringArray\""},{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test2  test2\""}],\""alias\"":\""textstringArray\""},{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test3b   test3b\""}],\""alias\"":\""textstringArray\""}]}""
-}";
-
-        private SlideShow _referenceModel;
-        private NestedClass _nestedClass;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _referenceModel = new SlideShow()
-            {
-                Slides = "2680",
-                Captions = new Captions()
-                {
-                    new TextString(){Text = "test1 test1"},
-                    new TextString(){Text = "test2  test2"},
-                    new TextString(){Text = "test3b   test3b"}
-                }
-            };
-
-            _nestedClass = GetNestedClass();
-            _nestedClass.SlideShow = _referenceModel;
-            _nestedClass.Nested = GetNestedClass();
-            _nestedClass.Nested.SlideShow = _referenceModel;
-            _nestedClass.Nested.Nested = GetNestedClass();
-
-        }
-
-        [Test]
-        public void Delinter_RemoveNewLine_ByPasses_Values()
-        {
-            const string _JSON_WITH_RESERVED_CHARS = @"{
-  ""alias"": ""captions"",
-  ""value"": ""{   \""fieldsets\"":    [
-{
-              \""properties\"":
-    [
-{          \""alias\"":    \""textstring\""   ,    \""value\"":\""test1 \r\n  test1\r\n\""}],        \""alias\"":\""textstringArray\""    },{\""properties\"":  [   {   \""alias\"":\""textstring\"",\""value\"":\""test2\r\ntest2\""}],\""alias\"":\""textstringArray\""},{\""properties\"":[{\""alias\"":\""textstring\"",\""value\"":\""test3b \""quote\""   \\r\\r\\rtest3\""}],\""alias\"":\""textstringArray\""   }    ]    }""
-}";
-
-            var referenceModel = new Captions()
-            {
-                new TextString() {Text = @"test1 
-  test1
-"},
-                new TextString() {Text = @"test2
-test2"},
-                new TextString() {Text = @"test3b ""quote""   \r\r\rtest3"}
-            };
-
-            var delintedJson = _JSON_WITH_RESERVED_CHARS.DelintArchetypeJson();
-            var actualModel = ConvertArchetypeJsonToModel<Captions>(delintedJson);
-
-            var t = JToken.Parse(delintedJson).ToString(Formatting.None);
-
-            Assert.IsInstanceOf<Captions>(actualModel);
-            Assert.IsNotNull(actualModel);
-
-            Assert.AreEqual(3, actualModel.Count);
-
-            foreach (var refItem in referenceModel)
-            {
-                var index = referenceModel.IndexOf(refItem);
-                AssertAreEqual(refItem, actualModel.ElementAt(index));
-            }
-        }
-
-        [Test]
-        public void ReferenceJsonAndModel_Equal_ExpectedJsonAndModel()
-        {
-            const string expectedJson = _JSON;
-
-            var expectedModel = ConvertArchetypeJsonToModel<SlideShow>(expectedJson);
-            var referenceModel = ConvertModelToArchetypeAndBack(_referenceModel);
-
-            Assert.IsInstanceOf<SlideShow>(expectedModel);
-            Assert.IsInstanceOf<SlideShow>(referenceModel);
-
-            Assert.AreEqual(3, expectedModel.Captions.Count);
-            Assert.AreEqual(3, referenceModel.Captions.Count);
-
-            AssertAreEqual(expectedModel, referenceModel);
-        }
-
-        [Test]
-        public void UnescapedJsonAndModel_Equal_ExpectedJsonAndModel()
-        {
-            const string expectedJson = _JSON;
-            var unescapedJson = _ESCAPED_JSON.DelintArchetypeJson();
-
-            var expectedModel = ConvertArchetypeJsonToModel<SlideShow>(expectedJson);
-            var actualModel = ConvertArchetypeJsonToModel<SlideShow>(unescapedJson);
-
-            Assert.IsInstanceOf<SlideShow>(expectedModel);
-            Assert.IsInstanceOf<SlideShow>(actualModel);
-
-            Assert.AreEqual(3, expectedModel.Captions.Count);
-            Assert.AreEqual(3, actualModel.Captions.Count);
-
-            AssertAreEqual(expectedModel, actualModel);
-        }
-
-        [Test]
-        public void EscapedJson_FromApp_SerializesToModel()
-        {
-            var delintedJson = _ESCAPED_JSON_FROM_APP.DelintArchetypeJson();
-
-            var referenceModel = new Captions()
-            {
-                new TextString() {Text = "test1 test1"},
-                new TextString() {Text = "test2  test2"},
-                new TextString() {Text = "test3b   test3b"}
-            };
-
-            var actualModel = ConvertArchetypeJsonToModel<Captions>(delintedJson);
-
-            Assert.IsInstanceOf<Captions>(actualModel);
-            Assert.AreEqual(3, actualModel.Count);
-
-            foreach (var refItem in referenceModel)
-            {
-                var index = referenceModel.IndexOf(refItem);
-                AssertAreEqual(refItem, actualModel.ElementAt(index));
-            }
-        }
-
-        [Test]
-        public void DeepNestedJson_Escapes_Correctly()
-        {
-            var propGuid = new Guid();
-            var dtd = new DataTypeDefinition(-1, String.Empty) { Id = 0 };
-
-            var dataTypeService = new Mock<IDataTypeService>();
-            dataTypeService.Setup(dts => dts.GetDataTypeDefinitionById(Guid.Parse(propGuid.ToString()))).Returns(dtd);
-            dataTypeService.Setup(dts => dts.GetPreValuesCollectionByDataTypeId(dtd.Id)).Returns(new PreValueCollection(new Dictionary<string, PreValue>()));
-
-            var propValueEditor = new Mock<ArchetypePropertyEditor.ArchetypePropertyValueEditor>(new PropertyValueEditor());
-            propValueEditor.Setup(pe => pe.GetPropertyEditor(dtd)).Returns(new ArchetypePropertyEditor());
-
-            var archetype = ConvertModelToArchetype(_nestedClass);
-
-            foreach (var prop in archetype.Fieldsets.SelectMany(fs => fs.Properties))
-            {
-                prop.DataTypeGuid = propGuid.ToString();
-                if (prop.Value.ToString().Contains("fieldsets"))
-                    prop.PropertyEditorAlias = Constants.PropertyEditorAlias;
-            }
-
-            var archetypeJson = JsonConvert.SerializeObject(archetype);
-            Assert.IsNotNullOrEmpty(archetypeJson);
-
-            EnsureUmbracoContext(dataTypeService);
-
-            var propEditor = new ArchetypePropertyEditor.ArchetypePropertyValueEditor(new PropertyValueEditor());
-            var convertedJson = propEditor.ConvertEditorToDb(new ContentPropertyData(JObject.FromObject(archetype),
-                new PreValueCollection(new Dictionary<string, PreValue>()), new Dictionary<string, object>()),
-                archetypeJson);
-
-            Assert.IsNotNull(convertedJson);
-
-            var delintedJson = convertedJson.ToString().DelintArchetypeJson();
-            Assert.IsNotNullOrEmpty(delintedJson);
-
-            var modelfromArchetypeJson = ConvertArchetypeJsonToModel<NestedClass>(archetypeJson);
-            var modelfromConvertedJson = ConvertArchetypeJsonToModel<NestedClass>(delintedJson);
-
-            Assert.IsInstanceOf<NestedClass>(modelfromArchetypeJson);
-            Assert.IsInstanceOf<NestedClass>(modelfromConvertedJson);
-
-            Assert.AreEqual(3, modelfromArchetypeJson.SlideShow.Captions.Count);
-            Assert.AreEqual(3, modelfromConvertedJson.SlideShow.Captions.Count);
-
-            Assert.AreEqual(3, modelfromArchetypeJson.Nested.SlideShow.Captions.Count);
-            Assert.AreEqual(3, modelfromConvertedJson.Nested.SlideShow.Captions.Count);
-
-            AssertAreEqual(modelfromArchetypeJson, modelfromConvertedJson);
-
-        }
-
-        #region private methods
-
-        private NestedClass GetNestedClass()
-        {
-            return new NestedClass();
-        }
-
-        #endregion
-
-        #region classes
-
-        [AsArchetype("slides")]
-        [JsonConverter(typeof(ArchetypeJsonConverter))]
-        public class SlideShow
-        {
-            [JsonProperty("slides")]
-            public string Slides { get; set; }
-            [AsFieldset]
-            [JsonProperty("captions")]
-            public Captions Captions { get; set; }
-        }
-
-        [AsArchetype("textstringArray")] /* Note: when inheriting from a list, archetype alias is not used */
-        [JsonConverter(typeof(ArchetypeJsonConverter))]
-        public class Captions : List<TextString>
-        {
-        }
-
-        [AsArchetype("textstringArray")] /* due to hard coded string calues above, must have same archetype alias as list class */
-        [JsonConverter(typeof(ArchetypeJsonConverter))]
-        public class TextString
-        {
-            [JsonProperty("textstring")]
-            public String Text { get; set; }
-        }
-
-        [AsArchetype("nestedClass")]
-        [JsonConverter(typeof(ArchetypeJsonConverter))]
-        public class NestedClass
-        {
-            [JsonProperty("nestedClass")]
-            public NestedClass Nested { get; set; }
-            [JsonProperty("slides")]
-            public SlideShow SlideShow { get; set; }
-        }
-
-        #endregion
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Regression/ArchetypeJsonConverterLegacySetUpTest.cs

@@ -1,25 +0,0 @@
-using System.Linq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-
-namespace Archetype.Tests.Serialization.Regression
-{
-    [TestFixture]
-    public class ArchetypeJsonConverterLegacySetUpTest
-    {
-        [Test]
-        public void Deserialize_SlideShow_FromArchetype()
-        {
-            var result = JsonConvert.DeserializeObject<SlideShow>(JsonTestStrings._SLIDES_JSON);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<SlideShow>(result);
-
-            Assert.AreEqual("1,2,3,4,5", result.Slides);
-            Assert.AreEqual("Test 1", result.Captions.TextStringArray.ElementAt(0).Text);
-            Assert.AreEqual("Test 2", result.Captions.TextStringArray.ElementAt(1).Text);
-            Assert.AreEqual("Test 3", result.Captions.TextStringArray.ElementAt(2).Text);
-            Assert.AreEqual("Test 4", result.Captions.TextStringArray.ElementAt(3).Text);
-        }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Regression/ArchetypeJsonConverterTest.cs

@@ -1,150 +0,0 @@
-using Archetype.Tests.Serialization.Base;
-using Newtonsoft.Json;
-using NUnit.Framework;
-
-namespace Archetype.Tests.Serialization.Regression
-{
-    [TestFixture]
-    public class ArchetypeJsonConverterTest : RegressionTestBase
-    {
-        private SerializationTestHelper _testHelper;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _testHelper = new SerializationTestHelper();
-        }
-
-        [Test]
-        public void EmptyArray_Returns_Null()
-        {
-            var archetypeJson = @"{""fieldsets"": []}";
-            var result = ConvertArchetypeJsonToModel<SimpleModel>(archetypeJson);
-
-            Assert.IsNull(result);
-        }
-        
-        [Test]
-        public void SimpleModel_Regression_Battery()
-        {
-            var simpleModel = _testHelper.GetModel<SimpleModel>();
-            SimpleModel_Regression_Battery(simpleModel);
-
-            var json = ConvertModelToArchetypeJson(simpleModel, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._SIMPLE_JSON, json);
-        }
-
-        [Test]
-        public void SimpleModelWithFieldsets_Regression_Battery()
-        {
-            var simpleModel = _testHelper.GetModel<SimpleModelWithFieldsets>();
-            SimpleModel_Regression_Battery(simpleModel);
-        }
-
-        [Test]
-        public void SimpleModelWithMixedFieldsets_Regression_Battery()
-        {
-            var simpleModel = _testHelper.GetModel<SimpleModelWithMixedFieldsets>();
-            SimpleModel_Regression_Battery(simpleModel);
-        }
-
-        [Test]
-        public void SimpleModels_Regression_Battery()
-        {
-            var simpleModels = _testHelper.GetModel<SimpleModels>();
-            SimpleModels_Regression_Battery(simpleModels);
-        }
-
-        [Test]
-        public void SimpleModelsWithFieldsets_Regression_Battery()
-        {
-            var simpleModels = _testHelper.GetModel<SimpleModelsWithFieldsets>();
-            SimpleModels_Regression_Battery(simpleModels);
-        }
-
-        [Test]
-        public void SimpleModelsWithMixedFieldsets_Regression_Battery()
-        {
-            var simpleModels = _testHelper.GetModel<SimpleModelsWithMixedFieldsets>();
-            SimpleModels_Regression_Battery(simpleModels);
-        }
-
-        [Test]
-        public void CompoundModel_Regression_Battery()
-        {
-            var compoundModel = _testHelper.GetModel<CompoundModel>();
-            CompoundModel_Regression_Battery(compoundModel);
-        }
-
-        [Test]
-        public void CompoundModelWithMixedFieldsetVariant1_Regression_Battery()
-        {
-            var compoundModel = _testHelper.GetModel<CompoundModelWithMixedFieldsetVariant1>();
-            CompoundModel_Regression_Battery(compoundModel);
-        }
-
-        [Test]
-        public void CompoundModelWithMixedFieldsetVariant2_Regression_Battery()
-        {
-            var compoundModel = _testHelper.GetModel<CompoundModelWithMixedFieldsetVariant2>();
-            CompoundModel_Regression_Battery(compoundModel);
-        }
-
-        [Test]
-        public void CompoundModelWithFieldset_Regression_Battery()
-        {
-            var compoundModel = _testHelper.GetModel<CompoundModelWithFieldset>();
-            CompoundModel_Regression_Battery(compoundModel);
-        }
-
-        [Test]
-        public void CompoundModelWithList_Regression_Battery()
-        {
-            var compoundModelWithList = _testHelper.GetModel<CompoundModelWithList>();
-            CompoundModel_Regression_Battery(compoundModelWithList);
-        }
-
-        [Test]
-        public void CompoundModelWithMixedFieldsetWithList_Regression_Battery()
-        {
-            var compoundModelWithList = _testHelper.GetModel<CompoundModelWithMixedFieldsetWithList>();
-            CompoundModel_Regression_Battery(compoundModelWithList);
-        }
-
-        [Test]
-        public void CompoundModelWithFieldsetWithList_Regression_Battery()
-        {
-            var compoundModelWithList = _testHelper.GetModel<CompoundModelWithFieldsetWithList>();
-            CompoundModel_Regression_Battery(compoundModelWithList);
-        }
-
-        [Test]
-        public void NestedModel_Regression_Battery()
-        {
-            var nestedModel = _testHelper.GetModel<NestedModel>();
-            NestedModel_Regression_Battery(nestedModel);
-        }
-
-        [Test]
-        public void NestedModelWithMixedFieldset_Regression_Battery()
-        {
-            var nestedModel = _testHelper.GetModel<NestedModelWithMixedFieldset>();
-            NestedModel_Regression_Battery(nestedModel);
-        }
-
-        [Test]
-        public void NestedModelWithFieldset_Regression_Battery()
-        {
-            var nestedModel = _testHelper.GetModel<NestedModelWithFieldset>();
-            NestedModel_Regression_Battery(nestedModel);
-        }
-
-        [Test]
-        public void ComplexModel_Regression_Battery()
-        {
-            var complexModel = _testHelper.GetModel<ComplexModel>();
-            NestedModel_Regression_Battery(complexModel);
-        }
-
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestLegacyModelSetUp.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Archetype.Serialization;
-using Newtonsoft.Json;
-
-namespace Archetype.Tests.Serialization.Regression
-{
-    [AsArchetype("textstringArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class TextString
-    {
-        [JsonProperty("textstring")]
-        public String Text { get; set; }
-    }
-
-    [AsArchetype("textstringArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class TextStringArray : List<TextString>
-    {
-
-    }
-
-    [AsArchetype("captions")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Captions
-    {
-        [JsonProperty("captions")]
-        public TextStringArray TextStringArray { get; set; }
-    }
-
-    [AsArchetype("slides")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SlideShow
-    {
-        [JsonProperty("slides")]
-        public string Slides { get; set; }
-        [AsFieldset]
-        [JsonProperty("captions")]
-        public Captions Captions { get; set; }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestModels.cs

@@ -1,257 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Archetype.Serialization;
-using Newtonsoft.Json;
-
-namespace Archetype.Tests.Serialization.Regression
-{
-    [AsArchetype("simpleModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SimpleModel
-    {
-        [JsonProperty("text")]        
-        public String Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-        [JsonProperty("nullableInteger")]
-        public int? NullableId { get; set; }
-        [JsonProperty("double")]
-        public double Amount { get; set; }
-        [JsonProperty("nullableDouble")]
-        public double? NullableAmount { get; set; }
-        [JsonProperty("dateTime")]
-        public DateTime DateOne { get; set; }
-        [JsonProperty("nullableDateTime")]
-        public DateTime? DateTwo { get; set; }
-    }
-
-    [AsArchetype("simpleModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SimpleModelWithFieldsets
-    {
-        [AsFieldset]
-        [JsonProperty("text")]
-        public string Text { get; set; }
-        [AsFieldset]
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-        [AsFieldset]
-        [JsonProperty("nullableInteger")]
-        public int? NullableId { get; set; }
-        [AsFieldset]
-        [JsonProperty("double")]
-        public double Amount { get; set; }
-        [AsFieldset]
-        [JsonProperty("nullableDouble")]
-        public double? NullableAmount { get; set; }
-        [AsFieldset]
-        [JsonProperty("dateTime")]
-        public DateTime DateOne { get; set; }
-        [AsFieldset]
-        [JsonProperty("nullableDateTime")]
-        public DateTime? DateTwo { get; set; }
-    }
-
-    [AsArchetype("simpleModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SimpleModelWithMixedFieldsets
-    {
-        [AsFieldset]
-        [JsonProperty("text")]
-        public string Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-        [AsFieldset]
-        [JsonProperty("nullableInteger")]
-        public int? NullableId { get; set; }
-        [JsonProperty("double")]
-        public double Amount { get; set; }
-        [AsFieldset]
-        [JsonProperty("nullableDouble")]
-        public double? NullableAmount { get; set; }
-        [AsFieldset]
-        [JsonProperty("dateTime")]
-        public DateTime DateOne { get; set; }
-        public DateTime? DateTwo { get; set; }
-    }
-
-    [AsArchetype("simpleModels")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SimpleModels : List<SimpleModel>
-    {
-    }
-
-    [AsArchetype("simpleModels")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SimpleModelsWithFieldsets : List<SimpleModelWithFieldsets>
-    {
-    }
-
-    [AsArchetype("simpleModels")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SimpleModelsWithMixedFieldsets : List<SimpleModelWithMixedFieldsets>
-    {
-    }
-
-    [AsArchetype("compoundModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModel
-    {
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("compoundModelWithMixedFieldset")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWithMixedFieldsetVariant1
-    {
-        [AsFieldset]
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("compoundModelWithMixedFieldset")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWithMixedFieldsetVariant2
-    {        
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [AsFieldset]
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [AsFieldset]
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("compoundModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWithFieldset
-    {
-        [AsFieldset]
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [AsFieldset]
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [AsFieldset]
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("compoundModelWithList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWithList
-    {
-        [JsonProperty("simpleModelList")]
-        public List<SimpleModel> SimpleModelList { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("compoundModelWithList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWithMixedFieldsetWithList
-    {
-        [JsonProperty("simpleModelList")]
-        public List<SimpleModel> SimpleModelList { get; set; }
-        [AsFieldset]
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("compoundModelWithList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWithFieldsetWithList
-    {
-        [AsFieldset]
-        [JsonProperty("simpleModelList")]
-        public List<SimpleModel> SimpleModelList { get; set; }
-        [AsFieldset]
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [AsFieldset]
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("nestedModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class NestedModel
-    {
-        [JsonProperty("compoundModel")]
-        public CompoundModel CompoundModel { get; set; }
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("nestedModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class NestedModelWithMixedFieldset
-    {
-        [JsonProperty("compoundModel")]
-        public CompoundModel CompoundModel { get; set; }
-        [AsFieldset]
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [AsFieldset]
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("nestedModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class NestedModelWithFieldset
-    {
-        [AsFieldset]
-        [JsonProperty("compoundModel")]
-        public CompoundModel CompoundModel { get; set; }
-        [AsFieldset]
-        [JsonProperty("simpleModel")]
-        public SimpleModel SimpleModel { get; set; }
-        [AsFieldset]
-        [JsonProperty("text")]
-        public String Text { get; set; }
-        [AsFieldset]
-        [JsonProperty("integer")]
-        public int Id { get; set; }
-    }
-
-    [AsArchetype("complexModel")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class ComplexModel
-    {
-        [JsonProperty("compoundModels")]
-        public CompoundModelWrapper CompoundModelWrapper { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-    }
-
-    [AsArchetype("compoundModelWrapper")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompoundModelWrapper
-    {
-        [JsonProperty("compoundModels")]
-        public List<CompoundModel> CompoundModels { get; set; }
-        [JsonProperty("text")]
-        public String Text { get; set; }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestStrings.cs

@@ -1,124 +0,0 @@
-namespace Archetype.Tests.Serialization.Regression
-{
-    public class JsonTestStrings
-    {
-        public const string _SIMPLE_JSON = @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""simpleModel"",
-      ""properties"": [
-        {
-          ""alias"": ""text"",
-          ""value"": ""Test \r\nText \""quote\"" \r\n""
-        },
-        {
-          ""alias"": ""integer"",
-          ""value"": ""123""
-        },
-        {
-          ""alias"": ""nullableInteger"",
-          ""value"": """"
-        },
-        {
-          ""alias"": ""double"",
-          ""value"": ""5.67""
-        },
-        {
-          ""alias"": ""nullableDouble"",
-          ""value"": """"
-        },
-        {
-          ""alias"": ""dateTime"",
-          ""value"": ""01/01/2000 00:00:00""
-        },
-        {
-          ""alias"": ""nullableDateTime"",
-          ""value"": """"
-        }
-      ]
-    }
-  ]
-}";
-        public const string _ESCAPED_JSON =
-@"{
-   ""fieldsets"":[
-      {
-         ""properties"":[
-            {
-               ""alias"":""pages"",
-               ""value"":""2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453""
-            },
-            {
-               ""alias"":""captions"",
-               ""value"":""{\""fieldsets\"":[{\""properties\"":[{\""alias\"":\""captions\"",\""value\"":\""{\\\""fieldsets\\\"":[{\\\""properties\\\"":[{\\\""alias\\\"":\\\""textString\\\"",\\\""value\\\"":\\\""{\\\\\\\""fieldsets\\\\\\\"":[{\\\\\\\""properties\\\\\\\"":[{\\\\\\\""alias\\\\\\\"":\\\\\\\""textString\\\\\\\"",\\\\\\\""value\\\\\\\"":\\\\\\\""First Page\\\\\\\"",\\\\\\\""propertyEditorAlias\\\\\\\"":\\\\\\\""Umbraco.Textbox\\\\\\\"",\\\\\\\""dataTypeId\\\\\\\"":-88,\\\\\\\""dataTypeGuid\\\\\\\"":\\\\\\\""0cc0eba1-9960-42c9-bf9b-60e150b429ae\\\\\\\""}],\\\\\\\""alias\\\\\\\"":\\\\\\\""textItem\\\\\\\""}]}\\\"",\\\""propertyEditorAlias\\\"":\\\""Imulus.Archetype\\\"",\\\""dataTypeId\\\"":3764,\\\""dataTypeGuid\\\"":\\\""496cfe35-448f-4b59-9c75-050798afdce4\\\""}],\\\""alias\\\"":\\\""textList\\\""},{\\\""properties\\\"":[{\\\""alias\\\"":\\\""textString\\\"",\\\""value\\\"":\\\""{\\\\\\\""fieldsets\\\\\\\"":[{\\\\\\\""properties\\\\\\\"":[{\\\\\\\""alias\\\\\\\"":\\\\\\\""textString\\\\\\\"",\\\\\\\""value\\\\\\\"":\\\\\\\""Second Page\\\\\\\"",\\\\\\\""propertyEditorAlias\\\\\\\"":\\\\\\\""Umbraco.Textbox\\\\\\\"",\\\\\\\""dataTypeId\\\\\\\"":-88,\\\\\\\""dataTypeGuid\\\\\\\"":\\\\\\\""0cc0eba1-9960-42c9-bf9b-60e150b429ae\\\\\\\""}],\\\\\\\""alias\\\\\\\"":\\\\\\\""textItem\\\\\\\""}]}\\\"",\\\""propertyEditorAlias\\\"":\\\""Imulus.Archetype\\\"",\\\""dataTypeId\\\"":3764,\\\""dataTypeGuid\\\"":\\\""496cfe35-448f-4b59-9c75-050798afdce4\\\""}],\\\""alias\\\"":\\\""textList\\\""},{\\\""properties\\\"":[{\\\""alias\\\"":\\\""textString\\\"",\\\""value\\\"":\\\""{\\\\\\\""fieldsets\\\\\\\"":[{\\\\\\\""properties\\\\\\\"":[{\\\\\\\""alias\\\\\\\"":\\\\\\\""textString\\\\\\\"",\\\\\\\""value\\\\\\\"":\\\\\\\""Third Page\\\\\\\"",\\\\\\\""propertyEditorAlias\\\\\\\"":\\\\\\\""Umbraco.Textbox\\\\\\\"",\\\\\\\""dataTypeId\\\\\\\"":-88,\\\\\\\""dataTypeGuid\\\\\\\"":\\\\\\\""0cc0eba1-9960-42c9-bf9b-60e150b429ae\\\\\\\""}],\\\\\\\""alias\\\\\\\"":\\\\\\\""textItem\\\\\\\""}]}\\\"",\\\""propertyEditorAlias\\\"":\\\""Imulus.Archetype\\\"",\\\""dataTypeId\\\"":3764,\\\""dataTypeGuid\\\"":\\\""496cfe35-448f-4b59-9c75-050798afdce4\\\""}],\\\""alias\\\"":\\\""textList\\\""},{\\\""properties\\\"":[{\\\""alias\\\"":\\\""textString\\\"",\\\""value\\\"":\\\""{\\\\\\\""fieldsets\\\\\\\"":[{\\\\\\\""properties\\\\\\\"":[{\\\\\\\""alias\\\\\\\"":\\\\\\\""textString\\\\\\\"",\\\\\\\""value\\\\\\\"":\\\\\\\""Fourth Page\\\\\\\"",\\\\\\\""propertyEditorAlias\\\\\\\"":\\\\\\\""Umbraco.Textbox\\\\\\\"",\\\\\\\""dataTypeId\\\\\\\"":-88,\\\\\\\""dataTypeGuid\\\\\\\"":\\\\\\\""0cc0eba1-9960-42c9-bf9b-60e150b429ae\\\\\\\""}],\\\\\\\""alias\\\\\\\"":\\\\\\\""textItem\\\\\\\""}]}\\\"",\\\""propertyEditorAlias\\\"":\\\""Imulus.Archetype\\\"",\\\""dataTypeId\\\"":3764,\\\""dataTypeGuid\\\"":\\\""496cfe35-448f-4b59-9c75-050798afdce4\\\""}],\\\""alias\\\"":\\\""textList\\\""}]}\"",\""propertyEditorAlias\"":\""Imulus.Archetype\"",\""dataTypeId\"":3765,\""dataTypeGuid\"":\""4ed439b3-0ee7-447a-a64e-b2b486b86379\""}],\""alias\"":\""captions\""}]}""
-            }
-         ],
-         ""alias"":""pages""
-      }
-   ]
-}";
-
-        public const string _SLIDES_JSON =
-                    @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""captions"",
-      ""properties"": [
-        {
-          ""alias"": ""captions"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""textstringArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Test 1""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""textstringArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Test 2""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""textstringArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Test 3""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""textstringArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Test 4""
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    },
-    {
-      ""alias"": ""slides"",
-      ""properties"": [
-        {
-          ""alias"": ""slides"",
-          ""value"": ""1,2,3,4,5""
-        }
-      ]
-    }
-  ]
-}";
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/Regression/SerializationTestHelper.cs

@@ -1,220 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Archetype.Tests.Serialization.Regression
-{       
-    public class SerializationTestHelper
-    {
-        public T GetModel<T>()
-        {
-            try
-            {
-                return (T)GetType().GetMethod("Get" + typeof(T).Name).Invoke(this, null);
-            }
-            catch
-            {
-                return default(T);                
-            }
-        }        
-        
-        public SimpleModel GetSimpleModel()
-        {
-            return new SimpleModel
-            {
-                Amount = 5.67,
-                NullableAmount = null,
-                DateOne = new DateTime(2000, 1, 1),
-                DateTwo = null,
-                Id = 123,
-                NullableId = null,
-                Text = @"Test 
-Text ""quote"" 
-"
-            };
-        }
-
-        public SimpleModelWithFieldsets GetSimpleModelWithFieldsets()
-        {
-            return new SimpleModelWithFieldsets
-            {
-                Amount = 5.67,
-                NullableAmount = null,
-                DateOne = new DateTime(2000, 1, 1),
-                DateTwo = null,
-                Id = 123,
-                NullableId = null,
-                Text = "Test Text"
-            };
-        }
-
-        public SimpleModelWithMixedFieldsets GetSimpleModelWithMixedFieldsets()
-        {
-            return new SimpleModelWithMixedFieldsets
-            {
-                Amount = 5.67,
-                NullableAmount = null,
-                DateOne = new DateTime(2000, 1, 1),
-                DateTwo = null,
-                Id = 123,
-                NullableId = null,
-                Text = "Test Text"
-            };
-        }
-
-        public SimpleModels GetSimpleModels()
-        {
-            return new SimpleModels
-            {
-                GetSimpleModel(),
-                GetSimpleModel(),
-                GetSimpleModel()
-            };
-        }
-
-        public SimpleModelsWithFieldsets GetSimpleModelsWithFieldsets()
-        {
-            return new SimpleModelsWithFieldsets
-            {
-                GetSimpleModelWithFieldsets(),
-                GetSimpleModelWithFieldsets(),
-                GetSimpleModelWithFieldsets()
-            };
-        }
-
-        public SimpleModelsWithMixedFieldsets GetSimpleModelsWithMixedFieldsets()
-        {
-            return new SimpleModelsWithMixedFieldsets
-            {
-                GetSimpleModelWithMixedFieldsets(),
-                GetSimpleModelWithMixedFieldsets(),
-                GetSimpleModelWithMixedFieldsets()
-            };
-        }
-
-        public CompoundModel GetCompoundModel()
-        {
-            return new CompoundModel
-            {
-                Id = -1,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(CompoundModel).Name
-            };
-        }
-
-        public CompoundModelWithMixedFieldsetVariant1 GetCompoundModelWithMixedFieldsetVariant1()
-        {
-            return new CompoundModelWithMixedFieldsetVariant1
-            {
-                Id = -1,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(CompoundModelWithMixedFieldsetVariant1).Name
-            };
-        }
-
-        public CompoundModelWithMixedFieldsetVariant2 GetCompoundModelWithMixedFieldsetVariant2()
-        {
-            return new CompoundModelWithMixedFieldsetVariant2
-            {
-                Id = -1,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(CompoundModelWithMixedFieldsetVariant2).Name
-            };
-        }
-
-        public CompoundModelWithFieldset GetCompoundModelWithFieldset()
-        {
-            return new CompoundModelWithFieldset
-            {
-                Id = -1,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(CompoundModelWithFieldset).Name
-            };
-        }
-
-        public CompoundModelWithList GetCompoundModelWithList()
-        {
-            return new CompoundModelWithList
-            {
-                Id = 10,
-                SimpleModelList = GetModel<SimpleModels>(),
-                Text = typeof(CompoundModelWithList).Name
-            };
-        }
-
-        public CompoundModelWithMixedFieldsetWithList GetCompoundModelWithMixedFieldsetWithList()
-        {
-            return new CompoundModelWithMixedFieldsetWithList
-            {
-                Id = 11,
-                SimpleModelList = GetModel<SimpleModels>(),
-                Text = typeof(CompoundModelWithMixedFieldsetWithList).Name
-            };
-        }
-
-        public CompoundModelWithFieldsetWithList GetCompoundModelWithFieldsetWithList()
-        {
-            return new CompoundModelWithFieldsetWithList
-            {
-                Id = 12,
-                SimpleModelList = GetModel<SimpleModels>(),
-                Text = typeof(CompoundModelWithFieldsetWithList).Name
-            };
-        }
-
-        public NestedModel GetNestedModel()
-        {
-            return new NestedModel
-            {
-                CompoundModel = GetModel<CompoundModel>(),
-                Id = 53,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(NestedModel).Name
-            };
-        }
-
-        public NestedModelWithMixedFieldset GetNestedModelWithMixedFieldset()
-        {
-            return new NestedModelWithMixedFieldset
-            {
-                CompoundModel = GetModel<CompoundModel>(),
-                Id = 54,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(NestedModelWithMixedFieldset).Name
-            };
-        }
-
-        public NestedModelWithFieldset GetNestedModelWithFieldset()
-        {
-            return new NestedModelWithFieldset
-            {
-                CompoundModel = GetModel<CompoundModel>(),
-                Id = 55,
-                SimpleModel = GetModel<SimpleModel>(),
-                Text = typeof(NestedModelWithFieldset).Name
-            };
-        }
-
-        public CompoundModelWrapper GetCompoundModelWrapper()
-        {
-            return new CompoundModelWrapper
-            {
-                CompoundModels = new List<CompoundModel>
-                {
-                    GetModel<CompoundModel>(),
-                    GetModel<CompoundModel>(),
-                    GetModel<CompoundModel>()
-                },
-                Text = typeof(CompoundModelWrapper).Name
-            };
-        }
-
-        public ComplexModel GetComplexModel()
-        {
-            return new ComplexModel
-            {
-                CompoundModelWrapper = GetModel<CompoundModelWrapper>(),
-                Text = typeof(ComplexModel).Name
-            };
-        }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/ArchetypeJsonConverterTest.cs

@@ -1,343 +0,0 @@
-using System;
-using Archetype.Tests.Serialization.Base;
-using Newtonsoft.Json;
-using NUnit.Framework;
-
-namespace Archetype.Tests.Serialization.UseCases
-{
-    [TestFixture]
-    public class ArchetypeJsonConverterTest : ArchetypeJsonConverterTestBase
-    {
-        private ContactDetails _contactDetails;
-        private CompanyDetails _companyDetails;
-        private AnnualStatement _annualStatement;
-        private MergerDetails _mergerDetails;
-        private UrlPicker _webSite;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _webSite = new UrlPicker
-            {
-                Url = "http://test.com",
-                Title = "The Test Company",
-                OpenInNewWindow = true
-            };
-
-            _mergerDetails = new MergerDetails
-            {
-                MergerDate = new DateTime(2014,6,7,8,9,10),
-                MergerValue = 12345676890.12m
-            };
-
-            _contactDetails = new ContactDetails
-            {
-                Address = "Test Address",
-                Email = "test@test.com",
-                Fax = "000",
-                Mobile = "000",
-                Name = "Test",
-                Telephone = "111",
-                WebSite = _webSite
-            };
-
-            _companyDetails = new CompanyDetails
-            {
-                Region = "Test Region",
-                ContactDetails = _contactDetails
-            };
-
-            _annualStatement = new AnnualStatement
-            {
-                FiscalYearStart = new DateTime(2013, 9, 1),
-                FiscalYearEnd = new DateTime(2014, 8, 31),
-                TotalShares = 345678,
-                Sales = 123456700.89,
-                Profit = 1123456.78m
-            };
-        }
-
-        #region serialization tests
-
-        [Test]
-        public void Convert_MergerDetailsModel_To_ArchetypeJson()
-        {
-            var result = ConvertModelToArchetypeJson(_mergerDetails, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._MERGER_DETAILS_JSON, result);
-        }        
-        
-        [Test]
-        public void Convert_ContactDetailsModel_To_ArchetypeJson()
-        {
-            var result = ConvertModelToArchetypeJson(_contactDetails, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._CONTACT_DETAILS_JSON, result);
-        }
-
-        [Test]
-        public void Convert_CompanyDetailsModel_To_ArchetypeJson()
-        {
-            var result = ConvertModelToArchetypeJson(_companyDetails, Formatting.Indented);
-
-            Assert.AreEqual(JsonTestStrings._COMPANY_DETAILS_JSON, result);
-
-        }
-
-        [Test]
-        public void Convert_AnnualStatementModel_To_ArchetypeJson()
-        {
-            var result = ConvertModelToArchetypeJson(_annualStatement, Formatting.Indented);
-
-            Assert.AreEqual(JsonTestStrings._ANNUAL_STATEMENT_JSON, result);
-
-        }
-
-        [Test]
-        public void NullValues_Serialize_To_Empty_String()
-        {
-            var result = ConvertModelToArchetypeJson(new ContactDetails());
-
-            Assert.AreEqual(JsonTestStrings._NULL_VALUES_JSON, result);
-
-        }
-
-        [Test]
-        public void Convert_ContactDetailsModel_To_Archetype()
-        {
-            var model = new ContactDetails
-            {
-                Address = "addr",
-                Email = "email"
-            };
-
-            Assert.NotNull(ConvertModelToArchetype(model));
-        }
-
-        [Test]
-        public void Convert_AnnualStatementModel_To_Archetype()
-        {
-            Assert.NotNull(ConvertModelToArchetype(_annualStatement));
-        }
-
-        [Test]
-        public void Convert_AllContactDetailsModel_To_Archetype()
-        {
-            var item1 = new ContactDetails
-            {
-                Address = "addr",
-                Email = "email"
-            };
-
-            var item2 = new ContactDetails
-            {
-                Address = "addr1",
-                Name = "email2"
-            };
-
-            var model = new AllContactDetails
-            {
-                UserDetails = item1,
-                AdminDetails = item2
-            };
-
-            Assert.NotNull(ConvertModelToArchetype(model));
-        }
-
-        [Test]
-        public void Convert_ContactDetailsListModel_To_Archetype()
-        {
-            var item1 = new ContactDetails
-            {
-                Address = "addr",
-                Email = "email"
-            };
-
-            var item2 = new ContactDetails
-            {
-                Address = "addr1",
-                Name = "email2"
-            };
-
-            var model = new ContactDetailsList
-            {
-                item1,
-                item2
-            };
-
-            Assert.NotNull(ConvertModelToArchetype(model));
-        }
-
-        [Test]
-        public void Convert_CompanyDetailsModel_To_Archetype()
-        {
-            var model = new CompanyDetails
-            {
-                Region = "Test Region",
-                ContactDetails = new ContactDetails
-                {
-                    Address = "addr1",
-                    Name = "email2"
-                }
-            };
-
-            Assert.NotNull(ConvertModelToArchetype(model));
-        }
-
-        #endregion
-
-        #region deserialization tests
-
-        [Test]
-        public void Convert_ArchetypeJson_To_ContactDetailsModel()
-        {
-            var result = ConvertArchetypeJsonToModel<ContactDetails>(JsonTestStrings._CONTACT_DETAILS_JSON);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<ContactDetails>(result);
-
-            Assert.AreEqual("Test Address", result.Address);
-            Assert.AreEqual("test@test.com", result.Email);
-            Assert.AreEqual("000", result.Fax);
-            Assert.AreEqual("000", result.Mobile);
-            Assert.AreEqual("Test", result.Name);
-            Assert.AreEqual("111", result.Telephone);
-            Assert.AreEqual(_webSite.Content, result.WebSite.Content);
-            Assert.AreEqual(_webSite.Media, result.WebSite.Media);
-            Assert.AreEqual(_webSite.OpenInNewWindow, result.WebSite.OpenInNewWindow);
-            Assert.AreEqual(_webSite.Title, result.WebSite.Title);
-            Assert.AreEqual(_webSite.Url, result.WebSite.Url);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_AnnualStatementModel()
-        {
-            var result = ConvertArchetypeJsonToModel<AnnualStatement>(JsonTestStrings._ANNUAL_STATEMENT_JSON);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<AnnualStatement>(result);
-
-            Assert.AreEqual(new DateTime(2013, 9, 1), result.FiscalYearStart);
-            Assert.AreEqual(new DateTime(2014, 8, 31), result.FiscalYearEnd);
-            Assert.IsNull(result.DividendPaymentDate);
-            Assert.AreEqual(345678, result.TotalShares);
-            Assert.AreEqual(123456700.89, result.Sales);
-            Assert.AreEqual(1123456.78m, result.Profit);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_AnnualStatementModel_NullableDate_HasValue()
-        {
-            var annualStatement = new AnnualStatement
-            {
-                FiscalYearStart = new DateTime(2013, 9, 1),
-                FiscalYearEnd = new DateTime(2014, 8, 31),
-                DividendPaymentDate = new DateTime(2014,9,15,10,15,30),
-                TotalShares = 345678,
-                Sales = 123456700.89,
-                Profit = 1123456.78m
-            };
-
-            var result = ConvertModelToArchetypeAndBack(annualStatement);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<AnnualStatement>(result);
-
-            Assert.AreEqual(annualStatement.FiscalYearStart, result.FiscalYearStart);
-            Assert.AreEqual(annualStatement.FiscalYearEnd, result.FiscalYearEnd);
-            Assert.AreEqual(annualStatement.DividendPaymentDate, result.DividendPaymentDate);
-            Assert.AreEqual(annualStatement.TotalShares, result.TotalShares);
-            Assert.AreEqual(annualStatement.Sales, result.Sales);
-            Assert.AreEqual(annualStatement.Profit, result.Profit);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_AllContactDetailsModel()
-        {
-            var item1 = new ContactDetails
-            {
-                Address = "addr",
-                Email = "email"
-            };
-
-            var item2 = new ContactDetails
-            {
-                Address = "addr1",
-                Name = "email2"
-            };
-
-            var model = new AllContactDetails
-            {
-                UserDetails = item1,
-                AdminDetails = item2
-            };
-
-            var result = ConvertModelToArchetypeAndBack(model);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<AllContactDetails>(result);
-
-            Assert.AreEqual(item1.Address, result.UserDetails.Address);
-            Assert.AreEqual(item1.Email, result.UserDetails.Email);
-            Assert.AreEqual(item2.Address, result.AdminDetails.Address);
-            Assert.AreEqual(item2.Name, result.AdminDetails.Name);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_ContactDetailsListModel()
-        {
-            var item1 = new ContactDetails
-            {
-                Address = "addr",
-                Email = "email"
-            };
-
-            var item2 = new ContactDetails
-            {
-                Address = "addr1",
-                Name = "email2"
-            };
-
-            var model = new ContactDetailsList
-            {
-                item1,
-                item2
-            };
-
-            var result = ConvertModelToArchetypeAndBack(model);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<ContactDetailsList>(result);
-            Assert.AreEqual(result.Count, 2);
-
-            Assert.AreEqual(item1.Address, result[0].Address);
-            Assert.AreEqual(item1.Email, result[0].Email);
-            Assert.AreEqual(item2.Address, result[1].Address);
-            Assert.AreEqual(item2.Name, result[1].Name);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_CompanyDetailsModel()
-        {
-            var model = new CompanyDetails
-            {
-                Region = "Test Region",
-                ContactDetails = new ContactDetails
-                {
-                    Address = "addr1",
-                    Name = "email2"
-                }
-            };
-
-            var result = ConvertModelToArchetypeAndBack(model);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<CompanyDetails>(result);
-
-            Assert.AreEqual(model.Region, result.Region);
-            Assert.AreEqual(model.ContactDetails.Address, result.ContactDetails.Address);
-            Assert.AreEqual(model.ContactDetails.Name, result.ContactDetails.Name);
-        }
-
-        #endregion
-
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/ArchetypeJsonConverterTest.cs

@@ -1,206 +0,0 @@
-using System.Linq;
-using Archetype.Tests.Serialization.Base;
-using Newtonsoft.Json;
-using NUnit.Framework;
-
-namespace Archetype.Tests.Serialization.UseCases.Complex
-{
-    [TestFixture]
-    public class ArchetypeJsonConverterTest : ArchetypeJsonConverterTestBase
-    {
-        private TextList _textList;
-        private Captions _captions;
-        private PageDetails _pageDetails;
-
-        private SlideShow _slides;
-        private Seo _seo;
-        private TextPageList _textPages;
-        private PageList _pages;
-        
-        [SetUp]
-        public void SetUp()
-        {
-            InitComplexModels();
-            InitComplexTreeModel();
-        }
-
-        #region complex nested model tests
-
-        [Test]
-        public void Convert_PageDetailsModel_To_ArchetypeJson()
-        {
-            var result = ConvertModelToArchetypeJson(_pageDetails, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._PAGE_DETAILS_JSON, result);
-        }
-
-        [Test]
-        public void Convert_PageDetailsModel_To_Archetype()
-        {
-            Assert.NotNull(ConvertModelToArchetype(_pageDetails));
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_PageDetailsModel()
-        {
-            var result = ConvertArchetypeJsonToModel<PageDetails>(JsonTestStrings._PAGE_DETAILS_JSON);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<PageDetails>(result);
-
-            Assert.AreEqual("2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453", result.Pages);
-            Assert.AreEqual("First Page", result.Captions.TextStringArray.ElementAt(0).TextString);
-            Assert.AreEqual("Second Page", result.Captions.TextStringArray.ElementAt(1).TextString);
-            Assert.AreEqual("Third Page", result.Captions.TextStringArray.ElementAt(2).TextString);
-            Assert.AreEqual("Fourth Page", result.Captions.TextStringArray.ElementAt(3).TextString);
-        }
-
-        [Test]
-        public void Convert_PageDetailsModel_To_Archetype_AndBack()
-        {
-            var result = ConvertModelToArchetypeAndBack(_pageDetails);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<PageDetails>(result);
-
-            Assert.AreEqual(_pageDetails.Pages, result.Pages);
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(0).TextString, result.Captions.TextStringArray.ElementAt(0).TextString);
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(1).TextString, result.Captions.TextStringArray.ElementAt(1).TextString);
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(2).TextString, result.Captions.TextStringArray.ElementAt(2).TextString);
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(3).TextString, result.Captions.TextStringArray.ElementAt(3).TextString);
-        }
-        #endregion
-
-        #region complex nested tree model tests
-
-        [Test]
-        public void Convert_PagesModel_To_Archetype()
-        {
-            Assert.NotNull(ConvertModelToArchetype(_pages));
-        }
-
-        [Test]
-        public void Convert_PagesModel_To_ArchetypeJson()
-        {
-            var result = ConvertModelToArchetypeJson(_pages, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._PAGES_JSON, result);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_PagesModel()
-        {
-            var result = ConvertArchetypeJsonToModel<PageList>(JsonTestStrings._PAGES_JSON);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<PageList>(result);
-
-            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(0).Media.Slides);
-            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(1).Media.Slides);
-            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(2).Media.Slides);
-
-            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(0).Seo.MetaTitle);
-            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(0).Seo.MetaDescription);
-            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(1).Seo.MetaTitle);
-            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(1).Seo.MetaDescription);
-            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(2).Seo.MetaTitle);
-            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(2).Seo.MetaDescription);
-
-            Assert.AreEqual("Home Page Body", result.Pages.ElementAt(0).BodyText);
-            Assert.AreEqual("Home Page", result.Pages.ElementAt(0).PageTitle);
-            Assert.AreEqual("About us Page Body", result.Pages.ElementAt(1).BodyText);
-            Assert.AreEqual("About us Page", result.Pages.ElementAt(1).PageTitle);
-            Assert.AreEqual("Contact us Page Body", result.Pages.ElementAt(2).BodyText);
-            Assert.AreEqual("Contact us Page", result.Pages.ElementAt(2).PageTitle);
-
-
-        }
-
-        [Test]
-        public void Convert_PagesModel_To_Archetype_AndBack()
-        {
-            var result = ConvertModelToArchetypeAndBack(_pages);
-
-            Assert.NotNull(result);
-            Assert.IsInstanceOf<PageList>(result);
-
-            Assert.AreEqual(_pages.Pages.ElementAt(0).Media.Slides, result.Pages.ElementAt(0).Media.Slides);
-            Assert.AreEqual(_pages.Pages.ElementAt(1).Media.Slides, result.Pages.ElementAt(1).Media.Slides);
-            Assert.AreEqual(_pages.Pages.ElementAt(2).Media.Slides, result.Pages.ElementAt(2).Media.Slides);
-
-            Assert.AreEqual(_pages.Pages.ElementAt(0).Seo.MetaTitle, result.Pages.ElementAt(0).Seo.MetaTitle);
-            Assert.AreEqual(_pages.Pages.ElementAt(0).Seo.MetaDescription, result.Pages.ElementAt(0).Seo.MetaDescription);
-            Assert.AreEqual(_pages.Pages.ElementAt(1).Seo.MetaTitle, result.Pages.ElementAt(1).Seo.MetaTitle);
-            Assert.AreEqual(_pages.Pages.ElementAt(1).Seo.MetaDescription, result.Pages.ElementAt(1).Seo.MetaDescription);
-            Assert.AreEqual(_pages.Pages.ElementAt(2).Seo.MetaTitle, result.Pages.ElementAt(2).Seo.MetaTitle);
-            Assert.AreEqual(_pages.Pages.ElementAt(2).Seo.MetaDescription, result.Pages.ElementAt(2).Seo.MetaDescription);
-
-            Assert.AreEqual(_pages.Pages.ElementAt(0).BodyText, result.Pages.ElementAt(0).BodyText);
-            Assert.AreEqual(_pages.Pages.ElementAt(0).PageTitle, result.Pages.ElementAt(0).PageTitle);
-            Assert.AreEqual(_pages.Pages.ElementAt(1).BodyText, result.Pages.ElementAt(1).BodyText);
-            Assert.AreEqual(_pages.Pages.ElementAt(1).PageTitle, result.Pages.ElementAt(1).PageTitle);
-            Assert.AreEqual(_pages.Pages.ElementAt(2).BodyText, result.Pages.ElementAt(2).BodyText);
-            Assert.AreEqual(_pages.Pages.ElementAt(2).PageTitle, result.Pages.ElementAt(2).PageTitle);
-
-
-        }
-
-        #endregion
-
-        #region utility methods
-
-        private void InitComplexModels()
-        {
-            _textList = new TextList
-            {
-                new TextItem{TextString = "First Page"},
-                new TextItem{TextString = "Second Page"},
-                new TextItem{TextString = "Third Page"},
-                new TextItem{TextString = "Fourth Page"}
-            };
-
-            _captions = new Captions {TextStringArray = _textList};
-
-            _pageDetails = new PageDetails
-            {
-                Captions = _captions,
-                Pages = "2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453"
-            };            
-        }
-
-        private void InitComplexTreeModel()
-        {
-            _slides = new SlideShow{Slides = "1,2,3,4,5,6,7,8"};
-            _seo = new Seo{MetaDescription = "Test Meta Description", MetaTitle = "Test Meta Title"};
-            _textPages = new TextPageList
-            {
-                new TextPage()
-                {
-                    PageTitle = "Home Page",
-                    BodyText = "Home Page Body",
-                    Media = _slides,
-                    Seo = _seo
-                },
-                new TextPage()
-                {
-                    PageTitle = "About us Page",
-                    BodyText = "About us Page Body",
-                    Media = _slides,
-                    Seo = _seo
-                },
-                new TextPage()
-                {
-                    PageTitle = "Contact us Page",
-                    BodyText = "Contact us Page Body",
-                    Media = _slides,
-                    Seo = _seo
-                }
-            };
-
-            _pages = new PageList
-            {
-                Pages = _textPages
-            };
-        }
-
-        #endregion
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/JsonTestModels.cs

@@ -1,92 +0,0 @@
-using System.Collections.Generic;
-using Archetype.Serialization;
-using Newtonsoft.Json;
-
-namespace Archetype.Tests.Serialization.UseCases.Complex
-{
-    #region complex nested model
-
-    [AsArchetype("pages")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class PageDetails
-    {
-        [JsonProperty("pages")]
-        public string Pages { get; set; }
-        [AsFieldset]
-        [JsonProperty("captions")]
-        public Captions Captions { get; set; }
-    }
-
-    [AsArchetype("captions")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Captions
-    {
-        [JsonProperty("captions")]
-        public TextList TextStringArray { get; set; }
-    }
-
-    [AsArchetype("textstringArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class TextList : List<TextItem>
-    {
-    }
-
-    [AsArchetype("textstringArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class TextItem
-    {
-        [JsonProperty("textstring")]
-        public string TextString { get; set; }
-    }
-
-    #endregion
-
-    #region complex nested tree model
-
-    public abstract class PageBase
-    {
-        public string PageTitle { get; set; }
-        public string BodyText { get; set; }
-    }
-
-    [AsArchetype("slideShow")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class SlideShow
-    {
-        public string Slides { get; set; }
-    }
-
-    [AsArchetype("seo")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Seo
-    {
-        public string MetaTitle { get; set; }
-        public string MetaDescription { get; set; }
-    }
-
-    [AsArchetype("TextPage")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class TextPage : PageBase
-    {
-        [AsFieldset]
-        public SlideShow Media { get; set; }
-
-        [AsFieldset]
-        public Seo Seo { get; set; }
-    }
-
-    [AsArchetype("TextPageList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class TextPageList : List<TextPage>
-    {
-    }
-
-    [AsArchetype("Pages")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class PageList
-    {
-        public TextPageList Pages { get; set; }
-    }
-
-    #endregion
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/JsonTestStrings.cs

@@ -1,245 +0,0 @@
-namespace Archetype.Tests.Serialization.UseCases.Complex
-{
-    public class JsonTestStrings
-    {
-        public const string _PAGE_DETAILS_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""captions"",
-      ""properties"": [
-        {
-          ""alias"": ""captions"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""captions"",
-                ""properties"": [
-                  {
-                    ""alias"": ""captions"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""textstringArray"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""textstring"",
-                              ""value"": ""First Page""
-                            }
-                          ]
-                        },
-                        {
-                          ""alias"": ""textstringArray"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""textstring"",
-                              ""value"": ""Second Page""
-                            }
-                          ]
-                        },
-                        {
-                          ""alias"": ""textstringArray"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""textstring"",
-                              ""value"": ""Third Page""
-                            }
-                          ]
-                        },
-                        {
-                          ""alias"": ""textstringArray"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""textstring"",
-                              ""value"": ""Fourth Page""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    },
-    {
-      ""alias"": ""pages"",
-      ""properties"": [
-        {
-          ""alias"": ""pages"",
-          ""value"": ""2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453""
-        }
-      ]
-    }
-  ]
-}";
-
-        public const string _PAGES_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""Pages"",
-      ""properties"": [
-        {
-          ""alias"": ""Pages"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""TextPage"",
-                ""properties"": [
-                  {
-                    ""alias"": ""Media"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""slideShow"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""Slides"",
-                              ""value"": ""1,2,3,4,5,6,7,8""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    ""alias"": ""Seo"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""seo"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""MetaTitle"",
-                              ""value"": ""Test Meta Title""
-                            },
-                            {
-                              ""alias"": ""MetaDescription"",
-                              ""value"": ""Test Meta Description""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    ""alias"": ""PageTitle"",
-                    ""value"": ""Home Page""
-                  },
-                  {
-                    ""alias"": ""BodyText"",
-                    ""value"": ""Home Page Body""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""TextPage"",
-                ""properties"": [
-                  {
-                    ""alias"": ""Media"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""slideShow"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""Slides"",
-                              ""value"": ""1,2,3,4,5,6,7,8""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    ""alias"": ""Seo"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""seo"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""MetaTitle"",
-                              ""value"": ""Test Meta Title""
-                            },
-                            {
-                              ""alias"": ""MetaDescription"",
-                              ""value"": ""Test Meta Description""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    ""alias"": ""PageTitle"",
-                    ""value"": ""About us Page""
-                  },
-                  {
-                    ""alias"": ""BodyText"",
-                    ""value"": ""About us Page Body""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""TextPage"",
-                ""properties"": [
-                  {
-                    ""alias"": ""Media"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""slideShow"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""Slides"",
-                              ""value"": ""1,2,3,4,5,6,7,8""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    ""alias"": ""Seo"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""seo"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""MetaTitle"",
-                              ""value"": ""Test Meta Title""
-                            },
-                            {
-                              ""alias"": ""MetaDescription"",
-                              ""value"": ""Test Meta Description""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    ""alias"": ""PageTitle"",
-                    ""value"": ""Contact us Page""
-                  },
-                  {
-                    ""alias"": ""BodyText"",
-                    ""value"": ""Contact us Page Body""
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ]
-}";
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/ArchetypeJsonConverterTest.cs

@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Archetype.Models;
-using Archetype.PropertyConverters;
-using Archetype.Tests.Serialization.Base;
-using Newtonsoft.Json;
-using NUnit.Framework;
-
-namespace Archetype.Tests.Serialization.UseCases.Enumerable
-{
-    [TestFixture]
-    public class ArchetypeJsonConverterTest : ArchetypeJsonConverterTestBase
-    {
-        private Feedbacks _feedbacks;
-        private Captions _captions;
-
-        
-        [SetUp]
-        public void SetUp()
-        {
-            _feedbacks = new Feedbacks
-            {
-                new Feedback{Testimonial = "Testimonial 1"},
-                new Feedback{Testimonial = "Testimonial 2"},
-                new Feedback{Testimonial = "Testimonial 3"}
-            };
-
-            _captions = new Captions()
-            {
-                TextArray = new List<Text>
-                {
-                    new Text{TextString = "Caption 1"},
-                    new Text{TextString = "Caption 2"},
-                    new Text{TextString = "Caption 3"}
-                }
-            };
-        }
-
-        #region Feedback - single fieldset with multiple items
-
-        [Test]
-        public void Convert_FeedbackModel_To_Archetype()
-        {
-            var converter = new ArchetypeValueConverter();
-            var json = JsonConvert.SerializeObject(_feedbacks);
-            var archetype = (ArchetypeModel)converter.ConvertDataToSource(null, json, false);
-
-            Assert.NotNull(archetype);
-        }
-
-        [Test]
-        public void Convert_FeedbackModel_To_ArchetypeJson()
-        {
-            var json = ConvertModelToArchetypeJson(_feedbacks, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._FEEDBACK_JSON, json);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_FeedbackModel()
-        {
-            var result = ConvertArchetypeJsonToModel<Feedbacks>(JsonTestStrings._FEEDBACK_JSON);
-            Assert.NotNull(result);
-            Assert.AreEqual(3, result.Count);
-
-            foreach (var feedback in result)
-            {
-                Assert.AreEqual(String.Format("Testimonial {0}", result.IndexOf(feedback) + 1),
-                    feedback.Testimonial);
-            }
-        }
-
-        [Test]
-        public void Convert_FeedbackModel_To_Archetype_AndBack()
-        {
-            var result = ConvertModelToArchetypeAndBack(_feedbacks);
-            Assert.NotNull(result);
-
-            Assert.AreEqual(3, result.Count);
-
-            foreach (var feedback in result)
-            {
-                var index = result.IndexOf(feedback);
-                Assert.AreEqual(_feedbacks.ElementAt(index).Testimonial, feedback.Testimonial);
-            }
-        }
-
-        #endregion
-
-        #region Captions - a root fieldset which contains another fieldset list
-
-        [Test]
-        public void Convert_CaptionsModel_To_Archetype()
-        {
-            var converter = new ArchetypeValueConverter();
-            var json = JsonConvert.SerializeObject(_captions);
-            var archetype = (ArchetypeModel)converter.ConvertDataToSource(null, json, false);
-
-            Assert.NotNull(archetype);
-        }
-
-        [Test]
-        public void Convert_CaptionsModel_To_ArchetypeJson()
-        {
-            var json = ConvertModelToArchetypeJson(_captions, Formatting.Indented);
-            Assert.AreEqual(JsonTestStrings._CAPTIONS_JSON, json);
-        }
-
-        [Test]
-        public void Convert_ArchetypeJson_To_CaptionsModel()
-        {
-            var result = ConvertArchetypeJsonToModel<Captions>(JsonTestStrings._CAPTIONS_JSON);
-            Assert.NotNull(result);
-            Assert.NotNull(result.TextArray);
-
-            Assert.AreEqual(3, result.TextArray.Count);
-
-            foreach (var caption in result.TextArray)
-            {
-                Assert.AreEqual(String.Format("Caption {0}", result.TextArray.IndexOf(caption) + 1),
-                    caption.TextString);
-            }
-        }
-
-        [Test]
-        public void Convert_CaptionsModel_To_Archetype_AndBack()
-        {
-            var result = ConvertModelToArchetypeAndBack(_captions);
-            Assert.NotNull(result);
-            Assert.NotNull(result.TextArray);
-
-            Assert.AreEqual(3, result.TextArray.Count);
-
-            foreach (var caption in result.TextArray)
-            {
-                var index = result.TextArray.IndexOf(caption);
-                Assert.AreEqual(_captions.TextArray.ElementAt(index).TextString, caption.TextString);
-            }
-        }
-
-        #endregion
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/JsonTestModels.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Archetype.Serialization;
-using Newtonsoft.Json;
-
-namespace Archetype.Tests.Serialization.UseCases.Enumerable
-{
-    #region Feedback - single fieldset with multiple items
-
-    [AsArchetype("feedbacks")] /* Note: when inheriting from a list, archetype alias is not used */
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Feedbacks : List<Feedback>
-    {
-    }
-
-    [AsArchetype("feedback")] /* Must have same archetype alias as list class */
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Feedback
-    {
-        [JsonProperty("testimonial")]
-        public String Testimonial { get; set; }
-    }
-
-    #endregion   
- 
-    #region Captions - a root fieldset which contains another fieldset list
-
-    [AsArchetype("captions")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Captions
-    {
-        [JsonProperty("captions")]
-        public List<Text> TextArray { get; set; }
-    }
-
-    [AsArchetype("textArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class Text
-    {
-        [JsonProperty("textstring")]
-        public String TextString { get; set; }
-    }
-
-    #endregion
-
-
-    [AsArchetype("aboutUs")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class AboutUs
-    {
-        [AsFieldset]
-        [JsonProperty("contacts")]
-        public IEnumerable<ContactDetails> Contacts { get; set; } 
-        [AsFieldset]
-        [JsonProperty("testimonials")]
-        public IEnumerable<String> Testimonials { get; set; }
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/JsonTestStrings.cs

@@ -1,86 +0,0 @@
-namespace Archetype.Tests.Serialization.UseCases.Enumerable
-{
-    public class JsonTestStrings
-    {
-        public const string _ABOUT_US_JSON =
-            @"";
-
-        public const string _FEEDBACK_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""feedback"",
-      ""properties"": [
-        {
-          ""alias"": ""testimonial"",
-          ""value"": ""Testimonial 1""
-        }
-      ]
-    },
-    {
-      ""alias"": ""feedback"",
-      ""properties"": [
-        {
-          ""alias"": ""testimonial"",
-          ""value"": ""Testimonial 2""
-        }
-      ]
-    },
-    {
-      ""alias"": ""feedback"",
-      ""properties"": [
-        {
-          ""alias"": ""testimonial"",
-          ""value"": ""Testimonial 3""
-        }
-      ]
-    }
-  ]
-}";
-
-        public const string _CAPTIONS_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""captions"",
-      ""properties"": [
-        {
-          ""alias"": ""captions"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""textArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Caption 1""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""textArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Caption 2""
-                  }
-                ]
-              },
-              {
-                ""alias"": ""textArray"",
-                ""properties"": [
-                  {
-                    ""alias"": ""textstring"",
-                    ""value"": ""Caption 3""
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ]
-}";
-    }
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs

@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Archetype.Serialization;
-using Newtonsoft.Json;
-
-namespace Archetype.Tests.Serialization.UseCases
-{
-    #region json test Models
-
-    [AsArchetype("urlPicker")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class UrlPicker
-    {
-        [JsonProperty("title")]
-        public string Title { get; set; }
-        [JsonProperty("url")]
-        public string Url { get; set; }
-        [JsonProperty("content")]
-        public int? Content { get; set; }
-        [JsonProperty("media")]
-        public int? Media { get; set; }
-        [JsonProperty("openInNewWindow")]
-        public bool OpenInNewWindow { get; set; }
-    }
-
-    [AsArchetype("contactDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class ContactDetails
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-        [JsonProperty("address")]
-        public string Address { get; set; }
-        [JsonProperty("telephone")]
-        public string Telephone { get; set; }
-        [JsonProperty("mobile")]
-        public string Mobile { get; set; }
-        [JsonProperty("fax")]
-        public string Fax { get; set; }
-        [JsonProperty("email")]
-        public string Email { get; set; }
-        [JsonProperty("webSite")]
-        public UrlPicker WebSite { get; set; }
-    }
-
-    [AsArchetype("companyDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class CompanyDetails
-    {
-        [JsonProperty("region")]
-        public string Region { get; set; }
-        [JsonProperty("contactDetails")]
-        public ContactDetails ContactDetails { get; set; }
-    }
-
-    [AsArchetype("allContactDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class AllContactDetails
-    {
-        public ContactDetails UserDetails { get; set; }
-        public ContactDetails AdminDetails { get; set; }
-
-    }
-
-    [AsArchetype("contactDetailsList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class ContactDetailsList : List<ContactDetails>
-    {
-    }
-
-    [AsArchetype("annualStatement")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class AnnualStatement
-    {
-        public DateTime FiscalYearStart { get; set; }
-        public DateTime FiscalYearEnd { get; set; }
-        public DateTime? DividendPaymentDate { get; set; }
-        public Int32 TotalShares { get; set; }
-        public Double Sales { get; set; }
-        public Decimal Profit { get; set; }
-    }
-
-    [AsArchetype("mergerDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter))]
-    public class MergerDetails
-    {
-        public DateTime MergerDate { get; set; }
-        [JsonIgnore]
-        public decimal MergerValue { get; set; }
-    }
-
-    #endregion    
-}

app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestStrings.cs

@@ -1,207 +0,0 @@
-namespace Archetype.Tests.Serialization.UseCases
-{
-    public class JsonTestStrings
-    {
-        public const string _MERGER_DETAILS_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""mergerDetails"",
-      ""properties"": [
-        {
-          ""alias"": ""MergerDate"",
-          ""value"": ""07/06/2014 08:09:10""
-        }
-      ]
-    }
-  ]
-}";
-
-        public const string _ANNUAL_STATEMENT_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""annualStatement"",
-      ""properties"": [
-        {
-          ""alias"": ""FiscalYearStart"",
-          ""value"": ""01/09/2013 00:00:00""
-        },
-        {
-          ""alias"": ""FiscalYearEnd"",
-          ""value"": ""31/08/2014 00:00:00""
-        },
-        {
-          ""alias"": ""DividendPaymentDate"",
-          ""value"": """"
-        },
-        {
-          ""alias"": ""TotalShares"",
-          ""value"": ""345678""
-        },
-        {
-          ""alias"": ""Sales"",
-          ""value"": ""123456700.89""
-        },
-        {
-          ""alias"": ""Profit"",
-          ""value"": ""1123456.78""
-        }
-      ]
-    }
-  ]
-}";
-
-        public const string _CONTACT_DETAILS_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""contactDetails"",
-      ""properties"": [
-        {
-          ""alias"": ""name"",
-          ""value"": ""Test""
-        },
-        {
-          ""alias"": ""address"",
-          ""value"": ""Test Address""
-        },
-        {
-          ""alias"": ""telephone"",
-          ""value"": ""111""
-        },
-        {
-          ""alias"": ""mobile"",
-          ""value"": ""000""
-        },
-        {
-          ""alias"": ""fax"",
-          ""value"": ""000""
-        },
-        {
-          ""alias"": ""email"",
-          ""value"": ""test@test.com""
-        },
-        {
-          ""alias"": ""webSite"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""urlPicker"",
-                ""properties"": [
-                  {
-                    ""alias"": ""title"",
-                    ""value"": ""The Test Company""
-                  },
-                  {
-                    ""alias"": ""url"",
-                    ""value"": ""http://test.com""
-                  },
-                  {
-                    ""alias"": ""content"",
-                    ""value"": """"
-                  },
-                  {
-                    ""alias"": ""media"",
-                    ""value"": """"
-                  },
-                  {
-                    ""alias"": ""openInNewWindow"",
-                    ""value"": ""1""
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ]
-}";
-
-        public const string _COMPANY_DETAILS_JSON =
-            @"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""companyDetails"",
-      ""properties"": [
-        {
-          ""alias"": ""region"",
-          ""value"": ""Test Region""
-        },
-        {
-          ""alias"": ""contactDetails"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""contactDetails"",
-                ""properties"": [
-                  {
-                    ""alias"": ""name"",
-                    ""value"": ""Test""
-                  },
-                  {
-                    ""alias"": ""address"",
-                    ""value"": ""Test Address""
-                  },
-                  {
-                    ""alias"": ""telephone"",
-                    ""value"": ""111""
-                  },
-                  {
-                    ""alias"": ""mobile"",
-                    ""value"": ""000""
-                  },
-                  {
-                    ""alias"": ""fax"",
-                    ""value"": ""000""
-                  },
-                  {
-                    ""alias"": ""email"",
-                    ""value"": ""test@test.com""
-                  },
-                  {
-                    ""alias"": ""webSite"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""urlPicker"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""title"",
-                              ""value"": ""The Test Company""
-                            },
-                            {
-                              ""alias"": ""url"",
-                              ""value"": ""http://test.com""
-                            },
-                            {
-                              ""alias"": ""content"",
-                              ""value"": """"
-                            },
-                            {
-                              ""alias"": ""media"",
-                              ""value"": """"
-                            },
-                            {
-                              ""alias"": ""openInNewWindow"",
-                              ""value"": ""1""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ]
-}";
-
-        public const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
-    }
-}

app/Umbraco/Archetype.Tests/SupportingFiles/config/umbracoSettings.config

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<settings>
-
-  <!-- 
-    umbracoSettings.config configuration documentation can be found here: 
-    http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/
-    Many of the optional settings are not explicitly listed here 
-    but can be found in the online documentation.
-    -->
-  
-  <content>
-    
-    <errors>
-      <error404>1</error404>
-      <!--
-        <error404>
-            <errorPage culture="default">1</errorPage>
-            <errorPage culture="en-US">200</errorPage>
-        </error404>
-       -->      
-    </errors>
-    
-    <notifications>
-      <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <email>your@email.here</email>
-    </notifications>
-
-    <!-- Show property descriptions in editing view "icon|text|none" -->
-    <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
-    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-    <PreviewBadge><![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="{0}/endPreview.aspx?redir={2}"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
-
-    <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
-    <!-- In seconds. 0 will disable cache -->
-    <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
-
-    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
-         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
-         - silent - Silently suppress the error and do not render the offending macro.
-         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
-                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
-         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>inline</MacroErrors>
-
-    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd</disallowedUploadFiles>
-
-    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
-  </content>
-
-  <security>
-    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>false</keepUserLoggedIn>
-    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
-  </security>
-
-  <requestHandler>
-    <!-- this will ensure that urls are unique when running with multiple root nodes -->
-    <useDomainPrefixes>false</useDomainPrefixes>
-    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>   
-  </requestHandler>
-
-  <templates>
-    <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
-    <defaultRenderingEngine>Mvc</defaultRenderingEngine>
-  </templates>
-
-  <scheduledTasks>
-    <!-- add tasks that should be called with an interval (seconds) -->
-    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
-  </scheduledTasks>
-
-  <!-- distributed calls make umbraco use webservices to handle cache refreshing -->
-  <distributedCall enable="false">
-    <!-- the id of the user who's making the calls -->
-    <!-- needed for security, umbraco will automatically look up correct login and passwords -->
-    <user>0</user>
-    <servers>
-      <!-- add ip number or hostname, make sure that it can be reached from all servers -->
-      <!-- you can also add optional attributes to force a protocol or port number (see #2) -->
-      <!-- <server>127.0.0.1</server>-->
-      <!-- <server forceProtocol="http|https" forcePortnumber="80|443">127.0.0.1</server>-->
-    </servers>
-  </distributedCall>
-
-  <!-- 
-    web.routing
-      @trySkipIisCustomErrors
-        Tries to skip IIS custom errors.
-        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
-        over and render its build-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
-        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
-        over, and _prevent_ Umbraco 404 pages to show.
-      @internalRedirectPreservesTemplate
-        By default as soon as we're not displaying the initial document, we reset the template set by the
-        finder or by the alt. template. Set this option to true to preserve the template set by the finder
-        or by the alt. template, in case of an internal redirect.
-        (false by default, and in fact should remain false unless you know what you're doing)
-  -->
-  <web.routing
-    trySkipIisCustomErrors="false"
-    internalRedirectPreservesTemplate="false">
-  </web.routing>
-
-</settings>

app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -242,12 +242,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
-    <Compile Include="Serialization\ArchetypeJsonDelinter.cs" />
-    <Compile Include="Serialization\AsArchetypeAttribute.cs" />
     <Compile Include="PropertyEditors\ArchetypePropertyEditor.cs" />
-    <Compile Include="Serialization\ArchetypeJsonConverter.cs" />
-    <Compile Include="Serialization\AsFieldsetAttribute.cs" />
-    <Compile Include="Serialization\SerializationExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Archetype.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -39,7 +38,7 @@ namespace Archetype.Models
               .ToList()
               .ForEach(x => x.Remove());
 
-            return json.ToString(Formatting.None).DelintArchetypeJson();
+            return json.ToString(Formatting.None);//.DelintArchetypeJson();
         }
     }
 }

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0-beta")]
+[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyFileVersion("1.3.1-beta")]

app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs

@@ -54,7 +54,9 @@ namespace Archetype.PropertyEditors
 			public override string ConvertDbToString(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
 			{
 				if (property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
+					return string.Empty;
+
+                //LogHelper.Info<ArchetypeHelper>(property.Value.ToString());
 
 				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
 
@@ -83,7 +85,9 @@ namespace Archetype.PropertyEditors
 			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
 			{
 				if (property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
+					return string.Empty;
+
+                //LogHelper.Info<ArchetypeHelper>(property.Value.ToString());
 
 				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
 
@@ -111,7 +115,9 @@ namespace Archetype.PropertyEditors
             public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
 			{
 				if (editorValue.Value == null || editorValue.Value.ToString() == "")
-					return string.Empty;
+					return string.Empty;
+
+                //LogHelper.Info<ArchetypeHelper>(editorValue.Value.ToString());
 
 				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);
 

app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs

@@ -1,585 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Archetype.Models;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Archetype.Serialization
-{
-    public class ArchetypeJsonConverter : JsonConverter
-    {
-        private const string _ROOT_FS_ALIAS = "rootFs";
-        
-        #region public methods
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var models = GenerateModels(value);
-
-            if (models.Count < 1)
-                return;
-
-            if (models.Count == 1 && models[0] == null) 
-                return;
-
-            var jObj = SerializeModelToFieldset(models);
-
-            writer.WriteRaw(ApplyFormatting(jObj.ToString(), writer.Formatting));
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var jToken = JToken.ReadFrom(reader);
-
-            if (jToken == null)
-                return null;
-
-            return DeserializeJson(objectType, GetDelintedJToken(jToken));
-        }
-
-        public override bool CanConvert(Type objectType)
-        {
-            return IsTypeArchetypeDatatype(objectType);
-        }
-
-        #endregion
-
-        #region private methods - deserialization
-
-        private JToken GetDelintedJToken(JToken jToken)
-        {
-            return JToken.Parse(jToken.ToString(Formatting.None).DelintArchetypeJson());
-        }
-
-        private object DeserializeJson(Type objectType, JToken jToken)
-        {
-
-            var obj = Activator.CreateInstance(objectType);
-
-            if (null != obj as IEnumerable<object>)
-            {
-                JToken enumerableToken;
-
-                if (TryParseJTokenAsEnumerable(jToken, out enumerableToken)
-                    || (jToken.SelectToken("value") != null && TryParseJTokenAsEnumerable(jToken["value"], out enumerableToken)))
-                    return DeserializeEnumerableObject(obj, enumerableToken);
-            }
-
-            return null == jToken as JArray
-                        ? DeserializeObject(obj, jToken)
-                        : PopulateProperties(obj, jToken);
-        }
-
-        private object DeserializeEnumerableObject(object obj, JToken jToken)
-        {
-            var model = obj as IEnumerable<object>;
-            var fsToken = jToken;
-
-            var itemType = model.GetType().GetGenericArguments().FirstOrDefault();
-
-            if (itemType == null)
-            {
-                itemType = model.GetType().BaseType.GetGenericArguments().First();
-                fsToken = fsToken["fieldsets"];
-            }
-
-            foreach (var fs in fsToken.Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
-            {
-                var item = DeserializeJson(itemType, fs["properties"]);
-
-                obj.GetType().GetMethod("Add").Invoke(obj, new[] { item });
-            }
-
-            return obj;
-        }
-
-        private object DeserializeObject(object obj, JToken jToken)
-        {
-            if (jToken.SelectToken("value") != null
-                && String.IsNullOrEmpty(jToken.SelectToken("value").ToString()))
-                return obj;
-            
-            var properties = GetSerialiazableProperties(obj).ToList();
-            var asFieldset = properties.Where(HasAsFieldsetAttribute).ToList();
-
-            foreach (var propInfo in asFieldset)
-            {
-                var propAlias = GetJsonPropertyName(propInfo);
-                var fsJToken = propInfo.PropertyType.Namespace.Equals("System") 
-                                ? GetFieldsetJTokenFromAlias(propAlias, jToken)
-                                : GetFieldsetJTokenFromPropertyAlias(propInfo, jToken);
-
-                var propJToken = GetPropertyJToken(fsJToken, propAlias);
-
-                if (propJToken == null)
-                    continue;
-
-                var propValue = GetPropertyValue(propInfo, propJToken);
-
-                propInfo.SetValue(obj, propValue);
-            }
-
-            if (properties.All(HasAsFieldsetAttribute))
-                return obj;
-
-            var objToken = GetFieldsetJTokenFromTypeAlias(obj.GetType(), jToken);
-
-            if (objToken == null)
-                return obj;
-
-            if (objToken.SelectToken("properties") != null)
-                return PopulateProperties(obj, objToken["properties"]);
-
-            if ((objToken is JArray) && (objToken as JArray).Count <= 0)
-                return null;
-
-            if (!(objToken is JArray))
-                return PopulateProperties(obj, new JArray(objToken));
-
-            var defaultFsProperties = properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)).ToList();                
-
-            foreach (var property in defaultFsProperties)
-            {
-                var propJToken = ParseJTokenFromItems(objToken, GetJsonPropertyName(property));
-                PopulateProperty(obj, propJToken["properties"], property);
-            }
-
-            return PopulateProperties(obj, new JArray(objToken));
-        }
-
-        private JToken GetPropertyJToken(JToken fsJToken, string propAlias)
-        {
-            if (fsJToken == null)
-                return null;
-            
-            //make recursive
-            if (fsJToken.SelectToken("properties") != null)
-                return GetPropertyAliasJToken(propAlias, fsJToken["properties"]);
-
-            var nestedPropJToken = fsJToken
-                .SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(propAlias));
-
-            return nestedPropJToken != null ? GetPropertyAliasJToken(propAlias, nestedPropJToken["properties"]) : null;
-        }
-
-        private JToken GetFieldsetJTokenFromTypeAlias(Type objType, JToken jToken)
-        {
-            var objAlias = GetFieldsetName(objType);
-            return GetFieldsetJTokenFromAlias(objAlias, jToken);
-        }
-
-        private JToken GetFieldsetJTokenFromPropertyAlias(PropertyInfo propInfo, JToken jToken)
-        {
-            var objAlias = GetJsonPropertyName(propInfo);
-            return GetFieldsetJTokenFromAlias(objAlias, jToken);
-        }
-
-        private JToken GetFieldsetJTokenFromAlias(string objAlias, JToken jToken)
-        {
-            JToken propJToken;
-
-            if (TryParseJTokenFromNamedFieldset(jToken, objAlias, out propJToken))
-                return propJToken;
-
-            if (TryParseJTokenFromNestedFieldset(jToken, objAlias, out propJToken))
-                return propJToken;
-
-            if (TryParseJTokenFromDefaultFieldset(jToken, out propJToken))
-                return propJToken;
-
-            return propJToken
-                        ?? ParseJTokenFromItem(jToken, objAlias);
-        }
-
-        private object PopulateProperties(object obj, JToken jToken)
-        {
-            var properties = GetSerialiazableProperties(obj);
-
-            foreach (var propertyInfo in properties)
-            {
-                PopulateProperty(obj, jToken, propertyInfo);
-            }
-
-            return obj;
-        }
-
-        private void PopulateProperty(object obj, JToken jToken, PropertyInfo propertyInfo)
-        {
-            var propAlias = GetJsonPropertyName(propertyInfo);
-            var propJToken = GetPropertyAliasJToken(propAlias, jToken);
-
-            if (propJToken == null)
-                return;
-
-            var propValue = GetPropertyValue(propertyInfo, propJToken);
-            propertyInfo.SetValue(obj, propValue);
-        }
-
-        private JToken GetPropertyAliasJToken(string propAlias, JToken jToken)
-        {
-            return jToken.SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(propAlias));
-        }
-
-        private object GetPropertyValue(PropertyInfo propertyInfo, JToken propJToken)
-        {
-            return IsTypeArchetypeDatatype(propertyInfo.PropertyType)
-                ? DeserializeJson(propertyInfo.PropertyType, propJToken)
-                    : IsTypeIEnumerableArchetypeDatatype(propertyInfo.PropertyType)
-                    ? DeserializeJson(propertyInfo.PropertyType, propJToken["value"].SelectToken("fieldsets"))
-                : GetDeserializedPropertyValue(propJToken, propertyInfo.PropertyType);
-        }
-
-        private JToken ParseJTokenFromItem(JToken jToken, string itemAlias)
-        {
-            return (jToken.SelectToken("alias") != null && jToken["alias"].ToString().Equals(itemAlias))
-                    ? jToken
-                    : null;
-        }
-
-        private JToken ParseJTokenFromItems(JToken jToken, string itemAlias)
-        {
-            return jToken.SingleOrDefault(jT => ParseJTokenFromItem(jT, itemAlias) != null);
-        }
-
-        private bool TryParseJTokenFromNamedFieldset(JToken jToken, string objAlias, out JToken resultToken)
-        {
-            resultToken = null;
-
-            if (jToken.SelectToken("fieldsets") == null)
-                return false;
-
-            resultToken = jToken["fieldsets"].SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(objAlias));
-
-            return resultToken != null;
-        }
-
-        private bool TryParseJTokenFromNestedFieldset(JToken jToken, string objAlias, out JToken resultToken)
-        {
-            resultToken = null;
-
-            if (jToken.SelectToken("value") == null || !jToken["value"].HasValues
-                                    || jToken["value"]["fieldsets"] == null)
-                return false;
-
-            resultToken = jToken["value"]["fieldsets"].SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(objAlias));
-
-            return resultToken != null;
-        }
-
-        private bool TryParseJTokenFromDefaultFieldset(JToken jToken, out JToken resultToken)
-        {
-            resultToken = jToken.SelectToken("fieldsets");
-
-            return resultToken != null;
-        }
-
-        private bool TryParseJTokenAsEnumerable(JToken jToken, out JToken resultToken)
-        {
-            resultToken = null;
-            
-            //To Do: Strange newtonsoft behaviour
-            var fsToken = jToken.Parent != null
-                ? jToken.Parent.Children().First() is JArray
-                    ? jToken.Parent.Children().First()
-                    : jToken.Parent.Children().First()["fieldsets"] 
-                : jToken.SelectToken("fieldsets");
-
-            var jTokenEnumerable = jToken != null
-                && fsToken != null && fsToken is JArray;
-
-            if (jTokenEnumerable)
-                resultToken = jToken;
-
-            return jTokenEnumerable;
-        }
-
-        #endregion
-
-        #region private methods - serialization
-
-        private string ApplyFormatting(string json, Formatting formatting)
-        {
-            return JToken.Parse(json).ToString(formatting);
-        }
-
-        private IList GenerateModels(object value)
-        {
-            var models = value as IList;
-
-            if (null != models)
-                return models;
-
-            var properties = GetSerialiazableProperties(value).ToList();
-
-            if (!PropertyLayoutHasFieldsets(properties))
-                return new List<object>() { value };
-
-            models = new List<object>();
-
-            var fieldsetModels = properties.Where(HasAsFieldsetAttribute)
-                .Select(pInfo =>
-                {
-                    var fsModel = GetDynamicModel(GetJsonPropertyName(pInfo));
-                    fsModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
-                    return fsModel;
-                });
-
-            models = ((IEnumerable<object>)models).Concat(fieldsetModels).ToList();
-
-            var remainingProps = properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)).ToList();
-
-            if (!remainingProps.Any())
-                return models;
-
-            var dynamicModel = GetDynamicModel(GetFieldsetName(value.GetType()));
-
-            foreach (var pInfo in properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)))
-            {
-                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
-            }
-
-            models.Add(dynamicModel);
-
-            return models;
-        }
-
-        private IDictionary<string, object> GetDynamicModel(string rootFsAlias)
-        {
-            var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
-            dynamicModel.Add(_ROOT_FS_ALIAS, rootFsAlias);
-            return dynamicModel;
-        }
-
-        private JObject SerializeModelToFieldset(IEnumerable models)
-        {
-            var jObj = new JObject
-            {
-                {
-                    "fieldsets",
-                    new JArray(new JRaw(SerializeModels(models)))
-                }
-            };
-            return jObj;
-        }
-
-        private IEnumerable SerializeModels(IEnumerable models)
-        {
-            var fieldsetJson = (from object model in models where null != model select SerializeModel(model)).ToList();
-
-            return String.Join(",", fieldsetJson);
-        }
-
-        private string SerializeModel(object value)
-        {
-            if (value == null)
-                return null;
-
-            var jObj = IsExpandoObject(value) 
-                ? GetJObjectFromExpandoObject(value as IDictionary<string, object>)
-                : GetJObject(value);
-
-            var fieldsetJson = new StringBuilder();
-            var fieldsetWriter = new StringWriter(fieldsetJson);
-
-            using (var jsonWriter = new JsonTextWriter(fieldsetWriter))
-            {
-                jObj.WriteTo(jsonWriter);
-            }
-
-            return fieldsetJson.ToString();
-        }
-
-        private bool PropertyLayoutHasFieldsets(IEnumerable<PropertyInfo> properties)
-        {
-            return properties.Any(HasAsFieldsetAttribute);
-        }
-
-        private static bool HasAsFieldsetAttribute(PropertyInfo pInfo)
-        {
-            return pInfo
-                .GetCustomAttributes(typeof(AsFieldsetAttribute), true).Length > 0;
-        }
-
-        private bool IsExpandoObject(object value)
-        {
-            return value.GetType().Name.Equals(typeof (ExpandoObject).Name);
-        }
-
-        private JObject GetJObjectFromExpandoObject(IDictionary<string, object> expandoObj)
-        {
-            var jObj = new JObject
-            {
-                {
-                    "alias",
-                    new JValue(expandoObj[_ROOT_FS_ALIAS])
-                }
-            };
-
-            var fsProperties = new List<JObject>();
-
-            foreach (var item in expandoObj.SkipWhile(i => i.Key.Equals(_ROOT_FS_ALIAS)))
-            {
-                var property = item;
-                var alias = property.Key;
-                var value = property.Value;
-
-                fsProperties.Add(new JObject 
-                {
-                    new JProperty("alias", alias), 
-                    new JProperty("value", value != null ? JToken.FromObject(value) : value)
-                });                
-            }
-
-            jObj.Add("properties", new JRaw(JsonConvert.SerializeObject(fsProperties)));
-            return jObj;
-        }
-
-        private JObject GetJObject(object obj)
-        {
-            var jObj = new JObject
-                {
-                    {
-                        "alias",
-                        new JValue(GetFieldsetName(obj.GetType()))
-                    }
-                };
-
-            var properties = GetProperties(obj);
-
-            var fsProperties = new List<JObject>();
-
-            foreach (var propertyInfo in properties)
-            {
-                var fsProperty = new JObject();
-                var jProperty = new JProperty("alias", GetJsonPropertyName(propertyInfo));
-                fsProperty.Add(jProperty);
-
-                var propValue = propertyInfo.GetIndexParameters().Length == 0 
-                                    ? propertyInfo.GetValue(obj, null)
-                                    : obj as string;
-
-                fsProperty.Add(
-                    new JProperty("value", GetJPropertyValue(propValue)));
-
-                fsProperties.Add(fsProperty);
-            }
-
-            jObj.Add("properties", new JRaw(JsonConvert.SerializeObject(fsProperties)));
-
-            return jObj;
-        }
-
-        private object GetJPropertyValue(object value)
-        {
-            return IsValueArchetypeDatatype(value)
-                ? new JRaw(JsonConvert.SerializeObject(value))
-                : IsValueIEnumerableArchetypeDatatype(value)
-                    ? new JRaw(SerializeModelToFieldset(value as IEnumerable))
-                    : new JValue(GetSerializedPropertyValue(value));
-        }
-
-        private IEnumerable<PropertyInfo> GetProperties(object obj)
-        {
-            if (obj.GetType() !=  typeof(string))
-                return GetSerialiazableProperties(obj);
-
-            var indexer = ((DefaultMemberAttribute)obj.GetType()
-                .GetCustomAttributes(typeof(DefaultMemberAttribute), true)[0]).MemberName;
-
-            return new List<PropertyInfo> { obj.GetType().GetProperty(indexer) };
-        }
-
-        private IEnumerable<PropertyInfo> GetSerialiazableProperties(object obj)
-        {
-            return obj.GetSerialiazableProperties();
-        }
-
-        private string GetJsonPropertyName(PropertyInfo property)
-        {
-            var attributes = property.GetCustomAttributes(true);
-            var jsonPropAttribute = (JsonPropertyAttribute)attributes.FirstOrDefault(attr => attr is JsonPropertyAttribute);
-
-            return jsonPropAttribute != null ? jsonPropAttribute.PropertyName : property.Name;
-        }
-
-        private string GetFieldsetName(Type type)
-        {
-            var attributes = type.GetCustomAttributes(true);
-            var archetypeDatatypeAttribute = (AsArchetypeAttribute)attributes.FirstOrDefault(attr => attr is AsArchetypeAttribute);
-
-            return archetypeDatatypeAttribute != null ? archetypeDatatypeAttribute.FieldsetName : type.Name;
-        }
-
-        private string GetSerializedPropertyValue(object propValue)
-        {
-            if (propValue == null)
-                return String.Empty;
-
-            if (propValue is bool)
-                return (bool)propValue ? GetSerializedPropertyValue(1) : GetSerializedPropertyValue(0);
-
-            return String.Format("{0}", propValue);
-        }
-
-        private object GetDeserializedPropertyValue(JToken jToken, Type type)
-        {
-            return String.IsNullOrEmpty(jToken.ToString()) 
-                        ? GetDefault(type) 
-                        : GetTypedValue(jToken, type);
-        }
-
-        private object GetTypedValue(JToken jToken, Type type)
-        {
-            var property = JsonConvert.DeserializeObject<ArchetypePropertyModel>(jToken.ToString());
-
-            var method = typeof(ArchetypePropertyModel).GetMethod("GetValue");
-            var getValue = method.MakeGenericMethod(type);
-
-            return getValue.Invoke(property, null);
-        }
-
-        private object GetDefault(Type type)
-        {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
-        }
-
-        #endregion
-
-        #region private methods - common
-
-        private bool IsValueIEnumerableArchetypeDatatype(object value)
-        {
-            if (value as IEnumerable != null && value.GetType().IsGenericType)
-                return IsTypeArchetypeDatatype(value.GetType().GetGenericArguments()[0]);
-
-            return false;
-        }
-
-        private bool IsTypeIEnumerableArchetypeDatatype(Type type)
-        {
-            if (typeof(IEnumerable).IsAssignableFrom(type) && type.IsGenericType)
-                return IsTypeArchetypeDatatype(type.GetGenericArguments()[0]);
-
-            return false;
-        }
-
-        private bool IsValueArchetypeDatatype(object value)
-        {
-            return value != null &&
-                IsTypeArchetypeDatatype(value.GetType());
-        }
-
-        private bool IsTypeArchetypeDatatype(Type type)
-        {
-            return type.GetCustomAttributes(typeof(AsArchetypeAttribute), true).Length > 0;
-        }
-
-        #endregion
-    }
-}

app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonDelinter.cs

@@ -1,105 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace Archetype.Serialization
-{
-    public enum DelinterStep
-    {     
-        RemoveNewLine = 0,
-        RemoveWhiteSpace,
-        UnescapeLabels,
-        UnescapeAlias,
-        UnescapeValues,
-        FixNestedFieldsets
-    }
-
-    public enum DelinterAction
-    {
-        Remove = 0,
-        RemoveWhiteSpace,
-        UnescapeLabels,
-        UnescapeValues,
-        FixNestedFieldsets
-    }
-    
-    public class ArchetypeJsonDelinter
-    {
-        public IDictionary<DelinterStep, DelinterAction> Pipeline { get; private set; }
-        public IDictionary<DelinterStep, Regex> Tokens { get; private set; }
-        public IDictionary<DelinterAction, Func<string, Regex, string>> Actions { get; private set; }
-
-        public ArchetypeJsonDelinter()
-        {
-            Init();
-        }
-
-        public string Execute(string input)
-        {
-            var buffer = input;
-
-            foreach (var step in Pipeline.Keys)
-            {
-                var action = Pipeline[step];
-                buffer = Actions[action](buffer, Tokens[step]);             
-            }
-
-            return buffer;
-        }
-
-        private void Init()
-        {
-            Tokens = new Dictionary<DelinterStep, Regex>
-            {
-                {DelinterStep.RemoveNewLine, new Regex(@"(?<=\,){0,1}(\\+r\\+n)(?=\\*?""(alias|value|properties|fieldsets)\\*?"":\{*?(\\*|""|\[))|(\r|\n)+|(\\+r\\+n)(?=\s*?(\{|\}|\]))|(\\+r\\n+)(?=\s+\\*?""(alias|value|properties|fieldsets))")},                
-                {DelinterStep.RemoveWhiteSpace, new Regex(@"(""\S+?"":)(\s+?)("")|([\{\[\}\],]|(?<!\\)"")(\s+)([\{\[\}\],]|(?<!\\)"")")},
-                {DelinterStep.UnescapeLabels, new Regex(@"\\+""(fieldsets|properties|alias|value)\\+"":(\s*)")},
-                {DelinterStep.UnescapeAlias, new Regex(@"""(alias)"":\\+""(.*?)\\+""")},
-                {DelinterStep.UnescapeValues, new Regex(@"""(value)"":\\+""(.*?)\\+""(?=\s*?\})")},
-                {DelinterStep.FixNestedFieldsets, new Regex(@"""(value)"":\s*?""\{\s*?(""fieldsets""[\S\s]+?)}""")}
-            };
-
-            Actions = new Dictionary<DelinterAction, Func<string, Regex, string>>
-            {
-                {DelinterAction.Remove, (input, pattern) =>
-                    RecursiveReplace(input, pattern, match => String.Empty)
-                },
-                {DelinterAction.RemoveWhiteSpace, (input, pattern) =>
-                    RecursiveReplace(input.Trim(), pattern, match =>
-                        String.Format("{0}{1}{2}{3}", match.Groups[1].Value, 
-                            match.Groups[3].Value, match.Groups[4].Value, match.Groups[6].Value))
-                },
-                {DelinterAction.UnescapeLabels, (input, pattern) =>
-                    RecursiveReplace(input, pattern, match => String.Format(@"""{0}"":", match.Groups[1].Value))
-                },
-                {DelinterAction.UnescapeValues, (input, pattern) =>
-                    RecursiveReplace(input, pattern, match => String.Format(@"""{0}"":""{1}""", match.Groups[1].Value, match.Groups[2].Value))
-                },
-                {DelinterAction.FixNestedFieldsets, (input, pattern) =>
-                    RecursiveReplace(input, pattern, match => String.Format(@"""{0}"":{{{1}}}", match.Groups[1].Value, match.Groups[2].Value))
-                }
-            };
-            
-            Pipeline = new Dictionary<DelinterStep, DelinterAction>
-            {
-                {DelinterStep.RemoveNewLine, DelinterAction.Remove},                                              
-                {DelinterStep.UnescapeLabels, DelinterAction.UnescapeLabels},
-                {DelinterStep.UnescapeAlias, DelinterAction.UnescapeValues},
-                {DelinterStep.UnescapeValues, DelinterAction.UnescapeValues},
-                {DelinterStep.FixNestedFieldsets, DelinterAction.FixNestedFieldsets},
-                {DelinterStep.RemoveWhiteSpace, DelinterAction.RemoveWhiteSpace},  
-            };
-        }
-
-        private string RecursiveReplace(string input, Regex pattern, Func<Match, string> matchFunc)
-        {
-            var buffer = input;
-            while (pattern.IsMatch(buffer))
-            {
-                buffer = pattern.Replace(buffer, match => matchFunc(match));
-            }
-            return buffer;            
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace Archetype.Serialization
-{
-    public class AsArchetypeAttribute : Attribute
-    {
-        public string FieldsetName { get; set; }
-
-        public AsArchetypeAttribute(string fieldsetname)
-        {
-            FieldsetName = fieldsetname;
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace Archetype.Serialization
-{
-    public class AsFieldsetAttribute : Attribute
-    {
-    }
-}

app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Reflection;
-using Archetype.Extensions;
-using Newtonsoft.Json;
-using Umbraco.Core.Models;
-using Umbraco.Web;
-
-namespace Archetype.Serialization
-{
-    public static class SerializationExtensions
-    {
-        //temporary
-        public static string GetPropertyDataValue(this IPublishedContent contentPage, string propertyAlias)
-        {
-            if (contentPage == null || !contentPage.HasProperty(propertyAlias))
-                return null;
-
-            return (string)contentPage.Properties.Single(p => p.PropertyTypeAlias == propertyAlias).DataValue;
-        }
-
-        public static IEnumerable<PropertyInfo> GetSerialiazableProperties(this object obj)
-        {
-            if (obj == null)
-                return new List<PropertyInfo>();
-            
-            return obj.GetType()
-                .GetProperties(BindingFlags.Instance | BindingFlags.Public)
-                .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute)));
-        }
-
-        public static T GetModelFromArchetype<T>(this IPublishedContent content,
-            string cmsFieldAlias, bool returnInstanceIfNull = false)
-            where T : class, new()
-        {
-            var archetypeJson = content.GetPropertyDataValue(cmsFieldAlias);
-            return JsonConvert.DeserializeObject<T>(archetypeJson) ??
-                   (returnInstanceIfNull ? Activator.CreateInstance<T>() : default(T));
-        }
-
-        public static string DelintArchetypeJson(this string input)
-        {
-            if (!input.DetectIsJson())
-                return String.Empty;
-
-            var delinter = new ArchetypeJsonDelinter();
-            return delinter.Execute(input);
-        }
-    }
-}

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.3.0-beta",
+	"version": "1.3.1-beta",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus",
 	"authorUrl": "http://imulus.com/",